Fixed #74

TimerBase no longer fails if closed without processing any data.

Author: cboehme

src/main/java/org/culturegraph/mf/stream/pipe/TimerBase.java

@@ -23,7 +23,7 @@
 
 /**
  * @author Christoph Böhme
- * 
+ *
  * @param <R>
  *            receiver type.
  */
@@ -42,13 +42,18 @@ public class TimerBase<R extends LifeCycle> implements Sender<R> {
 
 	private R receiver;
 
+	protected TimerBase(final String logPrefix) {
+		super();
+		this.logPrefix = logPrefix;
+	}
+
 	@Override
 	public final <S extends R> S setReceiver(final S receiver) {
 		this.receiver = receiver;
 		return receiver;
 	}
-	
-	public R getReceiver() {
+
+	public final R getReceiver() {
 		return receiver;
 	}
 
@@ -63,27 +68,27 @@ public final void resetStream() {
 
 	@Override
 	public final void closeStream() {
-		final long averageDuration = cumulativeDuration / count;
+		final long averageDuration;
+		if (count > 0) {
+			averageDuration = cumulativeDuration / count;
+		} else {
+			averageDuration = 0;
+		}
 		LOG.info(logPrefix
 				+ String.format("Executions: %d; Cumulative duration: %s; Average duration: %s", Long.valueOf(count),
 						scaleTime(cumulativeDuration), scaleTime(averageDuration)));
+
 		startMeasurement();
 		if (receiver != null) {
 			receiver.closeStream();
 		}
 		stopMeasurement("Time to close stream: ");
-				
-	}
-
-	protected TimerBase(final String logPrefix) {
-		super();
-		this.logPrefix = logPrefix;
 	}
 
 	protected final void startMeasurement() {
 		startTime = System.nanoTime();
 	}
-	
+
 	protected final void stopMeasurement(){
 		stopMeasurement("Execution %1$d:");
 	}

src/test/java/org/culturegraph/mf/stream/pipe/ObjectTimerTest.java

@@ -16,45 +16,70 @@
 package org.culturegraph.mf.stream.pipe;
 
 import org.culturegraph.mf.framework.DefaultObjectReceiver;
+import org.junit.Before;
 import org.junit.Test;
 
 
 /**
  * Tests {@link ObjectTimer}.
- * 
+ *
  * @author Christoph Böhme
  */
 public final class ObjectTimerTest {
 
-	private static final long[] DURATIONS = { 150L, 20L, 30L, 202L };
-	
 	/**
 	 * A module with a slow process method.
 	 */
-	private static final class BenchmarkedModule extends DefaultObjectReceiver<Long> {
-		
+	private static final class BenchmarkedModule extends DefaultObjectReceiver<String> {
+
+		private static final long[] DURATIONS = { 150L, 20L, 30L, 202L };
+
+		private int i;
+
 		@Override
-		public void process(final Long duration) {
+		public void process(final String obj) {
 			try {
-				Thread.sleep(duration.longValue());
-			} catch (InterruptedException e) {
+				Thread.sleep(getDuration());
+			} catch (final InterruptedException e) {
 				return;
 			}
 		}
+
+		private long getDuration() {
+			final long duration = DURATIONS[i];
+			i += 1;
+			if (i == DURATIONS.length) {
+				i = 0;
+			}
+			return duration;
+		}
+
+	}
+
+	private ObjectTimer<String> objectTimer;
+	private BenchmarkedModule benchmarkedModule;
+
+	@Before
+	public void setup() {
+		objectTimer = new ObjectTimer<String>();
+		benchmarkedModule = new BenchmarkedModule();
+		objectTimer.setReceiver(benchmarkedModule);
 	}
-	
+
 	@Test
-	public void testObjectTimer() {
-		final ObjectTimer<Long> timer = new ObjectTimer<Long>();
-		final BenchmarkedModule benchmarkedModule = new BenchmarkedModule();
-		
-		timer.setReceiver(benchmarkedModule);
-		
-		for (int i=0; i < DURATIONS.length; ++i) {
-			timer.process(Long.valueOf(DURATIONS[i]));
-		}
-		
-		timer.closeStream();
+	public void testShouldMeasureExecutionTime() {
+
+		objectTimer.process("");
+		objectTimer.process("");
+		objectTimer.process("");
+		objectTimer.process("");
+		objectTimer.closeStream();
+	}
+
+	@Test
+	public void testShouldHandleImmediateCloseStreamWithNoProcessing() {
+
+		objectTimer.closeStream();
 	}
 
 }

src/test/java/org/culturegraph/mf/stream/pipe/StreamTimerTest.java

@@ -16,50 +16,75 @@
 package org.culturegraph.mf.stream.pipe;
 
 import org.culturegraph.mf.framework.DefaultStreamReceiver;
-import org.culturegraph.mf.stream.pipe.ObjectTimer;
-import org.culturegraph.mf.stream.pipe.StreamTimer;
+import org.junit.Before;
 import org.junit.Test;
 
 
 /**
  * Tests {@link ObjectTimer}.
- * 
+ *
  * @author Christoph Böhme
  */
 public final class StreamTimerTest {
 
-	private static final long[] DURATIONS = { 150L, 20L, 30L, 202L };
-	
 	/**
 	 * A module with a slow process method.
 	 */
 	private static final class BenchmarkedModule extends DefaultStreamReceiver {
-		
+
+		private static final long[] DURATIONS = { 150L, 20L, 30L, 202L };
+
+		private int i;
+
 		@Override
-		public void literal(final String name, final String value) {
-			final long duration = Long.parseLong(value);
+		public void startRecord(final String id) {
 			try {
-				Thread.sleep(duration);
-			} catch (InterruptedException e) {
+				Thread.sleep(getDuration());
+			} catch (final InterruptedException e) {
 				return;
 			}
 		}
+
+		private long getDuration() {
+			final long duration = DURATIONS[i];
+			i += 1;
+			if (i == DURATIONS.length) {
+				i = 0;
+			}
+			return duration;
+		}
+
 	}
-	
+
+	private StreamTimer streamTimer;
+	private BenchmarkedModule benchmarkedModule;
+
+	@Before
+	public void setup() {
+		streamTimer = new StreamTimer();
+		benchmarkedModule = new BenchmarkedModule();
+		streamTimer.setReceiver(benchmarkedModule);
+	}
+
 	@Test
-	public void testObjectTimer() {
-		final StreamTimer timer = new StreamTimer();
-		final BenchmarkedModule benchmarkedModule = new BenchmarkedModule();
-		
-		timer.setReceiver(benchmarkedModule);
-		
-		for (int i=0; i < DURATIONS.length; ++i) {
-			timer.startRecord(Integer.toString(i));
-			timer.literal("duration", Long.toString(DURATIONS[i]));
-			timer.endRecord();
-		}
-		
-		timer.closeStream();
+	public void testShouldMeasureExecutionTime() {
+
+		streamTimer.startRecord("");
+		streamTimer.endRecord();
+		streamTimer.startRecord("");
+		streamTimer.endRecord();
+		streamTimer.startRecord("");
+		streamTimer.endRecord();
+		streamTimer.startRecord("");
+		streamTimer.endRecord();
+
+		streamTimer.closeStream();
+	}
+
+	@Test
+	public void testShouldHandleImmediateCloseStreamWithNoProcessing() {
+
+		streamTimer.closeStream();
 	}
 
 }