You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/12/09 15:46:29 UTC

svn commit: r888816 - in /labs/magma/trunk/foundation-basics: pom.xml src/test/java/org/apache/magma/settings/PerformanceTest.java

Author: simoneg
Date: Wed Dec  9 14:46:28 2009
New Revision: 888816

URL: http://svn.apache.org/viewvc?rev=888816&view=rev
Log:
Using test utilities

Modified:
    labs/magma/trunk/foundation-basics/pom.xml
    labs/magma/trunk/foundation-basics/src/test/java/org/apache/magma/settings/PerformanceTest.java

Modified: labs/magma/trunk/foundation-basics/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-basics/pom.xml?rev=888816&r1=888815&r2=888816&view=diff
==============================================================================
--- labs/magma/trunk/foundation-basics/pom.xml (original)
+++ labs/magma/trunk/foundation-basics/pom.xml Wed Dec  9 14:46:28 2009
@@ -38,9 +38,9 @@
 			<artifactId>aspectjrt</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.5</version>
+			<groupId>org.apache.magma.tools</groupId>
+			<artifactId>magma-test-utilities</artifactId>
+			<version>0.0.3-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: labs/magma/trunk/foundation-basics/src/test/java/org/apache/magma/settings/PerformanceTest.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-basics/src/test/java/org/apache/magma/settings/PerformanceTest.java?rev=888816&r1=888815&r2=888816&view=diff
==============================================================================
--- labs/magma/trunk/foundation-basics/src/test/java/org/apache/magma/settings/PerformanceTest.java (original)
+++ labs/magma/trunk/foundation-basics/src/test/java/org/apache/magma/settings/PerformanceTest.java Wed Dec  9 14:46:28 2009
@@ -13,6 +13,8 @@
 import org.apache.magma.settings.SettingsHolder;
 import org.junit.Test;
 
+import org.apache.magma.testing.NanoTimer;
+
 import static junit.framework.Assert.*;
 
 
@@ -87,50 +89,6 @@
 	}
 	
 	
-	static class NanoTimer {
-		private static double nanosInSecond = Math.pow(10, 9);
-		private long accumulated;
-		private long iterations;
-		
-		private long totalacc;
-		private long totaliter;
-		
-		private long start;
-		
-		public void start() {
-			start = System.nanoTime();
-		}
-		public void stop(int iterations) {
-			long elaps = System.nanoTime() - start;
-			accumulated += elaps; 
-			this.iterations += iterations;
-			totaliter += iterations;
-			totalacc += elaps;
-		}
-		public void reset() {
-			accumulated = 0;
-			iterations = 0;
-		}
-		public double nanosPerIteration() {
-			return (double)accumulated / (double)iterations;
-		}
-		public double iterationsPerSecond() {
-			return nanosInSecond / nanosPerIteration();
-		}
-		public String status() {
-			return "Avg : " + nanosPerIteration() + " n/i = " + iterationsPerSecond() + " ips";
-		}
-		public double totalIterationsPerSecond() {
-			double npi = (double)totalacc / (double)totaliter;
-			return nanosInSecond / npi;
-		}
-		
-		public String totals() {
-			double npi = (double)totalacc / (double)totaliter;
-			double ips = nanosInSecond / npi;
-			return "Total : " + npi + " n/i = " + ips + " ips   " + npi + "," + ips;
-		}
-	}
 	
 	private List<Stack<ContextElement>> generateContexts() throws Exception {
 		List<ContextElement> ce = new ArrayList<ContextElement>();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org