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

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

Revision: 210
          http://p-unit.svn.sourceforge.net/p-unit/?rev=210&view=rev
Author:   zhanghuangzhu
Date:     2007-06-14 21:42:00 -0700 (Thu, 14 Jun 2007)

Log Message:
-----------
Andrew Zhang: refactored setFilter to setConvention. 

Modified Paths:
--------------
    trunk/punit/src/org/punit/runner/AbstractRunner.java
    trunk/punit.samples/.classpath
    trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java
    trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java
    trunk/punit.test/src/tests/api/org/punit/testclasses/AnnotationTestClass.java
    trunk/punit.test/src/tests/api/org/punit/testclasses/JUnitAnnotationTestClass.java

Added Paths:
-----------
    trunk/punit.samples/src/samples/JUnitAnnotationSample.java

Modified: trunk/punit/src/org/punit/runner/AbstractRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/AbstractRunner.java	2007-06-15 03:56:43 UTC (rev 209)
+++ trunk/punit/src/org/punit/runner/AbstractRunner.java	2007-06-15 04:42:00 UTC (rev 210)
@@ -43,10 +43,10 @@
 		_methodRunner.setEventListeners(_eventListeners);
 		_methodRunner.setRunnerProperties(_properties);
 		registerLoggerListeners();
-		setFilter(new NameConvention());
+		setConvention(new NameConvention());
 	}
 
-	public void setFilter(Convention filter) {
+	public void setConvention(Convention filter) {
 		_filter = filter;
 		_testSuiteBuiler.setFilter(filter);
 		_testMethodBuilder.setMethodFilter(filter);

Modified: trunk/punit.samples/.classpath
===================================================================
--- trunk/punit.samples/.classpath	2007-06-15 03:56:43 UTC (rev 209)
+++ trunk/punit.samples/.classpath	2007-06-15 04:42:00 UTC (rev 210)
@@ -4,6 +4,5 @@
 	<classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
 	<classpathentry path="/punit" combineaccessrules="false" kind="src"/>
 	<classpathentry path="/punit.extension" combineaccessrules="false" kind="src"/>
-	<classpathentry path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1" kind="con"/>
 	<classpathentry path="bin" kind="output"/>
 </classpath>

Added: trunk/punit.samples/src/samples/JUnitAnnotationSample.java
===================================================================
--- trunk/punit.samples/src/samples/JUnitAnnotationSample.java	                        (rev 0)
+++ trunk/punit.samples/src/samples/JUnitAnnotationSample.java	2007-06-15 04:42:00 UTC (rev 210)
@@ -0,0 +1,34 @@
+package samples;
+
+import org.junit.*;
+import org.punit.convention.*;
+import org.punit.runner.*;
+
+import junit.framework.*;
+
+public class JUnitAnnotationSample extends TestCase {
+	
+	public static void main(String[] args) {
+		SoloRunner runner = new SoloRunner();
+		runner.setConvention(new JUnitAnnotationConvention());
+		runner.run(JUnitAnnotationSample.class);
+	}
+	
+    @BeforeClass
+	public static void init() {
+		System.out.println("beforeClass");
+	}
+    
+    @AfterClass
+    public static void close() {
+    	System.out.println("afterClass");
+    }
+    
+    public void test1() {
+    	System.out.println("test1");
+    }
+    
+    public void test2() {
+    	System.out.println("test2");
+    }
+}

Modified: trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java	2007-06-15 03:56:43 UTC (rev 209)
+++ trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java	2007-06-15 04:42:00 UTC (rev 210)
@@ -41,7 +41,7 @@
 	
 	public void testRunAnnotationTest() {
 		AnnotationTestClass.reset();
-		_runner.setFilter(new AnnotationConvention());
+		_runner.setConvention(new AnnotationConvention());
 		_runner.run(AnnotationTestClass.class);
 		AnnotationTestClass.assertTestClassRun();
 	}

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-15 03:56:43 UTC (rev 209)
+++ trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java	2007-06-15 04:42:00 UTC (rev 210)
@@ -37,7 +37,7 @@
 
 	public void testRunAnnotationTest() {
 		AnnotationTestClass.reset();
-		_runner.setFilter(new AnnotationConvention());
+		_runner.setConvention(new AnnotationConvention());
 		_runner.run(AnnotationTestClass.class);
 		AnnotationTestClass.assertTestClassRun();
 	}

Modified: trunk/punit.test/src/tests/api/org/punit/testclasses/AnnotationTestClass.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/AnnotationTestClass.java	2007-06-15 03:56:43 UTC (rev 209)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/AnnotationTestClass.java	2007-06-15 04:42:00 UTC (rev 210)
@@ -12,7 +12,7 @@
 	
 	public static void main(String[] args) {
 		SoloRunner soloRunner = new SoloRunner();
-		soloRunner.setFilter(new AnnotationConvention());
+		soloRunner.setConvention(new AnnotationConvention());
 		soloRunner.run(AnnotationTestClass.class);
 	}
 	

Modified: trunk/punit.test/src/tests/api/org/punit/testclasses/JUnitAnnotationTestClass.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/JUnitAnnotationTestClass.java	2007-06-15 03:56:43 UTC (rev 209)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/JUnitAnnotationTestClass.java	2007-06-15 04:42:00 UTC (rev 210)
@@ -8,7 +8,7 @@
 	
 	public static void main(String[] args) {
 		SoloRunner soloRunner = new SoloRunner();
-		soloRunner.setFilter(new AnnotationConvention());
+		soloRunner.setConvention(new AnnotationConvention());
 		soloRunner.run(JUnitAnnotationTestClass.class);
 	}
 	


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