Author: khmarbaise
Date: Sun Feb 7 22:04:44 2016
New Revision: 1729042
URL: http://svn.apache.org/viewvc?rev=1729042&view=rev
Log:
Cleaned up Test code.
Removed calling deprecated code.
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java?rev=1729042&r1=1729041&r2=1729042&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
Sun Feb 7 22:04:44 2016
@@ -60,11 +60,6 @@ public abstract class AbstractPropertyUt
loadValidationProperties( validationFile );
}
- protected void tearDown()
- {
-
- }
-
protected boolean validateProperties( Properties prop )
{
boolean bRetVal = false;
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java?rev=1729042&r1=1729041&r2=1729042&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
Sun Feb 7 22:04:44 2016
@@ -57,8 +57,7 @@ public class BasicPropertyUtilsTest
}
/**
- * load property test case can be adjusted by modifying the
basic.properties and
- * basic_validation properties
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
*
* @throws Exception
*/
@@ -72,8 +71,7 @@ public class BasicPropertyUtilsTest
}
/**
- * load property test case can be adjusted by modifying the
basic.properties and
- * basic_validation properties
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
*
* @throws Exception
*/
@@ -87,8 +85,7 @@ public class BasicPropertyUtilsTest
}
/**
- * load property test case can be adjusted by modifying the
basic.properties and
- * basic_validation properties
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
*
* @throws Exception
*/
@@ -103,8 +100,7 @@ public class BasicPropertyUtilsTest
}
/**
- * load property test case can be adjusted by modifying the
basic.properties and
- * basic_validation properties
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
*
* @throws Exception
*/
@@ -119,8 +115,7 @@ public class BasicPropertyUtilsTest
}
/**
- * load property test case can be adjusted by modifying the
basic.properties and
- * basic_validation properties
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
*
* @throws Exception
*/
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java?rev=1729042&r1=1729041&r2=1729042&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
Sun Feb 7 22:04:44 2016
@@ -19,23 +19,28 @@ package org.apache.maven.plugins.resourc
* under the License.
*/
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugins.resources.ResourcesMojo;
-import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Resource;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.sonatype.aether.RepositorySystemSession;
+
public class ResourcesMojoTest
extends AbstractMojoTestCase
{
@@ -64,7 +69,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourceDirectoryStructure" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -80,7 +85,7 @@ public class ResourcesMojoTest
setVariableValueToObject( mojo, "resources", resources );
setVariableValueToObject( mojo, "outputDirectory", new File(
project.getBuild()
.getOutputDirectory() ) );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
mojo.execute();
@@ -102,7 +107,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourceDirectoryStructure_RelativePath" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -119,7 +124,7 @@ public class ResourcesMojoTest
.getOutputDirectory() ) );
setVariableValueToObject( mojo, "project", project );
setVariableValueToObject( mojo, "resources", resources );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
mojo.execute();
@@ -141,7 +146,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"encoding" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -155,7 +160,7 @@ public class ResourcesMojoTest
setVariableValueToObject( mojo, "resources", resources );
setVariableValueToObject( mojo, "outputDirectory", new File(
project.getBuild()
.getOutputDirectory() ) );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
mojo.execute();
@@ -173,7 +178,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourceInclude" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -205,7 +210,7 @@ public class ResourcesMojoTest
.getOutputDirectory() ) );
setVariableValueToObject( mojo, "project", project );
setVariableValueToObject( mojo, "resources", resources );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
mojo.execute();
@@ -227,7 +232,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourceExclude" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -260,7 +265,7 @@ public class ResourcesMojoTest
.getOutputDirectory() ) );
setVariableValueToObject( mojo, "project", project );
setVariableValueToObject( mojo, "resources", resources );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
mojo.execute();
@@ -282,7 +287,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourceTargetPath" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -300,7 +305,7 @@ public class ResourcesMojoTest
.getOutputDirectory() ) );
setVariableValueToObject( mojo, "project", project );
setVariableValueToObject( mojo, "resources", resources );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
mojo.execute();
@@ -322,7 +327,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourceSystemProperties_Filtering" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -336,11 +341,15 @@ public class ResourcesMojoTest
setVariableValueToObject( mojo, "resources", resources );
setVariableValueToObject( mojo, "outputDirectory", new File(
project.getBuild()
.getOutputDirectory() ) );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
setVariableValueToObject( mojo, "escapeWindowsPaths", Boolean.TRUE );
+
+ MavenExecutionRequest request = new DefaultMavenExecutionRequest();
+ request.setSystemProperties( System.getProperties() );
+
MavenSession mavenSession =
- new MavenSession( null, null, null, null, null, null, null,
System.getProperties(), null );
+ new MavenSession( (PlexusContainer) null,
(RepositorySystemSession) null, request, null );
setVariableValueToObject( mojo, "session", mavenSession );
mojo.execute();
@@ -374,7 +383,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourceProjectProperties_Filtering" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -389,7 +398,7 @@ public class ResourcesMojoTest
setVariableValueToObject( mojo, "resources", resources );
setVariableValueToObject( mojo, "outputDirectory", new File(
project.getBuild()
.getOutputDirectory() ) );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
mojo.execute();
@@ -409,7 +418,7 @@ public class ResourcesMojoTest
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project =
new MavenProjectResourcesStub(
"resourcePojectProperty_Filtering_PropertyDestination" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -426,7 +435,7 @@ public class ResourcesMojoTest
setVariableValueToObject( mojo, "resources", resources );
setVariableValueToObject( mojo, "outputDirectory", new File(
project.getBuild()
.getOutputDirectory() ) );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
setVariableValueToObject( mojo, "escapeWindowsPaths", Boolean.TRUE );
mojo.execute();
@@ -446,9 +455,9 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourcePropertyFiles_Filtering" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
- LinkedList filterList = new LinkedList();
+ LinkedList<String> filterList = new LinkedList<String>();
assertNotNull( mojo );
@@ -482,9 +491,9 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourcePropertyFiles_Extra" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
- LinkedList filterList = new LinkedList();
+ LinkedList<String> filterList = new LinkedList<String>();
assertNotNull( mojo );
@@ -518,10 +527,10 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"resourcePropertyFiles_MainAndExtra" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
- LinkedList filterList = new LinkedList();
- LinkedList extraFilterList = new LinkedList();
+ LinkedList<String> filterList = new LinkedList<String>();
+ LinkedList<String> extraFilterList = new LinkedList<String>();
assertNotNull( mojo );
@@ -566,9 +575,9 @@ public class ResourcesMojoTest
final ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources",
testPom );
final MavenProjectResourcesStub project =
new MavenProjectResourcesStub(
"resourcePropertyFiles_Filtering_TokensInFilters" );
- final List resources = project.getBuild()
+ final List<Resource> resources = project.getBuild()
.getResources();
- final LinkedList filterList = new LinkedList();
+ final LinkedList<String> filterList = new LinkedList<String>();
assertNotNull( mojo );
@@ -600,7 +609,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"windows-paths" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -620,7 +629,7 @@ public class ResourcesMojoTest
setVariableValueToObject( mojo, "resources", resources );
setVariableValueToObject( mojo, "outputDirectory", new File(
project.getBuild()
.getOutputDirectory() ) );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
setVariableValueToObject( mojo, "escapeWindowsPaths", Boolean.FALSE );
@@ -640,7 +649,7 @@ public class ResourcesMojoTest
File testPom = new File( getBasedir(), defaultPomFilePath );
ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom
);
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"windows-paths" );
- List resources = project.getBuild()
+ List<Resource> resources = project.getBuild()
.getResources();
assertNotNull( mojo );
@@ -660,7 +669,7 @@ public class ResourcesMojoTest
setVariableValueToObject( mojo, "resources", resources );
setVariableValueToObject( mojo, "outputDirectory", new File(
project.getBuild()
.getOutputDirectory() ) );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
setVariableValueToObject( mojo, "escapeWindowsPaths", Boolean.TRUE );
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java?rev=1729042&r1=1729041&r2=1729042&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
Sun Feb 7 22:04:44 2016
@@ -20,12 +20,11 @@ package org.apache.maven.plugins.resourc
*/
import java.io.File;
-import java.util.LinkedList;
+import java.util.Collections;
import java.util.List;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugins.resources.ResourcesMojo;
-import org.apache.maven.plugins.resources.TestResourcesMojo;
import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
import org.codehaus.plexus.util.FileUtils;
@@ -40,11 +39,6 @@ public class TestResourcesTest
super.setUp();
}
- protected void tearDown()
- {
-
- }
-
/**
* test mojo lookup, test harness should be working fine
*
@@ -68,7 +62,7 @@ public class TestResourcesTest
File testPom = new File( getBasedir(), defaultPomFilePath );
TestResourcesMojo mojo = (TestResourcesMojo) lookupMojo(
"testResources", testPom );
MavenProjectResourcesStub project = new MavenProjectResourcesStub(
"testResourceDirectoryStructure" );
- List resources = project.getBuild().getResources();
+ List<Resource> resources = project.getBuild().getResources();
assertNotNull( mojo );
@@ -82,7 +76,7 @@ public class TestResourcesTest
setVariableValueToObject( mojo, "project", project );
setVariableValueToObject( mojo, "resources", resources );
setVariableValueToObject( mojo, "outputDirectory", new File(
project.getBuild().getTestOutputDirectory() ) );
- setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
+ setVariableValueToObject( mojo, "buildFilters",
Collections.emptyList() );
setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
mojo.execute();
