[P-unit-devel] SF.net SVN: p-unit: [224] trunk/punit

[<zha...@us...>]

Revision: 224
          http://p-unit.svn.sourceforge.net/p-unit/?rev=224&view=rev
Author:   zhanghuangzhu
Date:     2007-06-25 02:09:45 -0700 (Mon, 25 Jun 2007)

Log Message:
-----------
Andrew Zhang: Some test cases and continue to implement Loop runner. 

Modified Paths:
--------------
    trunk/punit/src/org/punit/convention/Convention.java
    trunk/punit/src/org/punit/convention/NameConvention.java
    trunk/punit/src/org/punit/type/Loop.java
    trunk/punit.extension/src/org/punit/convention/AnnotationConvention.java
    trunk/punit.extension/src/org/punit/convention/JUnitAnnotationConvention.java
    trunk/punit.test/src/tests/api/org/punit/convention/NameConventionFilterTest.java
    trunk/punit.test/src/tests/api/org/punit/method/runner/AbstractTestMethodRunnerTest.java
    trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java
    trunk/punit.test/src/tests/api/org/punit/testclasses/TestClass.java

Added Paths:
-----------
    trunk/punit.samples/src/samples/LoopTestSample.java
    trunk/punit.test/src/tests/api/org/punit/testclasses/LoopTestClass.java

Modified: trunk/punit/src/org/punit/convention/Convention.java
===================================================================
--- trunk/punit/src/org/punit/convention/Convention.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit/src/org/punit/convention/Convention.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -44,7 +44,7 @@
 	
 	public boolean isLoopTest(Object testInstance);
 	
-	public int getToStop(Object testInstance);
+	public long toStop(Object testInstance);
 	
-	public int getToAbort(Object testInstance);
+	public long toAbort(Object testInstance);
 }

Modified: trunk/punit/src/org/punit/convention/NameConvention.java
===================================================================
--- trunk/punit/src/org/punit/convention/NameConvention.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit/src/org/punit/convention/NameConvention.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -120,16 +120,16 @@
 		return testInstance instanceof Loop;
 	}
 	
-	public int getToAbort(Object testInstance) {
+	public long toAbort(Object testInstance) {
 		if(isLoopTest(testInstance)) {
-			((Loop) testInstance).toAbort();
+			return ((Loop) testInstance).toAbort();
 		}
 		return 0;
 	}
 
-	public int getToStop(Object testInstance) {
+	public long toStop(Object testInstance) {
 		if(isLoopTest(testInstance)) {
-			((Loop) testInstance).toStop();
+			return ((Loop) testInstance).toStop();
 		}
 		return 0;
 	}

Modified: trunk/punit/src/org/punit/type/Loop.java
===================================================================
--- trunk/punit/src/org/punit/type/Loop.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit/src/org/punit/type/Loop.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -4,7 +4,7 @@
 
 /**
  * If a test implements this interface, punit concurrent runner will executes
- * its method concurrently.
+ * its method repeatedly until timeout.
  */
 public interface Loop {
 	/**

Modified: trunk/punit.extension/src/org/punit/convention/AnnotationConvention.java
===================================================================
--- trunk/punit.extension/src/org/punit/convention/AnnotationConvention.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit.extension/src/org/punit/convention/AnnotationConvention.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -108,11 +108,11 @@
 		return method;
 	}
 
-	public int getToAbort(Object testInstance) {
+	public long toAbort(Object testInstance) {
 		return 0;
 	}
 
-	public int getToStop(Object testInstance) {
+	public long toStop(Object testInstance) {
 		return 0;
 	}
 

Modified: trunk/punit.extension/src/org/punit/convention/JUnitAnnotationConvention.java
===================================================================
--- trunk/punit.extension/src/org/punit/convention/JUnitAnnotationConvention.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit.extension/src/org/punit/convention/JUnitAnnotationConvention.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -83,11 +83,11 @@
 		return method;
 	}
 
-	public int getToAbort(Object testInstance) {
+	public long toAbort(Object testInstance) {
 		return 0;
 	}
 
-	public int getToStop(Object testInstance) {
+	public long toStop(Object testInstance) {
 		return 0;
 	}
 

Added: trunk/punit.samples/src/samples/LoopTestSample.java
===================================================================
--- trunk/punit.samples/src/samples/LoopTestSample.java	                        (rev 0)
+++ trunk/punit.samples/src/samples/LoopTestSample.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -0,0 +1,56 @@
+/* (C) Copyright 2007, by Andrew Zhang */
+
+package samples;
+
+import org.punit.runner.*;
+import org.punit.type.*;
+
+import junit.framework.*;
+
+public class LoopTestSample implements Loop {
+	
+	public static final long TIMEOUT = 1000;
+
+	public static void main(String[] args) {
+		new SoloRunner().run(LoopTestSample.class);
+	}
+	
+	public static int _test1;
+
+	public static int _test2;
+
+	public static int _setUp;
+	
+	public static int _tearDown;
+		
+	public static void reset() {
+		_test1 = 0;
+		_test2 = 0;
+		_setUp = 0;
+		_tearDown = 0;
+	}
+	
+	private void setUp() {
+		_setUp++;
+	}
+	
+	private void tearDown() {
+		_tearDown++;
+	}
+	
+	public void test1() {
+//		System.out.println("test1 = " + _test1++);
+	}
+
+	public void test2() {
+//		System.out.println("test2 = " + _test2++);
+	}
+	
+	public long toAbort() {
+		return TIMEOUT;
+	}
+
+	public long toStop() {
+		return TIMEOUT;
+	}
+}

Modified: trunk/punit.test/src/tests/api/org/punit/convention/NameConventionFilterTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/convention/NameConventionFilterTest.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit.test/src/tests/api/org/punit/convention/NameConventionFilterTest.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -13,58 +13,68 @@
 
 public class NameConventionFilterTest extends TestCase {
 	
-	NameConvention _filter = new NameConvention();
+	NameConvention _convention = new NameConvention();
 	
 	public void testIsTestMethod() {
 		Method method;
 		method = ReflectionUtil.getMethod(getClass(), "test1", new Class[] {}); //$NON-NLS-1$
-		assertTrue(_filter.isTestMethod(method));
+		assertTrue(_convention.isTestMethod(method));
 		
 		method = ReflectionUtil.getMethod(getClass(), "_test2", new Class[] {}); //$NON-NLS-1$
-		assertFalse(_filter.isTestMethod(method));	
+		assertFalse(_convention.isTestMethod(method));	
 	}
 	
 	public void testGetCheckMethod() {
 		Method method, checkMethod;
 		method = ReflectionUtil.getMethod(getClass(), "test1", new Class[] {}); //$NON-NLS-1$
-		checkMethod = _filter.getCheckMethod(method);
+		checkMethod = _convention.getCheckMethod(method);
 		assertNull(checkMethod);
 		
 		method = ReflectionUtil.getMethod(getClass(), "_test2", new Class[] {}); //$NON-NLS-1$
-		checkMethod = _filter.getCheckMethod(method);
+		checkMethod = _convention.getCheckMethod(method);
 		assertEquals("check__test2", checkMethod.getName()); //$NON-NLS-1$
 	}
 	
 	public void testGetConcurrentCount() {
 		Method method = ReflectionUtil.getMethod(getClass(), "test1", new Class[] {}); //$NON-NLS-1$
 		ConcurrentTestClass test = new ConcurrentTestClass();
-		int count = _filter.getConcurrentCount(test, method);
+		int count = _convention.getConcurrentCount(test, method);
 		assertEquals(test.concurrentCount(), count);
 		
 		method = ReflectionUtil.getMethod(getClass(), "test1", new Class[] {}); //$NON-NLS-1$
-		assertEquals(0, _filter.getConcurrentCount(new TestClass(), method));
+		assertEquals(0, _convention.getConcurrentCount(new TestClass(), method));
 	}
 	
 	public void testGetSetUpMethod() {
-		assertNotNull(_filter.getSetupMethod(TestClass.class));
-		assertNull(_filter.getSetupMethod(TestClass1.class));
+		assertNotNull(_convention.getSetupMethod(TestClass.class));
+		assertNull(_convention.getSetupMethod(TestClass1.class));
 	}
 	
 	public void testGetTearDownMethod() {
-		assertNotNull(_filter.getTearDownMethod(TestClass.class));
-		assertNull(_filter.getTearDownMethod(TestClass1.class));
+		assertNotNull(_convention.getTearDownMethod(TestClass.class));
+		assertNull(_convention.getTearDownMethod(TestClass1.class));
 	}
 	
 	public void testGetBeforeClass() {
-		assertNotNull(_filter.getBeforeClassMethod(TestClass.class));
-		assertNull(_filter.getBeforeClassMethod(TestClass1.class));
+		assertNotNull(_convention.getBeforeClassMethod(TestClass.class));
+		assertNull(_convention.getBeforeClassMethod(TestClass1.class));
 	}
 	
 	public void testGetAfterClass() {
-		assertNotNull(_filter.getAfterClassMethod(TestClass.class));
-		assertNull(_filter.getAfterClassMethod(TestClass1.class));
+		assertNotNull(_convention.getAfterClassMethod(TestClass.class));
+		assertNull(_convention.getAfterClassMethod(TestClass1.class));
 	}
 	
+	public void testIsLoop() {
+		assertTrue(_convention.isLoopTest(new LoopTestClass()));
+		assertFalse(_convention.isLoopTest(new TestClass()));
+	}
+	
+	public void testGetToStop() {
+		assertEquals(LoopTestClass.TIMEOUT, _convention.toStop(new LoopTestClass()));
+		assertEquals(0, _convention.toStop(new TestClass()));
+	}
+	
 	public void test1() {
 		
 	}

Modified: trunk/punit.test/src/tests/api/org/punit/method/runner/AbstractTestMethodRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/method/runner/AbstractTestMethodRunnerTest.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit.test/src/tests/api/org/punit/method/runner/AbstractTestMethodRunnerTest.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -1,3 +1,5 @@
+/* (C) Copyright 2007, by Andrew Zhang */
+
 package tests.api.org.punit.method.runner;
 
 import java.util.*;

Modified: trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -1,3 +1,5 @@
+/* (C) Copyright 2007, by Andrew Zhang */
+
 package tests.api.org.punit.runner;
 
 import java.util.*;

Added: trunk/punit.test/src/tests/api/org/punit/testclasses/LoopTestClass.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/LoopTestClass.java	                        (rev 0)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/LoopTestClass.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -0,0 +1,63 @@
+/* (C) Copyright 2007, by Andrew Zhang */
+
+package tests.api.org.punit.testclasses;
+
+import org.punit.runner.*;
+import org.punit.type.*;
+
+import junit.framework.*;
+
+public class LoopTestClass implements Loop {
+	
+	public static final long TIMEOUT = 100;
+
+	public static void main(String[] args) {
+		new SoloRunner().run(LoopTestClass.class);
+	}
+	
+	public static int _test1;
+
+	public static int _test2;
+
+	public static int _setUp;
+	
+	public static int _tearDown;
+		
+	public static void reset() {
+		_test1 = 0;
+		_test2 = 0;
+		_setUp = 0;
+		_tearDown = 0;
+	}
+	
+	private void setUp() {
+		_setUp++;
+	}
+	
+	private void tearDown() {
+		_tearDown++;
+	}
+	
+	public void test1() {
+		_test1++;
+	}
+
+	public void test2() {
+		_test2++;
+	}
+	
+	public static void assertTestClassRun() {
+		Assert.assertTrue(_test1 > 1);
+		Assert.assertTrue(_test2 > 1);
+		Assert.assertTrue(_setUp > 1);
+		Assert.assertTrue(_tearDown > 1);
+	}
+
+	public long toAbort() {
+		return TIMEOUT;
+	}
+
+	public long toStop() {
+		return TIMEOUT;
+	}
+}

Modified: trunk/punit.test/src/tests/api/org/punit/testclasses/TestClass.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/TestClass.java	2007-06-25 01:24:49 UTC (rev 223)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/TestClass.java	2007-06-25 09:09:45 UTC (rev 224)
@@ -1,3 +1,5 @@
+/* (C) Copyright 2007, by Andrew Zhang */
+
 package tests.api.org.punit.testclasses;
 
 import junit.framework.*;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.