#36

Tests modified corresponding JUnit conventions
Testdata added
Moved stages to correct packages

.gitignore

 /bin
 /target
 /testdata/
+/doc/

src/main/java/teetime/stage/io/ByteArray2String.java → src/main/java/teetime/stage/ByteArray2String.java

-package teetime.stage.io;
+package teetime.stage;
 
 import teetime.framework.ConsumerStage;
 import teetime.framework.OutputPort;

src/main/java/teetime/stage/io/CipherByteArray.java → src/main/java/teetime/stage/CipherByteArray.java

-package teetime.stage.io;
+package teetime.stage;
 
 import java.security.spec.KeySpec;
 

src/main/java/teetime/stage/TokenCounter.java

+package teetime.stage;
+
+import teetime.framework.ConsumerStage;
+
+public class TokenCounter extends ConsumerStage<String> {
+
+	private long i = 0;
+
+	public long getI() {
+		return i;
+	}
+
+	@Override
+	protected void execute(final String element) {
+		i++;
+	}
+
+}

src/main/java/teetime/stage/io/Tokenizer.java → src/main/java/teetime/stage/Tokenizer.java

-package teetime.stage.io;
+package teetime.stage;
 
 import java.util.StringTokenizer;
 

src/main/java/teetime/stage/io/ZipByteArray.java → src/main/java/teetime/stage/ZipByteArray.java

-package teetime.stage.io;
+package teetime.stage;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -43,7 +43,7 @@ public class ZipByteArray extends ConsumerStage<byte[]> {
 		this.send(outputPort, cache);
 	}
 
-	public static byte[] compress(final byte[] data) throws IOException {
+	private byte[] compress(final byte[] data) throws IOException {
 		Deflater deflater = new Deflater();
 		deflater.setInput(data);
 
@@ -63,7 +63,7 @@ public class ZipByteArray extends ConsumerStage<byte[]> {
 		return output;
 	}
 
-	public static byte[] decompress(final byte[] data) throws IOException, DataFormatException {
+	private byte[] decompress(final byte[] data) throws IOException, DataFormatException {
 		Inflater inflater = new Inflater();
 		inflater.setInput(data);
 

src/performancetest/java/teetime/examples/cipher/CipherConfiguration.java

@@ -6,13 +6,13 @@ import teetime.framework.AnalysisConfiguration;
 import teetime.framework.pipe.PipeFactory;
 import teetime.framework.pipe.PipeFactory.PipeOrdering;
 import teetime.framework.pipe.PipeFactory.ThreadCommunication;
+import teetime.stage.CipherByteArray;
 import teetime.stage.InitialElementProducer;
+import teetime.stage.ZipByteArray;
+import teetime.stage.CipherByteArray.CipherMode;
+import teetime.stage.ZipByteArray.ZipMode;
 import teetime.stage.io.ByteArrayFileWriter;
-import teetime.stage.io.CipherByteArray;
-import teetime.stage.io.CipherByteArray.CipherMode;
 import teetime.stage.io.File2ByteArray;
-import teetime.stage.io.ZipByteArray;
-import teetime.stage.io.ZipByteArray.ZipMode;
 
 public class CipherConfiguration extends AnalysisConfiguration {
 

src/performancetest/java/teetime/examples/cipher/CipherTest.java

@@ -3,9 +3,7 @@ package teetime.examples.cipher;
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import teetime.framework.Analysis;
@@ -15,8 +13,8 @@ import com.google.common.io.Files;
 
 public class CipherTest {
 
-	static String inputFile = "testdata/dependencies.html";
-	static String outputFile = "testdata/dependencies.html";
+	static String inputFile = "src/test/resources/data/input.txt";
+	static String outputFile = "src/test/resources/data/output.txt";
 	static String password = "Password";
 	static long start;
 	long stop;
@@ -25,26 +23,12 @@ public class CipherTest {
 
 	final static Analysis analysis = new Analysis(configuration);
 
-	@BeforeClass
-	public static void beforeClass() {
+	@Test
+	public void executeTest() throws IOException {
 		analysis.init();
 		start = System.currentTimeMillis();
-	}
-
-	@Test
-	public void executeTest() {
 		analysis.start();
+		Assert.assertTrue(Files.equal(new File(inputFile), new File(outputFile)));
 	}
 
-	@AfterClass
-	public static void afterClass() {
-		System.out.println("It took " + (System.currentTimeMillis() - start) + " Milliseconds");
-		boolean bool = false;
-		try {
-			bool = Files.equal(new File(inputFile), new File(outputFile));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		Assert.assertTrue(bool);
-	}
 }

src/performancetest/java/teetime/examples/tokenizer/TokenizerConfiguration.java

@@ -6,21 +6,22 @@ import teetime.framework.AnalysisConfiguration;
 import teetime.framework.pipe.PipeFactory;
 import teetime.framework.pipe.PipeFactory.PipeOrdering;
 import teetime.framework.pipe.PipeFactory.ThreadCommunication;
+import teetime.stage.ByteArray2String;
+import teetime.stage.CipherByteArray;
+import teetime.stage.CipherByteArray.CipherMode;
 import teetime.stage.InitialElementProducer;
-import teetime.stage.io.ByteArray2String;
-import teetime.stage.io.CipherByteArray;
-import teetime.stage.io.CipherByteArray.CipherMode;
+import teetime.stage.TokenCounter;
+import teetime.stage.Tokenizer;
+import teetime.stage.ZipByteArray;
+import teetime.stage.ZipByteArray.ZipMode;
 import teetime.stage.io.File2ByteArray;
-import teetime.stage.io.Printer;
-import teetime.stage.io.Tokenizer;
-import teetime.stage.io.ZipByteArray;
-import teetime.stage.io.ZipByteArray.ZipMode;
 
 public class TokenizerConfiguration extends AnalysisConfiguration {
 
 	private final PipeFactory pipeFactory = PipeFactory.INSTANCE;
 	private final File input;
 	private final String password;
+	private final TokenCounter counter;
 
 	public TokenizerConfiguration(final String inputFile, final String password) {
 		this.input = new File(inputFile);
@@ -28,22 +29,16 @@ public class TokenizerConfiguration extends AnalysisConfiguration {
 
 		InitialElementProducer<File> init = new InitialElementProducer<File>(this.input);
 		File2ByteArray f2b = new File2ByteArray();
-		CipherByteArray enc = new CipherByteArray(this.password, CipherMode.ENCRYPT);
-		ZipByteArray comp = new ZipByteArray(ZipMode.COMP);
 		ZipByteArray decomp = new ZipByteArray(ZipMode.DECOMP);
 		CipherByteArray decrypt = new CipherByteArray(this.password, CipherMode.DECRYPT);
 		ByteArray2String b2s = new ByteArray2String();
 		Tokenizer tokenizer = new Tokenizer(" ");
-		Printer<String> pt = new Printer<String>();
+		TokenCounter counter = new TokenCounter();
 
 		this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
 				.create(init.getOutputPort(), f2b.getInputPort());
 		this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
-				.create(f2b.getOutputPort(), enc.getInputPort());
-		this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
-				.create(enc.getOutputPort(), comp.getInputPort());
-		this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
-				.create(comp.getOutputPort(), decomp.getInputPort());
+				.create(f2b.getOutputPort(), decomp.getInputPort());
 		this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
 				.create(decomp.getOutputPort(), decrypt.getInputPort());
 		this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
@@ -51,9 +46,15 @@ public class TokenizerConfiguration extends AnalysisConfiguration {
 		this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
 				.create(b2s.getOutputPort(), tokenizer.getInputPort());
 		this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
-				.create(tokenizer.getOutputPort(), pt.getInputPort());
+				.create(tokenizer.getOutputPort(), counter.getInputPort());
 
 		this.getFiniteProducerStages().add(init);
 
+		this.counter = counter;
 	}
+
+	public long getTokenCount() {
+		return this.counter.getI();
+	}
+
 }

src/performancetest/java/teetime/examples/tokenizer/TokenizerTest.java

 package teetime.examples.tokenizer;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Assert;
 import org.junit.Test;
 
 import teetime.framework.Analysis;
-import teetime.framework.AnalysisConfiguration;
 
 public class TokenizerTest {
 
-	static String inputFile = "testdata/dependencies.html";
-	static String password = "Password";
-	static long start;
-	long stop;
+	// Encrypted lorem ipsum
+	private static String inputFile = "src/test/resources/data/cipherInput.txt";
+	private static String password = "Password";
 
-	static AnalysisConfiguration configuration = new TokenizerConfiguration(inputFile, password);
+	private static TokenizerConfiguration configuration = new TokenizerConfiguration(inputFile, password);
 
-	final static Analysis analysis = new Analysis(configuration);
-
-	@BeforeClass
-	public static void beforeClass() {
-		analysis.init();
-		start = System.currentTimeMillis();
-	}
+	private final static Analysis analysis = new Analysis(configuration);
 
 	@Test
 	public void executeTest() {
+		analysis.init();
 		analysis.start();
+		Assert.assertEquals(970, configuration.getTokenCount());
 	}
 
-	@AfterClass
-	public static void afterClass() {
-		System.out.println("It took " + (System.currentTimeMillis() - start) + " Milliseconds");
-		// boolean bool = false;
-		// try {
-		// bool = Files.equal(new File(inputFile), new File(outputFile));
-		// } catch (IOException e) {
-		// e.printStackTrace();
-		// }
-		// Assert.assertTrue(bool);
-	}
 }

src/test/resources/data/input.txt

+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.
+Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo
\ No newline at end of file

src/test/resources/data/output.txt

+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.
+Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo
\ No newline at end of file