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 14:58:50 UTC
svn commit: r382020 - 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/re...
Author: brett
Date: Wed Mar 1 05:58:47 2006
New Revision: 382020
URL: http://svn.apache.org/viewcvs?rev=382020&view=rev
Log:
[MSUREFIRE-23] separate out the test ng provider (sort of)
Added:
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java (contents, props changed)
- copied, changed from r382010, maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXMLBattery.java (contents, props changed)
- copied, changed from r382010, maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGXMLBattery.java
Removed:
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGXMLBattery.java
maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/TestNGReporter.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/SurefireUtils.java
maven/surefire/branches/surefire-testng/surefire-providers/ (props changed)
maven/surefire/branches/surefire-testng/surefire-providers/surefire-junit/ (props changed)
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/ (props changed)
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=382020&r1=382019&r2=382020&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/pom.xml (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/pom.xml Wed Mar 1 05:58:47 2006
@@ -35,17 +35,5 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>4.6.1-SNAPSHOT</version>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>4.6.1-SNAPSHOT</version>
- <classifier>jdk14</classifier>
- </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=382020&r1=382019&r2=382020&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 05:58:47 2006
@@ -17,19 +17,11 @@
*/
import org.apache.maven.surefire.battery.Battery;
-import org.apache.maven.surefire.battery.JUnitBattery;
import org.apache.maven.surefire.battery.TestNGBattery;
-import org.apache.maven.surefire.battery.TestNGXMLBattery;
import org.apache.maven.surefire.battery.assertion.BatteryTestFailedException;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.Reporter;
import org.apache.maven.surefire.report.ReporterManager;
-import org.apache.maven.surefire.report.TestNGReporter;
-import org.testng.ISuiteListener;
-import org.testng.ITestListener;
-import org.testng.TestNG;
-import org.testng.internal.Utils;
-import org.testng.xml.ClassSuite;
import java.util.ArrayList;
import java.util.Iterator;
@@ -122,21 +114,25 @@
public boolean run()
throws Exception
{
+/* TODO
//required for jdk14 javadoc annotations
if ( testSourceDirectory != null )
{
SurefireUtils.setTestSourceDirectory( testSourceDirectory );
}
+*/
List batts = instantiateBatteries( batteryHolders, classLoader );
reporterManager = new ReporterManager( instantiateReports( reports, classLoader ), reportsDirectory );
+/* TODO: new, remove
boolean jvm15 = false;
if ( System.getProperty( "java.version" ).indexOf( "1.5" ) > -1 )
{
jvm15 = true;
}
+*/
try
{
@@ -166,8 +162,8 @@
reporterManager.batteryAborted( report );
}
- //TestNG needs a little config love
- if ( battery instanceof TestNGXMLBattery )
+ //TestNG needs a little config love -- TODO
+/* if ( battery instanceof TestNGXMLBattery )
{
TestNGXMLBattery xbat = (TestNGXMLBattery) battery;
xbat.setOutputDirectory( reportsDirectory );
@@ -175,12 +171,12 @@
xbat.execute( reporterManager );
nbTests += xbat.getTestCount();
}
- else if ( testCount > 0 )
- {
- executeBattery( battery, reporterManager );
+ else */if ( testCount > 0 )
+ {
+ executeBattery( battery, reporterManager );
- nbTests += testCount;
- }
+ nbTests += testCount;
+ }
List list = new ArrayList();
@@ -194,6 +190,7 @@
List subBatteries = instantiateBatteries( list, classLoader );
+/* TODO
//Handle testng tests
if ( forceTestNG || isTestNG( subBatteries ) )
{
@@ -250,6 +247,7 @@
List result = testNG.runSuitesLocally();
nbTests += result.size();
}
+*/
//continue normal mode
for ( Iterator j = subBatteries.iterator(); j.hasNext(); )
Modified: maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/SurefireUtils.java
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/SurefireUtils.java?rev=382020&r1=382019&r2=382020&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/SurefireUtils.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/SurefireUtils.java Wed Mar 1 05:58:47 2006
@@ -1,5 +1,10 @@
package org.apache.maven.surefire;
+import org.apache.maven.surefire.battery.JUnitBattery;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+
/*
* Copyright 2001-2006 The Apache Software Foundation.
*
@@ -16,20 +21,13 @@
* limitations under the License.
*/
-import org.apache.maven.surefire.battery.JUnitBattery;
-import org.apache.maven.surefire.battery.TestNGBattery;
-import org.testng.internal.TestNGClassFinder;
-import org.testng.internal.annotations.IAnnotationFinder;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-
/**
* @author Jason van Zyl
* @version $Id$
*/
public class SurefireUtils
{
+/* TODO
private static final IAnnotationFinder annotationFinder;
static
@@ -44,17 +42,16 @@
annotationFinder = new org.testng.internal.annotations.JDK14AnnotationFinder();
}
}
+*/
/**
* For testng javadoc annotations, sets the test source directory source.
*
- * @param testSourceDirectory
+ * @param testSourceDirectory public static void setTestSourceDirectory( String testSourceDirectory )
+ * {
+ * annotationFinder.addSourceDirs( new String[]{testSourceDirectory} );
+ * }
*/
- public static void setTestSourceDirectory( String testSourceDirectory )
- {
- annotationFinder.addSourceDirs( new String[]{testSourceDirectory} );
- }
-
public static Object instantiateBattery( Object[] holder, ClassLoader loader )
throws Exception
{
@@ -102,10 +99,12 @@
battery = testClass.newInstance();
}
}
- else if ( TestNGClassFinder.isTestNGClass( testClass, annotationFinder ) )
- {
- battery = new TestNGBattery( testClass, loader );
- }
+ /* TODO
+ else if ( TestNGClassFinder.isTestNGClass( testClass, annotationFinder ) )
+ {
+ battery = new TestNGBattery( testClass, loader );
+ }
+ */
else
{
battery = new JUnitBattery( testClass, loader );
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 1 05:58:47 2006
@@ -0,0 +1,3 @@
+*.iml
+*.ipr
+*.iws
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/surefire-junit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 1 05:58:47 2006
@@ -0,0 +1,5 @@
+target
+*.iml
+*.ipr
+*.iws
+
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 1 05:58:47 2006
@@ -0,0 +1,5 @@
+target
+*.iml
+*.ipr
+*.iws
+
Copied: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java (from r382010, maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java)
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java?p2=maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java&p1=maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java&r1=382010&r2=382020&rev=382020&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/report/TestNGReporter.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java Wed Mar 1 05:58:47 2006
@@ -1,7 +1,4 @@
-/**
- *
- */
-package org.apache.maven.surefire.report;
+package org.apache.maven.surefire.testng;
/*
* Copyright 2001-2006 The Apache Software Foundation.
@@ -20,6 +17,8 @@
*/
import org.apache.maven.surefire.Surefire;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.ReporterManager;
import org.testng.ISuite;
import org.testng.ISuiteListener;
import org.testng.ITestContext;
@@ -30,7 +29,7 @@
/**
* Listens for and provides and adaptor layer so that
* TestNG tests can report their status to the current
- * {@link ReporterManager}.
+ * {@link org.apache.maven.surefire.report.ReporterManager}.
*
* @author jkuhnert
*/
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXMLBattery.java (from r382010, maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGXMLBattery.java)
URL: http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXMLBattery.java?p2=maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXMLBattery.java&p1=maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGXMLBattery.java&r1=382010&r2=382020&rev=382020&view=diff
==============================================================================
--- maven/surefire/branches/surefire-testng/surefire-api/src/main/java/org/apache/maven/surefire/battery/TestNGXMLBattery.java (original)
+++ maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXMLBattery.java Wed Mar 1 05:58:47 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,8 +16,8 @@
* limitations under the License.
*/
+import org.apache.maven.surefire.battery.Battery;
import org.apache.maven.surefire.report.ReporterManager;
-import org.apache.maven.surefire.report.TestNGReporter;
import org.testng.ISuiteListener;
import org.testng.ITestListener;
import org.testng.TestNG;
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXMLBattery.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXMLBattery.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"