Author: brett
Date: Wed Mar 22 15:28:26 2006
New Revision: 387971
URL: http://svn.apache.org/viewcvs?rev=387971&view=rev
Log:
[MSUREFIRE-69] stop output to test-output directory
Submitted by: Jesse Kuhnert
Modified:
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
Modified:
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml?rev=387971&r1=387970&r2=387971&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
(original)
+++
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/pom.xml
Wed Mar 22 15:28:26 2006
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>4.6.1</version>
+ <version>4.7-SNAPSHOT</version>
<classifier>jdk14</classifier>
</dependency>
</dependencies>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>4.6.1</version>
+ <version>4.7-SNAPSHOT</version>
<classifier>jdk15</classifier>
</dependency>
</dependencies>
Modified:
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java?rev=387971&r1=387970&r2=387971&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
Wed Mar 22 15:28:26 2006
@@ -83,7 +83,7 @@
{
annotationClass = Class.forName(
"org.testng.internal.annotations.JDK14AnnotationFinder" );
}
-
+
annotationFinder = (IAnnotationFinder) annotationClass.newInstance();
}
@@ -168,7 +168,8 @@
private void executeTestNG( XmlSuite suite, ReporterManager
reporterManager )
{
- TestNG testNG = new TestNG();
+ TestNG testNG = new TestNG( false );
+
// turn off all TestNG output
testNG.setVerbose( 0 );
Modified:
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
URL:
http://svn.apache.org/viewcvs/maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java?rev=387971&r1=387970&r2=387971&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
Wed Mar 22 15:28:26 2006
@@ -36,28 +36,29 @@
private TestNGExecutor()
{
}
-
+
static void executeTestNG( SurefireTestSuite surefireSuite, String
testSourceDirectory, XmlSuite suite,
ReporterManager reporterManager )
{
- TestNG testNG = new TestNG();
+ TestNG testNG = new TestNG( false );
+
// turn off all TestNG output
testNG.setVerbose( 0 );
-
+
testNG.setXmlSuites( Collections.singletonList( suite ) );
-
+
testNG.setListenerClasses( new ArrayList() );
-
+
TestNGReporter reporter = new TestNGReporter( reporterManager,
surefireSuite );
testNG.addListener( (ITestListener) reporter );
testNG.addListener( (ISuiteListener) reporter );
-
+
// Set source path so testng can find javadoc annotations if not in
1.5 jvm
if ( testSourceDirectory != null )
{
testNG.setSourcePath( testSourceDirectory );
}
-
+
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(
suite.getClass().getClassLoader() );
testNG.runSuitesLocally();
Modified:
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/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?rev=387971&r1=387970&r2=387971&view=diff
==============================================================================
---
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
(original)
+++
maven/surefire/branches/surefire-testng/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
Wed Mar 22 15:28:26 2006
@@ -77,7 +77,7 @@
String group = groupString( result.getMethod().getGroups(),
result.getTestClass().getName() );
ReportEntry report = new ReportEntry( source,
result.getTestClass().getName() + "#" +
result.getMethod().getMethodName(), group, rawString );
-
+
reportManager.testStarting( report );
}
