[P-unit-devel] SF.net SVN: p-unit: [311] trunk/punit.test/src/tests/api/org/punit

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

Revision: 311
          http://p-unit.svn.sourceforge.net/p-unit/?rev=311&view=rev
Author:   zhanghuangzhu
Date:     2008-05-27 17:44:46 -0700 (Tue, 27 May 2008)

Log Message:
-----------
az: applied nested beforeClass/afterClass/setUp/tearDown patch from Chris Wilson.

Modified Paths:
--------------
    trunk/punit.test/src/tests/api/org/punit/convention/AnnotationFilterTest.java
    trunk/punit.test/src/tests/api/org/punit/convention/NameConventionFilterTest.java
    trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java
    trunk/punit.test/src/tests/api/org/punit/testclasses/AnnotationTestClass.java
    trunk/punit.test/src/tests/api/org/punit/testclasses/TestClass0.java

Added Paths:
-----------
    trunk/punit.test/src/tests/api/org/punit/testclasses/SuperAnnotationTestClass.java

Modified: trunk/punit.test/src/tests/api/org/punit/convention/AnnotationFilterTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/convention/AnnotationFilterTest.java	2008-05-28 00:44:26 UTC (rev 310)
+++ trunk/punit.test/src/tests/api/org/punit/convention/AnnotationFilterTest.java	2008-05-28 00:44:46 UTC (rev 311)
@@ -109,6 +109,23 @@
         assertNull(_filter.getAfterClassMethod(TestClass1.class));
     }
     
+    public void testGetNestedBeforeClass() {
+    	assertTrue(_filter.getBeforeClassMethod(AnnotationTestClass.class).length == 2);
+    	
+    }
+    
+    public void testGetNestedAfterClass() {
+    	assertTrue(_filter.getAfterClassMethod(AnnotationTestClass.class).length == 2);
+    }
+    
+    public void testGetNestedSetupMethod() {
+    	assertTrue(_filter.getSetUpMethod(AnnotationTestClass.class).length == 2);
+    }
+    
+    public void testGetNestedTearDownMethod() {
+    	assertTrue(_filter.getTearDownMethod(AnnotationTestClass.class).length == 2);
+    }
+    
     @Ignore
     static class ExcludedClass {
         

Modified: trunk/punit.test/src/tests/api/org/punit/convention/NameConventionFilterTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/convention/NameConventionFilterTest.java	2008-05-28 00:44:26 UTC (rev 310)
+++ trunk/punit.test/src/tests/api/org/punit/convention/NameConventionFilterTest.java	2008-05-28 00:44:46 UTC (rev 311)
@@ -63,12 +63,12 @@
     }
 
     public void testGetBeforeClass() {
-        assertEquals("beforeClass", _convention.getBeforeClassMethod(TestClass0.class).getName());
+        assertEquals("beforeClass", _convention.getBeforeClassMethod(TestClass0.class)[0].getName());
         assertNull(_convention.getBeforeClassMethod(TestClass1.class));
     }
 
     public void testGetAfterClass() {
-        assertEquals("afterClass", _convention.getAfterClassMethod(TestClass0.class).getName());
+        assertEquals("afterClass", _convention.getAfterClassMethod(TestClass0.class)[0].getName());
         assertNull(_convention.getAfterClassMethod(TestClass1.class));
     }
 

Modified: trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java	2008-05-28 00:44:26 UTC (rev 310)
+++ trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java	2008-05-28 00:44:46 UTC (rev 311)
@@ -22,12 +22,15 @@
 
 public class ConcurrentRunnerTest extends TestCase {
 
-    private ConcurrentRunner _runner = new ConcurrentRunner();
+    private ConcurrentRunner _runner;
 
     public static void main(String[] args) {
     	new SoloRunner().run(ConcurrentRunnerTest.class);
 	}
-    
+
+    public void setUp() {
+    	_runner = new ConcurrentRunner();
+    }
     public void testMain() {
         ConcurrentRunner.main(new String[] { TestSuiteClass.class.getName() });
     }

Modified: trunk/punit.test/src/tests/api/org/punit/testclasses/AnnotationTestClass.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/AnnotationTestClass.java	2008-05-28 00:44:26 UTC (rev 310)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/AnnotationTestClass.java	2008-05-28 00:44:46 UTC (rev 311)
@@ -8,7 +8,7 @@
 import org.punit.runner.*;
 
 @Test(concurrentCount=5)
-public class AnnotationTestClass {
+public class AnnotationTestClass extends SuperAnnotationTestClass {
     
     public static void main(String[] args) {
         SoloRunner soloRunner = new SoloRunner();
@@ -126,5 +126,6 @@
 
         Assert.assertTrue(_setUp);
         Assert.assertTrue(_tearDown);
+        SuperAnnotationTestClass.assertTestClassRun();
     }
 }

Added: trunk/punit.test/src/tests/api/org/punit/testclasses/SuperAnnotationTestClass.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/SuperAnnotationTestClass.java	                        (rev 0)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/SuperAnnotationTestClass.java	2008-05-28 00:44:46 UTC (rev 311)
@@ -0,0 +1,54 @@
+package tests.api.org.punit.testclasses;
+
+import junit.framework.*;
+
+import org.punit.annotation.*;
+import org.punit.annotation.Test;
+
+@Test(concurrentCount=5)
+public class SuperAnnotationTestClass {
+
+    private static boolean _beforeClass;
+	private static boolean _afterClass;
+    private static boolean _setUp;
+	private static boolean _tearDown;
+	
+	public static void reset() {
+        _setUp = false;
+        _tearDown = false;
+        _beforeClass = false;
+        _afterClass = false;
+    }
+	
+	@SuppressWarnings("unused")
+    @BeforeClass
+    private static void beforeClassMethod() {
+        _beforeClass = true;
+    }
+    
+    @SuppressWarnings("unused")
+    @AfterClass
+    private static void afterClassMethod() {
+        _afterClass = true;
+    }
+    
+    @SuppressWarnings("unused")
+    @Before
+    private void before() {
+        _setUp = true;
+    }
+
+    @SuppressWarnings("unused")
+    @After
+    private void after() {
+        _tearDown = true;
+    }
+
+    public static void assertTestClassRun() {
+        Assert.assertTrue(_beforeClass);
+        Assert.assertTrue(_afterClass);
+
+        Assert.assertTrue(_setUp);
+        Assert.assertTrue(_tearDown);
+    }
+}
\ No newline at end of file


Property changes on: trunk/punit.test/src/tests/api/org/punit/testclasses/SuperAnnotationTestClass.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: trunk/punit.test/src/tests/api/org/punit/testclasses/TestClass0.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/TestClass0.java	2008-05-28 00:44:26 UTC (rev 310)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/TestClass0.java	2008-05-28 00:44:46 UTC (rev 311)
@@ -37,10 +37,12 @@
 	}
 
 	private void setUp() {
+		System.err.println("setup");
 		_setUp = true;
 	}
 
 	private void tearDown() {
+		System.err.println("tearDown");
 		_tearDown = true;
 	}
 


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