[P-unit-devel] SF.net SVN: p-unit: [211] trunk/punit
Status: Beta
Brought to you by:
zhanghuangzhu
Menu
▾
▴
[P-unit-devel] SF.net SVN: p-unit: [211] trunk/punit
|
From: <zha...@us...> - 2007-06-15 04:48:39
|
Revision: 211
http://p-unit.svn.sourceforge.net/p-unit/?rev=211&view=rev
Author: zhanghuangzhu
Date: 2007-06-14 21:48:40 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
Andrew Zhang: refactored setFilter to setConvention.
Modified Paths:
--------------
trunk/punit/src/org/punit/method/builder/MethodBuilderImpl.java
trunk/punit/src/org/punit/method/builder/TestMethodBuilder.java
trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java
trunk/punit/src/org/punit/method/runner/ConcurrentMethodRunner.java
trunk/punit/src/org/punit/method/runner/MethodRunner.java
trunk/punit/src/org/punit/runner/AbstractRunner.java
trunk/punit/src/org/punit/suite/builder/TestSuiteBuilder.java
trunk/punit/src/org/punit/suite/builder/TestSuiteBuilderImpl.java
trunk/punit.test/src/tests/api/org/punit/method/builder/TestMethodBuilderTest.java
trunk/punit.test/src/tests/api/org/punit/suite/builder/TestSuiteBuilderTest.java
Modified: trunk/punit/src/org/punit/method/builder/MethodBuilderImpl.java
===================================================================
--- trunk/punit/src/org/punit/method/builder/MethodBuilderImpl.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit/src/org/punit/method/builder/MethodBuilderImpl.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -15,12 +15,12 @@
*/
public class MethodBuilderImpl implements TestMethodBuilder {
- private static final long serialVersionUID = -6593981780599574964L;
+ private static final long serialVersionUID = -7839703149112306751L;
- private Convention _filter;
+ private Convention _convention;
- public void setMethodFilter(Convention filter) {
- _filter = filter;
+ public void setConvention(Convention convention) {
+ _convention = convention;
}
/**
@@ -30,7 +30,7 @@
* @return
*/
protected boolean isTestMethod(Method method) {
- return _filter.isTestMethod(method);
+ return _convention.isTestMethod(method);
}
/**
Modified: trunk/punit/src/org/punit/method/builder/TestMethodBuilder.java
===================================================================
--- trunk/punit/src/org/punit/method/builder/TestMethodBuilder.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit/src/org/punit/method/builder/TestMethodBuilder.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -24,5 +24,5 @@
public Collection buildTestMethods(Class testClass);
- public void setMethodFilter(Convention filter);
+ public void setConvention(Convention convention);
}
Modified: trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -24,7 +24,7 @@
private RunnerProperties _runnerProperties;
- protected Convention _filter;
+ protected Convention _convention;
protected transient Object _testInstance;
@@ -137,10 +137,10 @@
_class = testInstance.getClass();
_params = params;
_method = method;
- _setUpMethod = _filter.getSetupMethod(_class);
- _tearDownMethod = _filter.getTearDownMethod(_class);
- _checkMethod = _filter.getCheckMethod(method);
- _expectedException = _filter.getExpectedException(method);
+ _setUpMethod = _convention.getSetupMethod(_class);
+ _tearDownMethod = _convention.getTearDownMethod(_class);
+ _checkMethod = _convention.getCheckMethod(method);
+ _expectedException = _convention.getExpectedException(method);
}
/**
@@ -301,8 +301,8 @@
}
}
- public void setMethodFilter(Convention filter) {
- _filter = filter;
+ public void setConvention(Convention convention) {
+ _convention = convention;
}
protected void runMethod() throws Throwable {
Modified: trunk/punit/src/org/punit/method/runner/ConcurrentMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/method/runner/ConcurrentMethodRunner.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit/src/org/punit/method/runner/ConcurrentMethodRunner.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -49,11 +49,11 @@
private void initThreads() {
int threadCount = _concurrentCount;
- int count = _filter.getConcurrentCount(_testInstance);
+ int count = _convention.getConcurrentCount(_testInstance);
if(count > 0) {
threadCount = count;
}
- count = _filter.getConcurrentCount(_method);
+ count = _convention.getConcurrentCount(_method);
if(count > 0) {
threadCount = count;
}
Modified: trunk/punit/src/org/punit/method/runner/MethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/method/runner/MethodRunner.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit/src/org/punit/method/runner/MethodRunner.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -38,5 +38,5 @@
public Object clone();
- public void setMethodFilter(Convention filter);
+ public void setConvention(Convention convention);
}
Modified: trunk/punit/src/org/punit/runner/AbstractRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/AbstractRunner.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit/src/org/punit/runner/AbstractRunner.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -33,7 +33,7 @@
private ExecutorPool _executorPool;
- private Convention _filter;
+ private Convention _convention;
public AbstractRunner(TestSuiteBuilder testSuiteBuiler,
TestMethodBuilder testMethodBuilder, MethodRunner testMethodRunner) {
@@ -46,11 +46,11 @@
setConvention(new NameConvention());
}
- public void setConvention(Convention filter) {
- _filter = filter;
- _testSuiteBuiler.setFilter(filter);
- _testMethodBuilder.setMethodFilter(filter);
- _methodRunner.setMethodFilter(filter);
+ public void setConvention(Convention convention) {
+ _convention = convention;
+ _testSuiteBuiler.setConvention(convention);
+ _testMethodBuilder.setConvention(convention);
+ _methodRunner.setConvention(convention);
}
public void run(Class clazz) {
@@ -259,14 +259,14 @@
}
private void beforeClass(Class clazz) {
- Method beforeClassMethod = _filter.getBeforeClassMethod(clazz);
+ Method beforeClassMethod = _convention.getBeforeClassMethod(clazz);
if(beforeClassMethod != null) {
ReflectionUtil.invokeMethod(beforeClassMethod, null, new Object[] {});
}
}
private void afterClass(Class clazz) {
- Method afterClassMethod = _filter.getAfterClassMethod(clazz);
+ Method afterClassMethod = _convention.getAfterClassMethod(clazz);
if(afterClassMethod != null) {
ReflectionUtil.invokeMethod(afterClassMethod, null, new Object[] {});
}
Modified: trunk/punit/src/org/punit/suite/builder/TestSuiteBuilder.java
===================================================================
--- trunk/punit/src/org/punit/suite/builder/TestSuiteBuilder.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit/src/org/punit/suite/builder/TestSuiteBuilder.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -20,5 +20,5 @@
*/
public Object[] buildTestClasses(Class testSutie);
- public void setFilter(Convention filter);
+ public void setConvention(Convention convention);
}
Modified: trunk/punit/src/org/punit/suite/builder/TestSuiteBuilderImpl.java
===================================================================
--- trunk/punit/src/org/punit/suite/builder/TestSuiteBuilderImpl.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit/src/org/punit/suite/builder/TestSuiteBuilderImpl.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -14,7 +14,7 @@
private Convention _filter;
- public void setFilter(Convention filter) {
+ public void setConvention(Convention filter) {
_filter = filter;
}
Modified: trunk/punit.test/src/tests/api/org/punit/method/builder/TestMethodBuilderTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/method/builder/TestMethodBuilderTest.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit.test/src/tests/api/org/punit/method/builder/TestMethodBuilderTest.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -14,7 +14,7 @@
protected void setUp() throws Exception {
_builder = new MethodBuilderImpl();
- _builder.setMethodFilter(new NameConvention());
+ _builder.setConvention(new NameConvention());
}
public void testBuildTestMethods1() {
Modified: trunk/punit.test/src/tests/api/org/punit/suite/builder/TestSuiteBuilderTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/suite/builder/TestSuiteBuilderTest.java 2007-06-15 04:42:00 UTC (rev 210)
+++ trunk/punit.test/src/tests/api/org/punit/suite/builder/TestSuiteBuilderTest.java 2007-06-15 04:48:40 UTC (rev 211)
@@ -14,11 +14,11 @@
protected void setUp() throws Exception {
_testSuiteBuidler = new TestSuiteBuilderImpl();
- _testSuiteBuidler.setFilter(new NameConvention());
+ _testSuiteBuidler.setConvention(new NameConvention());
}
public void testBuildExcludedTestClasses1() {
- _testSuiteBuidler.setFilter(new AnnotationConvention());
+ _testSuiteBuidler.setConvention(new AnnotationConvention());
Object[] classes = _testSuiteBuidler.buildTestClasses(ExcludedTestClass1.class);
AssertUtil.assertArray(classes, new Class[] { });
}
@@ -73,7 +73,7 @@
}
public void testBuildTestSuite2ByAnnotationFilter() {
- _testSuiteBuidler.setFilter(new AnnotationConvention());
+ _testSuiteBuidler.setConvention(new AnnotationConvention());
Object[] classes = _testSuiteBuidler.buildTestClasses(TestSuite2.class);
Class[] expectedClasses = new Class[] { TestClass4.class,
TestClass1.class, TestClass2.class, TestClass3.class, TestClass5.class };
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
