Author: krosenvold
Date: Sun May 1 12:02:26 2011
New Revision: 1098271
URL: http://svn.apache.org/viewvc?rev=1098271&view=rev
Log:
o Removed unused code
Removed:
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/AbstractConsoleReporterTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AsynchRunListener.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/AsynchRunListenerTest.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.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/PropertiesWrapper.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
Sun May 1 12:02:26 2011
@@ -19,6 +19,11 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -36,14 +41,6 @@ import org.apache.maven.artifact.version
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.surefire.booter.Classpath;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* Does dependency resolution and artifact handling for the surefire plugin.
*
@@ -109,30 +106,6 @@ public class SurefireDependencyResolver
}
}
- /**
- * Return a new set containing only the artifacts accepted by the given
filter.
- *
- * @param artifacts The unfiltered artifacts
- * @param filter The filter to apply
- * @return The filtered result
- * @noinspection UnusedDeclaration
- */
- public Set filterArtifacts( Set artifacts, ArtifactFilter filter )
- {
- Set filteredArtifacts = new LinkedHashSet();
-
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
- {
- Artifact artifact = (Artifact) iter.next();
- if ( !filter.include( artifact ) )
- {
- filteredArtifacts.add( artifact );
- }
- }
-
- return filteredArtifacts;
- }
-
public ArtifactResolutionResult resolveArtifact( Artifact
filteredArtifact, Artifact providerArtifact )
throws ArtifactResolutionException, ArtifactNotFoundException
@@ -201,19 +174,4 @@ public class SurefireDependencyResolver
return new Classpath( files );
}
- public Classpath getResolvedArtifactClasspath( Artifact surefireArtifact )
- throws ArtifactNotFoundException, ArtifactResolutionException
- {
- ArtifactResolutionResult result = resolveArtifact( null,
surefireArtifact );
- List classpath = new ArrayList();
-
- for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
- {
- Artifact artifact = (Artifact) i.next();
-
- classpath.add( artifact.getFile().getAbsolutePath() );
- }
- return new Classpath( classpath);
- }
-
}
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
Sun May 1 12:02:26 2011
@@ -19,10 +19,8 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
-import java.util.List;
import java.util.Properties;
import org.apache.maven.surefire.booter.BooterConstants;
import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
@@ -34,8 +32,6 @@ import org.apache.maven.surefire.report.
import org.apache.maven.surefire.testset.DirectoryScannerParameters;
import org.apache.maven.surefire.testset.TestArtifactInfo;
import org.apache.maven.surefire.testset.TestRequest;
-import org.apache.maven.surefire.util.NestedRuntimeException;
-import org.codehaus.plexus.util.StringUtils;
/**
* Knows how to serialize and deserialize the booter configuration.
@@ -140,100 +136,4 @@ public class BooterSerializer
return value.getClass().getName() + "|" + valueToUse;
}
- private void addPropertiesForTypeHolder( List typeHolderList, Properties
properties, String propertyPrefix )
- {
- for ( int i = 0; i < typeHolderList.size(); i++ )
- {
- Object[] report = (Object[]) typeHolderList.get( i );
-
- String className = (String) report[0];
- Object[] params = (Object[]) report[1];
-
- properties.setProperty( propertyPrefix + i, className );
-
- if ( params != null )
- {
- String paramProperty = getValues( params );
- String typeProperty = getTypes( params );
- properties.setProperty( propertyPrefix + i +
BooterConstants.PARAMS_SUFIX, paramProperty );
- properties.setProperty( propertyPrefix + i +
BooterConstants.TYPES_SUFIX, typeProperty );
- }
- }
- }
-
- private String getValues( Object[] params )
- {
- StringBuffer result = new StringBuffer();
- if ( params != null && params.length > 0 )
- {
- result.append( convert( params[0] ) );
- for ( int j = 1; j < params.length; j++ )
- {
- result.append( "|" );
- if ( params[j] != null )
- {
- result.append( convert( params[j] ) );
- }
- }
- }
- return result.toString();
- }
-
- private String getTypes( Object[] params )
- {
- StringBuffer result = new StringBuffer();
- if ( params != null && params.length > 0 )
- {
- result.append( params[0].getClass().getName() );
- for ( int j = 1; j < params.length; j++ )
- {
- result.append( "|" );
- if ( params[j] != null )
- {
- result.append( params[j].getClass().getName() );
- }
- }
- }
- return result.toString();
- }
-
- private static String convert( Object param )
- {
- if ( param instanceof File[] )
- {
- File[] files = (File[]) param;
- return "[" + StringUtils.join( files, "," ) + "]";
- }
- else if ( param instanceof Properties )
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try
- {
- ( (Properties) param ).store( baos, "" );
- return new String( baos.toByteArray(), "8859_1" );
- }
- catch ( Exception e )
- {
- throw new NestedRuntimeException( "bug in property
conversion", e );
- }
- }
- else
- {
- return param.toString();
- }
- }
-
- private void addList( List items, Properties properties, String
propertyPrefix )
- {
- for ( int i = 0; i < items.size(); i++ )
- {
- Object item = items.get( i );
- if ( item == null )
- {
- throw new NullPointerException( propertyPrefix + i + " has
null value" );
- }
- properties.setProperty( propertyPrefix + i, item.toString() );
- }
- }
-
}
Modified:
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
Sun May 1 12:02:26 2011
@@ -53,8 +53,6 @@ public class BooterDeserializerProviderC
private final String aUserRequestedTest = "aUserRequestedTest";
- private final String aUserRequestedTestMethod = "aUserRequestedTestMethod";
-
public static ClassLoaderConfiguration getForkConfiguration()
throws IOException
{
@@ -185,6 +183,7 @@ public class BooterDeserializerProviderC
File cwd = new File( "." );
ReporterConfiguration reporterConfiguration =
new ReporterConfiguration( cwd, Boolean.TRUE, "abc", "cde", "efg",
"hij" );
+ String aUserRequestedTestMethod = "aUserRequestedTestMethod";
TestRequest testSuiteDefinition =
new TestRequest( getSuiteXmlFileStrings(),
getTestSourceDirectory(), aUserRequestedTest,
aUserRequestedTestMethod );
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/BaseProviderFactory.java
Sun May 1 12:02:26 2011
@@ -45,8 +45,6 @@ public class BaseProviderFactory
private ClassLoader testClassLoader;
- private ClassLoader surefireClassLoader;
-
private TestRequest testRequest;
private TestArtifactInfo testArtifactInfo;
@@ -89,7 +87,6 @@ public class BaseProviderFactory
public void setClassLoaders( ClassLoader surefireClassLoader, ClassLoader
testClassLoader )
{
- this.surefireClassLoader = surefireClassLoader;
this.testClassLoader = testClassLoader;
}
@@ -138,6 +135,7 @@ public class BaseProviderFactory
this.testArtifactInfo = testArtifactInfo;
}
+ /** @noinspection UnusedDeclaration*/
public void setForkConfigurationInfo( ForkConfigurationInfo
forkConfigurationInfo )
{
this.forkConfigurationInfo = forkConfigurationInfo;
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractReporter.java
Sun May 1 12:02:26 2011
@@ -62,16 +62,6 @@ public abstract class AbstractReporter
this.trimStackTrace = trimStackTrace;
}
- AbstractReporter( ReporterConfiguration reporterConfiguration )
- {
- this(reporterConfiguration.isTrimStackTrace().booleanValue());
- }
-
- public void writeFooter( String footer )
- {
- writeMessage( footer );
- }
-
public void writeMessage( byte[] b, int off, int len )
{
@@ -220,10 +210,6 @@ public abstract class AbstractReporter
endTest();
}
- public void testAssumptionFailure( ReportEntry report )
- {
- }
-
void deleteIfExisting( File reportFile )
{
if ( reportFile.exists() )
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AbstractTextReporter.java
Sun May 1 12:02:26 2011
@@ -59,20 +59,6 @@ public abstract class AbstractTextReport
this.writer = writer;
}
- protected AbstractTextReporter( ReporterConfiguration
reporterConfiguration, String format )
- {
- this( reporterConfiguration.isTrimStackTrace().booleanValue(), format);
- }
-
-
- protected AbstractTextReporter( PrintWriter writer, String format,
ReporterConfiguration reporterConfiguration )
- {
- super( reporterConfiguration );
-
- this.writer = writer;
-
- this.format = format;
- }
public void setWriter( PrintWriter writer )
{
@@ -221,17 +207,6 @@ public abstract class AbstractTextReport
return buf.toString();
}
- /**
- * Check if the String passed as argument is a "test set completed"
message.
- *
- * @param message the message to check
- * @return true if it is a "test set completed" message
- */
- public static boolean isTestSetCompletedMessage( String message )
- {
- return message.startsWith( TEST_SET_COMPLETED_PREFIX );
- }
-
public void reset()
{
super.reset();
Modified:
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AsynchRunListener.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AsynchRunListener.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AsynchRunListener.java
(original)
+++
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/AsynchRunListener.java
Sun May 1 12:02:26 2011
@@ -203,11 +203,6 @@ public class AsynchRunListener
consoleOutputReceiver.writeTestOutput( buf, off, len, stdout );
}
- public boolean canJoin( Runnable other )
- {
- return other instanceof JoinableTestOutput && (
(JoinableTestOutput) other ).stdout == this.stdout;
- }
-
public JoinableTestOutput append( JoinableTestOutput other )
{
byte[] combined = ByteBuffer.join( buf, this.off, this.len,
other.buf, other.off, other.len );
Modified:
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/AsynchRunListenerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/AsynchRunListenerTest.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/AsynchRunListenerTest.java
(original)
+++
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/AsynchRunListenerTest.java
Sun May 1 12:02:26 2011
@@ -33,7 +33,6 @@ public class AsynchRunListenerTest
{
byte[] buf;
- int off;
int len;
@@ -42,7 +41,6 @@ public class AsynchRunListenerTest
public void writeTestOutput( byte[] buf, int off, int len, boolean
stdout )
{
this.buf = buf;
- this.off = off;
this.len = len;
this.stdout = stdout;
}
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterConstants.java
Sun May 1 12:02:26 2011
@@ -36,7 +36,6 @@ public interface BooterConstants
String FAILIFNOTESTS = "failIfNoTests";
String ISTRIMSTACKTRACE = "isTrimStackTrace";
String REPORTSDIRECTORY = "reportsDirectory";
- String FORKTIMEOUT = "forkTimeout";
String FORKMODE = "forkMode";
String TESTARTIFACT_VERSION = "testFwJarVersion";
String TESTARTIFACT_CLASSIFIER = "testFwJarClassifier";
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=1098271&r1=1098270&r2=1098271&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
Sun May 1 12:02:26 2011
@@ -19,14 +19,13 @@ package org.apache.maven.surefire.booter
* under the License.
*/
-import org.apache.maven.surefire.util.NestedRuntimeException;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.surefire.util.NestedRuntimeException;
/**
* Represents the classpaths for the BooterConfiguration.
@@ -183,13 +182,4 @@ public class ClasspathConfiguration
return classpathUrls;
}
- public void addClasspathUrl( String path )
- {
- classpathUrls.addClassPathElementUrl( path );
- }
-
- public void addSurefireClasspathUrl( String path )
- {
- surefireClasspathUrls.addClassPathElementUrl( path );
- }
}
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
Sun May 1 12:02:26 2011
@@ -19,16 +19,15 @@ package org.apache.maven.surefire.booter
* under the License.
*/
-import org.apache.maven.surefire.util.NestedRuntimeException;
-import org.apache.maven.surefire.util.ReflectionUtils;
-import org.apache.maven.surefire.util.internal.StringUtils;
-
import java.io.ByteArrayInputStream;
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
+import org.apache.maven.surefire.util.NestedRuntimeException;
+import org.apache.maven.surefire.util.ReflectionUtils;
+import org.apache.maven.surefire.util.internal.StringUtils;
/**
* @author Kristian Rosenvold
@@ -77,12 +76,6 @@ public class PropertiesWrapper
return Boolean.valueOf( properties.getProperty( propertyName ) );
}
- public Integer getIntegerObjectProperty( String propertyName )
- {
- String property = properties.getProperty( propertyName );
- return property != null ? Integer.valueOf( property ) : null;
- }
-
public File getFileProperty( String key )
{
final String property = getProperty( key );
@@ -93,19 +86,6 @@ public class PropertiesWrapper
return (File) getParamValue( property, File.class.getName() );
}
- public List getListOfTypedObjects( String propertyPrefix )
- {
- String type;
- String value;
- List result = new ArrayList();
- for ( int i = 0; ( type = getProperty( propertyPrefix + i +
BooterConstants.TYPES_SUFIX ) ) != null; i++ )
- {
- value = getProperty( propertyPrefix + i +
BooterConstants.PARAMS_SUFIX );
- result.add( getParamValue( value, type ) );
- }
- return result;
- }
-
public List getStringList( String propertyPrefix )
{
String value;
@@ -250,14 +230,6 @@ public class PropertiesWrapper
}
}
- public void setProperty( String key, Integer integer )
- {
- if ( integer != null )
- {
- setProperty( key, integer.toString() );
- }
- }
-
public void setProperty( String key, String value )
{
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
Sun May 1 12:02:26 2011
@@ -147,17 +147,5 @@ public class ProviderConfiguration
return (String) forkTestSet;
}
- public String getForkMode()
- {
- return forkMode;
- }
-
- public boolean isSurefireForkReturnCode( int returnCode )
- {
- return TESTS_SUCCEEDED_EXIT_CODE == returnCode || NO_TESTS_EXIT_CODE
== returnCode
- || TESTS_FAILED_EXIT_CODE == returnCode;
-
- }
-
}
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
Sun May 1 12:02:26 2011
@@ -38,8 +38,6 @@ public class StartupConfiguration
private final boolean redirectTestOutputToFile;
- private final String forkMode;
-
public StartupConfiguration( String providerClassName,
ClasspathConfiguration classpathConfiguration,
ClassLoaderConfiguration
classLoaderConfiguration, String forkMode, boolean inForkedVm,
@@ -48,7 +46,7 @@ public class StartupConfiguration
this.providerClassName = providerClassName;
this.classpathConfiguration = classpathConfiguration;
this.classLoaderConfiguration = classLoaderConfiguration;
- this.forkMode = forkMode;
+ String forkMode1 = forkMode;
isForkRequested = !"never".equals( forkMode );
isInForkedVm = inForkedVm;
this.redirectTestOutputToFile = redirectTestOutputToFile;
@@ -78,11 +76,6 @@ public class StartupConfiguration
return classLoaderConfiguration.isManifestOnlyJarRequestedAndUsable();
}
- public boolean isRedirectTestOutputToFile()
- {
- return redirectTestOutputToFile;
- }
-
public String getProviderClassName()
{
return providerClassName;
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
(original)
+++
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
Sun May 1 12:02:26 2011
@@ -35,8 +35,4 @@ public class SurefireBooterForkException
super( message, cause );
}
- public SurefireBooterForkException( String msg )
- {
- super( msg );
- }
}
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/SurefireTestSet.java
Sun May 1 12:02:26 2011
@@ -28,6 +28,4 @@ public interface SurefireTestSet
throws TestSetFailedException;
String getName();
-
- Class getTestClass();
}
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/LogicalStream.java
Sun May 1 12:02:26 2011
@@ -94,14 +94,6 @@ public class LogicalStream
}
}
- public void writeDetails( Reporter reporter )
- {
- for ( Entry entry : output )
- {
- entry.writeDetails( reporter );
- }
- }
-
public void writeDetails( ConsoleOutputReceiver outputReceiver )
{
for ( Entry entry : output )
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java?rev=1098271&r1=1098270&r2=1098271&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
Sun May 1 12:02:26 2011
@@ -155,13 +155,4 @@ class TestMethod
getLogicalStream().write( stdout, buf, off, len );
}
- private String getStdout()
- {
- return output != null ? output.getOutput( true ) : "";
- }
-
- private String getStdErr()
- {
- return output != null ? output.getOutput( false ) : "";
- }
}
