Author: krosenvold
Date: Sun Dec 25 12:01:28 2011
New Revision: 1224606
URL: http://svn.apache.org/viewvc?rev=1224606&view=rev
Log:
o Added more generics
Removed:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StreamUtils.java
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java?rev=1224606&r1=1224605&r2=1224606&view=diff
==============================================================================
---
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
(original)
+++
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
Sun Dec 25 12:01:28 2011
@@ -60,7 +60,7 @@ import org.codehaus.plexus.util.StringUt
* @goal integration-test
* @phase integration-test
* @threadSafe
- * @noinspection JavaDoc
+ * @noinspection JavaDoc, UnusedDeclaration
*/
public class IntegrationTestMojo
extends AbstractSurefireMojo
@@ -678,6 +678,7 @@ public class IntegrationTestMojo
else
{
failsafeSummary.setResult(
ProviderConfiguration.TESTS_FAILED_EXIT_CODE );
+ //noinspection ThrowableResultOfMethodCallIgnored
failsafeSummary.setException(
summary.getFirstException().getMessage() );
}
return failsafeSummary;
@@ -943,12 +944,12 @@ public class IntegrationTestMojo
this.systemProperties = systemProperties;
}
- public Map getSystemPropertyVariables()
+ public Map<String,String> getSystemPropertyVariables()
{
return systemPropertyVariables;
}
- public void setSystemPropertyVariables( Map systemPropertyVariables )
+ public void setSystemPropertyVariables( Map<String,String>
systemPropertyVariables )
{
this.systemPropertyVariables = systemPropertyVariables;
}
@@ -973,12 +974,12 @@ public class IntegrationTestMojo
this.properties = properties;
}
- public Map getPluginArtifactMap()
+ public Map<String,Artifact> getPluginArtifactMap()
{
return pluginArtifactMap;
}
- public void setPluginArtifactMap( Map pluginArtifactMap )
+ public void setPluginArtifactMap( Map<String,Artifact> pluginArtifactMap )
{
this.pluginArtifactMap = pluginArtifactMap;
}
@@ -1387,7 +1388,7 @@ public class IntegrationTestMojo
public boolean isMavenParallel()
{
- return parallelMavenExecution != null &&
parallelMavenExecution.booleanValue();
+ return parallelMavenExecution != null && parallelMavenExecution;
}
public String getRunOrder()
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java?rev=1224606&r1=1224605&r2=1224606&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
Sun Dec 25 12:01:28 2011
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -76,9 +77,9 @@ public interface SurefireExecutionParame
void setClasspathDependencyScopeExclude( String
classpathDependencyScopeExclude );
- List getAdditionalClasspathElements();
+ List<String> getAdditionalClasspathElements();
- void setAdditionalClasspathElements( List additionalClasspathElements );
+ void setAdditionalClasspathElements( List<String>
additionalClasspathElements );
File getReportsDirectory();
@@ -110,9 +111,9 @@ public interface SurefireExecutionParame
void setSystemProperties( Properties systemProperties );
- Map getSystemPropertyVariables();
+ Map<String,String> getSystemPropertyVariables();
- void setSystemPropertyVariables( Map systemPropertyVariables );
+ void setSystemPropertyVariables( Map<String,String>
systemPropertyVariables );
File getSystemPropertiesFile();
@@ -122,13 +123,13 @@ public interface SurefireExecutionParame
void setProperties( Properties properties );
- Map getPluginArtifactMap();
+ Map<String,Artifact> getPluginArtifactMap();
- void setPluginArtifactMap( Map pluginArtifactMap );
+ void setPluginArtifactMap( Map<String,Artifact> pluginArtifactMap );
- Map getProjectArtifactMap();
+ Map<String,Artifact> getProjectArtifactMap();
- void setProjectArtifactMap( Map projectArtifactMap );
+ void setProjectArtifactMap( Map<String,Artifact> projectArtifactMap );
boolean isPrintSummary();
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=1224606&r1=1224605&r2=1224606&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Sun Dec 25 12:01:28 2011
@@ -209,7 +209,7 @@ public class SurefirePlugin
*
* @parameter
*/
- private List excludes;
+ private List<String> excludes;
/**
* ArtifactRepository of the localRepository. To obtain the directory of
localRepository in unit tests use
@@ -777,12 +777,12 @@ public class SurefirePlugin
this.classpathDependencyScopeExclude = classpathDependencyScopeExclude;
}
- public List getAdditionalClasspathElements()
+ public List<String> getAdditionalClasspathElements()
{
return additionalClasspathElements;
}
- public void setAdditionalClasspathElements( List
additionalClasspathElements )
+ public void setAdditionalClasspathElements( List<String>
additionalClasspathElements )
{
this.additionalClasspathElements = additionalClasspathElements;
}
@@ -843,7 +843,7 @@ public class SurefirePlugin
this.test = test;
}
- public List getIncludes()
+ public List<String> getIncludes()
{
return includes;
}
@@ -853,12 +853,12 @@ public class SurefirePlugin
this.includes = includes;
}
- public List getExcludes()
+ public List<String> getExcludes()
{
return excludes;
}
- public void setExcludes( List excludes )
+ public void setExcludes( List<String> excludes )
{
this.excludes = excludes;
}
@@ -889,12 +889,12 @@ public class SurefirePlugin
this.systemProperties = systemProperties;
}
- public Map getSystemPropertyVariables()
+ public Map<String,String> getSystemPropertyVariables()
{
return systemPropertyVariables;
}
- public void setSystemPropertyVariables( Map systemPropertyVariables )
+ public void setSystemPropertyVariables( Map<String,String>
systemPropertyVariables )
{
this.systemPropertyVariables = systemPropertyVariables;
}
@@ -919,22 +919,22 @@ public class SurefirePlugin
this.properties = properties;
}
- public Map getPluginArtifactMap()
+ public Map<String,Artifact> getPluginArtifactMap()
{
return pluginArtifactMap;
}
- public void setPluginArtifactMap( Map pluginArtifactMap )
+ public void setPluginArtifactMap( Map<String,Artifact> pluginArtifactMap )
{
this.pluginArtifactMap = pluginArtifactMap;
}
- public Map getProjectArtifactMap()
+ public Map<String,Artifact> getProjectArtifactMap()
{
return projectArtifactMap;
}
- public void setProjectArtifactMap( Map projectArtifactMap )
+ public void setProjectArtifactMap( Map<String,Artifact> projectArtifactMap
)
{
this.projectArtifactMap = projectArtifactMap;
}
