Author: krosenvold
Date: Mon Dec 5 21:44:56 2011
New Revision: 1210655
URL: http://svn.apache.org/viewvc?rev=1210655&view=rev
Log:
o Removed unused code
Removed:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/TestConsoleOutputRunListener.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ThreadLocalRunListener.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/SynchronizedReporterManager.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.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/report/CategorizedReportEntry.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1210655&r1=1210654&r2=1210655&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Mon Dec 5 21:44:56 2011
@@ -414,11 +414,6 @@ public abstract class AbstractSurefireMo
null );
}
- public File getStatisticsFile( String configurationHash )
- {
- return new File( getStatisticsFileName( configurationHash ) );
- }
-
public String getStatisticsFileName( String configurationHash )
{
return getReportsDirectory().getParentFile().getParentFile() +
File.separator + ".surefire-"
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java?rev=1210655&r1=1210654&r2=1210655&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/surefire/report/BriefFileReporter.java
Mon Dec 5 21:44:56 2011
@@ -31,11 +31,6 @@ public class BriefFileReporter
extends AbstractFileReporter
{
- public BriefFileReporter( boolean trimStackTrace, File reportsDirectory )
- {
- super( trimStackTrace, BRIEF, reportsDirectory );
- }
-
public BriefFileReporter( boolean trimStackTrace, File reportsDirectory,
String reportNameSuffix )
{
super( trimStackTrace, BRIEF, reportsDirectory, reportNameSuffix );
Modified:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java?rev=1210655&r1=1210654&r2=1210655&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/TestSetMockReporterFactory.java
Mon Dec 5 21:44:56 2011
@@ -21,8 +21,6 @@ package org.apache.maven.plugin.surefire
import org.apache.maven.plugin.surefire.report.FileReporterFactory;
import org.apache.maven.surefire.booter.StartupReportConfiguration;
-import org.apache.maven.surefire.report.ConsoleLogger;
-import org.apache.maven.surefire.report.DefaultConsoleReporter;
import org.apache.maven.surefire.report.RunListener;
/**
@@ -36,11 +34,6 @@ public class TestSetMockReporterFactory
super( StartupReportConfiguration.defaultValue() );
}
- public ConsoleLogger createConsoleLogger()
- {
- return new DefaultConsoleReporter( System.out );
- }
-
public RunListener createReporter()
{
return new MockReporter();
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=1210655&r1=1210654&r2=1210655&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
Mon Dec 5 21:44:56 2011
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.PrintStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Properties;
@@ -35,7 +34,6 @@ import org.apache.maven.surefire.testset
import org.apache.maven.surefire.testset.RunOrderParameters;
import org.apache.maven.surefire.testset.TestArtifactInfo;
import org.apache.maven.surefire.testset.TestRequest;
-import org.apache.maven.surefire.util.NestedRuntimeException;
import org.apache.maven.surefire.util.ReflectionUtils;
import org.apache.maven.surefire.util.RunOrder;
import org.apache.maven.surefire.util.SurefireReflectionException;
@@ -79,8 +77,6 @@ public class SurefireReflector
private final Class reporterFactory;
- private final Method assertionStatusMethod;
-
public SurefireReflector( ClassLoader surefireClassLoader )
{
@@ -102,8 +98,6 @@ public class SurefireReflector
reporterFactory = surefireClassLoader.loadClass(
ReporterFactory.class.getName() );
runResult = surefireClassLoader.loadClass(
RunResult.class.getName() );
booterParameters = surefireClassLoader.loadClass(
ProviderParameters.class.getName() );
- assertionStatusMethod = ReflectionUtils.tryGetMethod(
ClassLoader.class, "setDefaultAssertionStatus",
- new Class[]{
boolean.class } );
}
catch ( ClassNotFoundException e )
{
@@ -342,24 +336,4 @@ public class SurefireReflector
return runResult.isAssignableFrom( o.getClass() );
}
- public void invokeAssertionStatusMethod( ClassLoader classLoader, boolean
enableAssertions )
- {
- if ( assertionStatusMethod != null )
- {
- try
- {
- Object[] args = new Object[]{ enableAssertions ? Boolean.TRUE
: Boolean.FALSE };
- assertionStatusMethod.invoke( classLoader, args );
- }
- catch ( IllegalAccessException e )
- {
- throw new NestedRuntimeException( "Unable to access the
assertion enablement method", e );
- }
- catch ( InvocationTargetException e )
- {
- throw new NestedRuntimeException( "Unable to invoke the
assertion enablement method", e );
- }
- }
- }
-
}
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java?rev=1210655&r1=1210654&r2=1210655&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
Mon Dec 5 21:44:56 2011
@@ -28,12 +28,6 @@ public class CategorizedReportEntry
{
private final String group;
- private CategorizedReportEntry( String name, String group )
- {
- super( name );
- this.group = group;
- }
-
public CategorizedReportEntry( String source, String name, String group )
{
this( source, name, group, null, null );
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1210655&r1=1210654&r2=1210655&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
Mon Dec 5 21:44:56 2011
@@ -132,32 +132,6 @@ public abstract class SurefireVerifierTe
return goals1;
}
- protected List<String> getInitialGoals( String testNgVersion )
- {
- List<String> goals = new ArrayList<String>();
- goals.add( "-Dsurefire.version=" + surefireVersion );
-
- if ( testNgVersion != null )
- {
- goals.add( "-DtestNgVersion=" + testNgVersion );
-
- ArtifactVersion v = new DefaultArtifactVersion( testNgVersion );
- try
- {
- if ( VersionRange.createFromVersionSpec( "(,5.12.1)"
).containsVersion( v ) )
- {
- goals.add( "-DtestNgClassifier=jdk15" );
- }
- }
- catch ( InvalidVersionSpecificationException e )
- {
- throw new RuntimeException( e.getMessage(), e );
- }
- }
-
- return goals;
- }
-
/**
* Returns a file, referenced from the extracted root (where pom.xml is
located)
*
@@ -340,11 +314,6 @@ public abstract class SurefireVerifierTe
return false; // doh
}
- protected boolean isMaven3X()
- {
- return matchesVersionRange( "[3.0,)" );
- }
-
private DefaultArtifactVersion getMavenVersion()
{
try
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java?rev=1210655&r1=1210654&r2=1210655&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
Mon Dec 5 21:44:56 2011
@@ -21,14 +21,11 @@ package org.apache.maven.surefire.junitc
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.PrintStream;
import java.util.HashMap;
import java.util.Map;
import org.apache.maven.plugin.surefire.report.FileReporterFactory;
-import org.apache.maven.surefire.booter.StartupReportConfiguration;
import org.apache.maven.surefire.report.DefaultConsoleReporter;
-import org.apache.maven.surefire.report.ReporterConfiguration;
import org.apache.maven.surefire.report.ReporterFactory;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.report.RunStatistics;
@@ -401,11 +398,6 @@ public class ConcurrentReporterManagerTe
return FileReporterFactory.defaultNoXml();
}
- public static ReporterConfiguration getTestReporterConfiguration()
- {
- return new ReporterConfiguration( new File( "." ), Boolean.TRUE );
- }
-
private void assertReporter( RunStatistics result, int success, int
ignored, int failure, String message )
{
