Author: krosenvold
Date: Tue Nov 30 21:24:29 2010
New Revision: 1040777
URL: http://svn.apache.org/viewvc?rev=1040777&view=rev
Log:
o Removed dead/unused code
Removed:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/assertion/ComparisonTool.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/assertion/SurefireAssert.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/assertion/SurefireAssertionFailedException.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/assertion/SurefireComparisonFailureException.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ApiSerializer.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterManagerFactoryAware.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReportingAware.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/assertion/ComparisonToolTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/assertion/SurefireAssertTest.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/BaseProviderFactory.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderFactory.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestRequestAware.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
Tue Nov 30 21:24:29 2010
@@ -30,7 +30,6 @@ import org.apache.maven.surefire.booter.
import org.apache.maven.surefire.booter.ProviderFactory;
import org.apache.maven.surefire.booter.SurefireBooterForkException;
import org.apache.maven.surefire.booter.SurefireExecutionException;
-import org.apache.maven.surefire.booter.SurefireReflector;
import org.apache.maven.surefire.booter.SurefireStarter;
import org.apache.maven.surefire.booter.SystemPropertyManager;
import org.apache.maven.surefire.providerapi.SurefireProvider;
@@ -88,7 +87,7 @@ public class ForkStarter
if ( ForkConfiguration.FORK_NEVER.equals( requestedForkMode ) )
{
SurefireStarter testVmBooter = new SurefireStarter(
booterConfiguration );
- result = testVmBooter.runSuitesInProcess(
booterConfiguration.getProviderProperties() );
+ result = testVmBooter.runSuitesInProcess();
}
else if ( ForkConfiguration.FORK_ONCE.equals( requestedForkMode ) )
{
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
Tue Nov 30 21:24:29 2010
@@ -249,32 +249,6 @@ public class SurefireReflector
return invokeMethod( providerFactory, createProvider, noargsValues );
}
- public static Object getSuites( Object surefireProvider )
- {
- final Method getSuites = getMethod( surefireProvider, "getSuites", new
Class[]{ } );
- return invokeMethod( surefireProvider, getSuites, new Object[]{ } );
- }
-
-
- private int invokeRunMethod( Object surefire, Method method, Object[] args
)
- throws RuntimeException
-
- {
- try
- {
- final Integer invoke = (Integer) method.invoke( surefire, args );
- return invoke.intValue();
- }
- catch ( IllegalAccessException e )
- {
- throw new RuntimeException( "When instantiating surefire", e );
- }
- catch ( InvocationTargetException e )
- {
- throw new RuntimeException( e.getTargetException().getMessage(),
e.getTargetException() );
- }
-
- }
private static Object invokeSetter( Object surefire, Method method, Object
value )
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/BaseProviderFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/BaseProviderFactory.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/BaseProviderFactory.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/BaseProviderFactory.java
Tue Nov 30 21:24:29 2010
@@ -112,11 +112,6 @@ public abstract class BaseProviderFactor
return testClassLoader;
}
- protected ClassLoader getSurefireClassLoader()
- {
- return surefireClassLoader;
- }
-
public void setProviderProperties( Properties providerProperties )
{
this.providerProperties = providerProperties;
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderFactory.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderFactory.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderFactory.java
Tue Nov 30 21:24:29 2010
@@ -24,5 +24,6 @@ package org.apache.maven.surefire.provid
*/
public interface ProviderFactory
{
+ /** @noinspection UnusedDeclaration*/
SurefireProvider createProvider();
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderPropertiesAware.java
Tue Nov 30 21:24:29 2010
@@ -26,5 +26,6 @@ import java.util.Properties;
*/
public interface ProviderPropertiesAware
{
+ /** @noinspection UnusedDeclaration*/
void setProviderProperties( Properties providerProperties );
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ReporterConfigurationAware.java
Tue Nov 30 21:24:29 2010
@@ -26,5 +26,6 @@ import org.apache.maven.surefire.report.
*/
public interface ReporterConfigurationAware
{
+ /** @noinspection UnusedDeclaration*/
void setReporterConfiguration( ReporterConfiguration reporterConfiguration
);
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestArtifactInfoAware.java
Tue Nov 30 21:24:29 2010
@@ -26,5 +26,6 @@ import org.apache.maven.surefire.testset
*/
public interface TestArtifactInfoAware
{
+ /** @noinspection UnusedDeclaration*/
void setTestArtifactInfo( TestArtifactInfo testArtifactInfo );
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestRequestAware.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestRequestAware.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestRequestAware.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/TestRequestAware.java
Tue Nov 30 21:24:29 2010
@@ -26,5 +26,6 @@ import org.apache.maven.surefire.testset
*/
public interface TestRequestAware
{
+ /** @noinspection UnusedDeclaration*/
void setTestRequest( TestRequest testSuiteDefinition );
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
Tue Nov 30 21:24:29 2010
@@ -19,8 +19,6 @@ package org.apache.maven.surefire.suite;
* under the License.
*/
-import java.util.Properties;
-
/**
* Represents a test-run-result; this may be from a single test run or an
aggregated result.
*
@@ -36,14 +34,8 @@ public class RunResult
private final int skipped;
- public static final RunResult No_Tests = new RunResult( -1, -1, -1, -1 );
-
- public static final RunResult Failure = new RunResult( -2, -2, -2, -2 );
-
public static final int SUCCESS = 0;
- public static final int NO_TESTS = 254;
-
public static final int FAILURE = 255;
public RunResult( int completedCount, int errors, int failures, int
skipped )
@@ -81,10 +73,6 @@ public class RunResult
public int getBooterCode()
{
- if ( this == No_Tests )
- {
- return NO_TESTS;
- }
return getFailures() == 0 ? SUCCESS : FAILURE;
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
Tue Nov 30 21:24:29 2010
@@ -134,11 +134,6 @@ public class DefaultDirectoryScanner
return incs;
}
- public File getBasedir()
- {
- return basedir;
- }
-
public List getIncludes()
{
return includes;
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DirectoryScanner.java
Tue Nov 30 21:24:29 2010
@@ -26,9 +26,9 @@ public interface DirectoryScanner
{
/**
* Locates tests based on scanning directories
- * @param classLoader
- * @param scannerFilter
- * @return
+ * @param classLoader The classloader to use when loading classes
+ * @param scannerFilter The filter to include/exclude test classes
+ * @return The found classes that match the filter
*/
Class[] locateTestClasses( ClassLoader classLoader, ScannerFilter
scannerFilter );
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/PrettyPrintXMLWriter.java
Tue Nov 30 21:24:29 2010
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.util;
import org.codehaus.plexus.util.xml.XMLWriter;
import java.io.PrintWriter;
-import java.io.Writer;
import java.util.LinkedList;
public class PrettyPrintXMLWriter
@@ -46,26 +45,11 @@ public class PrettyPrintXMLWriter
private boolean tagIsEmpty;
- public PrettyPrintXMLWriter( PrintWriter writer, String lineIndenter )
- {
- this( writer, lineIndenter, null, null );
- }
-
- public PrettyPrintXMLWriter( Writer writer, String lineIndenter )
- {
- this( new PrintWriter( writer ), lineIndenter );
- }
-
public PrettyPrintXMLWriter( PrintWriter writer )
{
this( writer, null, null );
}
- public PrettyPrintXMLWriter( Writer writer )
- {
- this( new PrintWriter( writer ) );
- }
-
public PrettyPrintXMLWriter( PrintWriter writer, String lineIndenter,
String encoding, String doctype )
{
this.writer = writer;
@@ -82,21 +66,11 @@ public class PrettyPrintXMLWriter
}
}
- public PrettyPrintXMLWriter( Writer writer, String lineIndenter, String
encoding, String doctype )
- {
- this( new PrintWriter( writer ), lineIndenter, encoding, doctype );
- }
-
public PrettyPrintXMLWriter( PrintWriter writer, String encoding, String
doctype )
{
this( writer, " ", encoding, doctype );
}
- public PrettyPrintXMLWriter( Writer writer, String encoding, String
doctype )
- {
- this( new PrintWriter( writer ), encoding, doctype );
- }
-
public void startElement( String name )
{
tagIsEmpty = false;
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
Tue Nov 30 21:24:29 2010
@@ -89,7 +89,7 @@ public class ClasspathConfiguration
public void setForkProperties( Properties properties )
{
- classpathUrls.setForkProperties( properties,
BooterConstants.CLASSPATH_URL);
+ classpathUrls.setForkProperties( properties,
BooterConstants.CLASSPATH_URL );
surefireClasspathUrls.setForkProperties( properties,
BooterConstants.SUREFIRE_CLASSPATHURL );
properties.setProperty( BooterConstants.ENABLE_ASSERTIONS,
String.valueOf( enableAssertions ) );
properties.setProperty( BooterConstants.CHILD_DELEGATION,
String.valueOf( childDelegation ) );
@@ -114,30 +114,27 @@ public class ClasspathConfiguration
public ClassLoader createTestClassLoaderConditionallySystem( boolean
useSystemClassLoader )
throws SurefireExecutionException
{
- final ClassLoader classLoader =
- useSystemClassLoader ? ClassLoader.getSystemClassLoader() :
createTestClassLoader( this.childDelegation );
- return classLoader;
+ return useSystemClassLoader
+ ? ClassLoader.getSystemClassLoader()
+ : createTestClassLoader( this.childDelegation );
}
public ClassLoader createTestClassLoader( boolean childDelegation )
throws SurefireExecutionException
{
- final ClassLoader classLoaderSEE = createClassLoaderSEE(
classpathUrls, null, childDelegation );
- return classLoaderSEE;
+ return createClassLoaderSEE( classpathUrls, null, childDelegation );
}
public ClassLoader createTestClassLoader()
throws SurefireExecutionException
{
- final ClassLoader classLoaderSEE = createClassLoaderSEE(
classpathUrls, null, this.childDelegation );
- return classLoaderSEE;
+ return createClassLoaderSEE( classpathUrls, null, this.childDelegation
);
}
public ClassLoader createSurefireClassLoader( ClassLoader parent )
throws SurefireExecutionException
{
- final ClassLoader classLoaderSEE = createClassLoaderSEE(
surefireClasspathUrls, parent, false );
- return classLoaderSEE;
+ return createClassLoaderSEE( surefireClasspathUrls, parent, false );
}
private ClassLoader createClassLoaderSEE( Classpath classPathUrls,
ClassLoader parent, boolean childDelegation )
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
Tue Nov 30 21:24:29 2010
@@ -73,7 +73,7 @@ public class ForkedBooter
}
else
{
- result = booter.runSuitesInProcess( p );
+ result = booter.runSuitesInProcess();
}
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
Tue Nov 30 21:24:29 2010
@@ -38,11 +38,6 @@ public class IsolatedClassLoader
private static final URL[] EMPTY_URL_ARRAY = new URL[0];
- public IsolatedClassLoader()
- {
- super( EMPTY_URL_ARRAY, null );
- }
-
public IsolatedClassLoader( ClassLoader parent, boolean childDelegation )
{
super( EMPTY_URL_ARRAY, parent );
@@ -50,11 +45,6 @@ public class IsolatedClassLoader
this.childDelegation = childDelegation;
}
- public IsolatedClassLoader( ClassLoader parent )
- {
- super( EMPTY_URL_ARRAY, parent );
- }
-
public void addURL( URL url )
{
// avoid duplicates
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java?rev=1040777&r1=1040776&r2=1040777&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireStarter.java
Tue Nov 30 21:24:29 2010
@@ -103,7 +103,7 @@ public class SurefireStarter
}
}
- public int runSuitesInProcess( Properties p )
+ public int runSuitesInProcess()
throws SurefireExecutionException
{
// TODO: replace with plexus
