You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by br...@apache.org on 2006/03/01 15:39:11 UTC
svn commit: r382036 - in /maven/surefire/branches/surefire-testng:
surefire-api/ surefire-api/src/main/java/org/apache/maven/surefire/
surefire-api/src/main/java/org/apache/maven/surefire/battery/
surefire-api/src/main/java/org/apache/maven/surefire/ba...
Author: brett
Date: Wed Mar 1 06:39:09 2006
New Revision: 382036
URL: http://svn.apache.org/viewcvs?rev=382036&view=rev
Log:
[MSUREFIRE-23] clean up surefire, move test ng battery
Added:
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGBattery.java (contents, props changed)
- copied, changed from r382020, maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGBattery.java
Removed:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGBattery.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssert.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryAssertionFailedError.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/assertion/BatteryComparisonFailure.java
maven/surefire/branches/surefire-testng/surefire-api/src/test/java/org/apache/maven/surefire/SimpleBatteryTest.java
Modified:
maven/surefire/branches/surefire-testng/surefire-api/pom.xml
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java
Modified: maven/surefire/branches/surefire-testng/surefire-api/pom.xml
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/pom.xml?rev=382036&r1=382035&r2=382036&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/pom.xml (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/pom.xml Wed Mar 1 06:39:09 2006
@@ -28,12 +28,14 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0.5</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <!-- Note, this is *deliberately* test -->
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java?rev=382036&r1=382035&r2=382036&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/Surefire.java Wed Mar 1 06:39:09 2006
@@ -17,7 +17,6 @@
*/
import org.apache.maven.surefire.battery.Battery;
-import org.apache.maven.surefire.battery.TestNGBattery;
import org.apache.maven.surefire.battery.assertion.BatteryTestFailedException;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.Reporter;
@@ -313,29 +312,29 @@
* Determines if <i>any</i> of the batteries specified
* is an instance of {@link TestNGBattery}.
*
- * @param batteries The batteries to check
- * @return True, if any of the objects are an instanceof {@link TestNGBattery}
- */
- public boolean isTestNG( List batteries )
- {
- if ( batteries.size() > 0 )
- {
- for ( int i = 0; i < batteries.size(); i++ )
- {
- Object obj = batteries.get( i );
- if ( obj instanceof TestNGBattery )
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
+ * @param batteries The batteries to check
* @param battery
* @param reportManager
+ * @return True, if any of the objects are an instanceof {@link TestNGBattery}
+ * TODO
+ * public boolean isTestNG( List batteries )
+ * {
+ * if ( batteries.size() > 0 )
+ * {
+ * for ( int i = 0; i < batteries.size(); i++ )
+ * {
+ * Object obj = batteries.get( i );
+ * if ( obj instanceof TestNGBattery )
+ * {
+ * return true;
+ * }
+ * }
+ * }
+ * <p/>
+ * return false;
+ * }
+ * <p/>
+ * /**
* @throws Exception
*/
public void executeBattery( Battery battery, ReporterManager reportManager )
Modified: maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java?rev=382036&r1=382035&r2=382036&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/AbstractBattery.java Wed Mar 1 06:39:09 2006
@@ -17,25 +17,24 @@
*/
import org.apache.maven.surefire.Surefire;
-import org.apache.maven.surefire.battery.assertion.BatteryAssert;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.ReporterManager;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
public abstract class AbstractBattery
- extends BatteryAssert
implements Battery
{
private static final String TEST_METHOD_PREFIX = "test";
- private List testMethods;
+ protected List testMethods;
- private List subBatteryClassNames;
+ protected List subBatteryClassNames;
private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
@@ -291,5 +290,16 @@
}
return subBatteryClassNames;
+ }
+
+ public static boolean isValidMethod( Method m )
+ {
+ boolean isInstanceMethod = !Modifier.isStatic( m.getModifiers() );
+
+ boolean returnsVoid = m.getReturnType().equals( void.class );
+
+ boolean hasNoParams = m.getParameterTypes().length == 0;
+
+ return isInstanceMethod && returnsVoid && hasNoParams;
}
}
Modified: maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java?rev=382036&r1=382035&r2=382036&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/JUnitBattery.java Wed Mar 1 06:39:09 2006
@@ -227,6 +227,7 @@
}
private void executeJUnit( ReporterManager reportManager )
+ throws BatteryTestFailedException
{
try
{
Copied: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGBattery.java (from r382020, maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGBattery.java)
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGBattery.java?p2=maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGBattery.java&p1=maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGBattery.java&r1=382020&r2=382036&rev=382036&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGBattery.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGBattery.java Wed Mar 1 06:39:09 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.surefire.battery;
+package org.apache.maven.surefire.testng;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -16,12 +16,11 @@
* limitations under the License.
*/
-import org.apache.maven.surefire.battery.assertion.BatteryAssert;
+import org.apache.maven.surefire.battery.AbstractBattery;
import org.apache.maven.surefire.report.ReporterManager;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.List;
/**
* Main plugin point for running testng tests within the Surefire runtime
@@ -30,12 +29,8 @@
* @author jkuhnert
*/
public class TestNGBattery
- implements Battery
+ extends AbstractBattery
{
- protected List testMethods;
-
- protected List subBatteryClassNames;
-
private Class testClass;
/**
@@ -89,8 +84,7 @@
{
Method m = methods[i];
- // TODO: better location
- if ( BatteryAssert.isValidMethod( m ) )
+ if ( isValidMethod( m ) )
{
String simpleName = m.getName();
@@ -105,10 +99,6 @@
}
}
- public void discoverBatteryClassNames()
- {
- }
-
public void execute( ReporterManager reportManager )
{
}
@@ -118,25 +108,4 @@
return testClass.getName();
}
- public void addSubBatteryClassName( String batteryClassName )
- {
- getSubBatteryClassNames().add( batteryClassName );
- }
-
- public List getSubBatteryClassNames()
- {
- if ( subBatteryClassNames == null )
- {
- subBatteryClassNames = new ArrayList();
- }
-
- return subBatteryClassNames;
- }
-
- public int getTestCount()
- {
- discoverTestMethods();
-
- return testMethods.size();
- }
}
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGBattery.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGBattery.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"