Author: khmarbaise Date: Sun Dec 28 12:39:04 2014 New Revision: 1648192 URL: http://svn.apache.org/r1648192 Log: [MEAR-210] Following naming conventions of maven-surefire/failsafe-plugin - Removing the maven-surefire-plugin configuration which results in changing some test file names to fit naming conventions. - Moving the stubs into a separate folder. - Upgrade to junit 4.10
Added: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTestBase.java - copied, changed from r1648189, maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTestBase.java - copied, changed from r1648188, maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactHandlerTestStub.java - copied, changed from r1648190, maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactHandlerTestStub.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactTestStub.java - copied, changed from r1648190, maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactTestStub.java Removed: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactHandlerTestStub.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactTestStub.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTest.java Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FullFileNameMappingTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionFileNameMappingTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionForEjbFileNameMappingTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/StandardFileNameMappingTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1648192&r1=1648191&r2=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Sun Dec 28 12:39:04 2014 @@ -147,7 +147,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>4.10</version> <scope>test</scope> </dependency> <dependency> @@ -191,20 +191,6 @@ </plugin> </plugins> </pluginManagement> - - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - <excludes> - <exclude>**/Abstract*.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> <profiles> Copied: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTestBase.java (from r1648189, maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTestBase.java?p2=maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTestBase.java&p1=maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java&r1=1648189&r2=1648192&rev=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTestBase.java Sun Dec 28 12:39:04 2014 @@ -1,11 +1,11 @@ package org.apache.maven.plugin.ear; -import junit.framework.TestCase; -import org.apache.maven.artifact.Artifact; - import java.util.Set; import java.util.TreeSet; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.plugin.ear.stub.ArtifactTestStub; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -28,8 +28,7 @@ import java.util.TreeSet; /** * @author <a href="snic...@apache.org">Stephane Nicoll</a> */ -public abstract class AbstractEarTest - extends TestCase +public abstract class AbstractEarTestBase { public static final String DEFAULT_GROUPID = "eartest"; Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java?rev=1648192&r1=1648191&r2=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/EarModuleTest.java Sun Dec 28 12:39:04 2014 @@ -19,7 +19,9 @@ package org.apache.maven.plugin.ear; * under the License. */ -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; /** * Ear module test case. @@ -28,9 +30,9 @@ import junit.framework.TestCase; * @version $Id$ */ public class EarModuleTest - extends TestCase { + @Test public void testCleanBuildDir() { assertEquals( "APP-INF/lib/", AbstractEarModule.cleanBundleDir( "APP-INF/lib" ) ); Copied: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTestBase.java (from r1648188, maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTestBase.java?p2=maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTestBase.java&p1=maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTest.java&r1=1648188&r2=1648192&rev=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/AbstractFileNameMappingTestBase.java Sun Dec 28 12:39:04 2014 @@ -20,14 +20,14 @@ package org.apache.maven.plugin.ear.outp */ import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.ear.AbstractEarTest; -import org.apache.maven.plugin.ear.ArtifactTestStub; +import org.apache.maven.plugin.ear.AbstractEarTestBase; +import org.apache.maven.plugin.ear.stub.ArtifactTestStub; /** * @author <a href="snic...@apache.org">Stephane Nicoll</a> */ -public abstract class AbstractFileNameMappingTest - extends AbstractEarTest +public abstract class AbstractFileNameMappingTestBase + extends AbstractEarTestBase { protected Artifact createArtifactWithGroupId( String groupId, String artifactId, String version, String type, Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FullFileNameMappingTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FullFileNameMappingTest.java?rev=1648192&r1=1648191&r2=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FullFileNameMappingTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/FullFileNameMappingTest.java Sun Dec 28 12:39:04 2014 @@ -1,5 +1,9 @@ package org.apache.maven.plugin.ear.output; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,17 +27,19 @@ package org.apache.maven.plugin.ear.outp * @author <a href="snic...@apache.org">Stephane Nicoll</a> */ public class FullFileNameMappingTest - extends AbstractFileNameMappingTest + extends AbstractFileNameMappingTestBase { private final FullFileNameMapping instance = new FullFileNameMapping(); + @Test public void testSimpleArtifact() { assertEquals( "org-apache-foo-1.0-SNAPSHOT.jar", instance.mapFileName( createArtifactWithGroupId( "org.apache", "foo", "1.0-SNAPSHOT", "jar" ) ) ); } + @Test public void testArtifactWithClassifier() { assertEquals( "org-apache-foo-1.0-SNAPSHOT-sources.jar", Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionFileNameMappingTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionFileNameMappingTest.java?rev=1648192&r1=1648191&r2=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionFileNameMappingTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionFileNameMappingTest.java Sun Dec 28 12:39:04 2014 @@ -1,5 +1,9 @@ package org.apache.maven.plugin.ear.output; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,15 +27,17 @@ package org.apache.maven.plugin.ear.outp * @author Stephane Nicoll */ public class NoVersionFileNameMappingTest - extends AbstractFileNameMappingTest + extends AbstractFileNameMappingTestBase { private final NoVersionFileNameMapping instance = new NoVersionFileNameMapping(); + @Test public void testSimpleArtifact() { assertEquals( "foo.jar", instance.mapFileName( createArtifact( "foo", "1.0-SNAPSHOT", "jar" ) ) ); } + @Test public void testArtifactWithClassifier() { assertEquals( "foo-sources.jar", Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionForEjbFileNameMappingTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionForEjbFileNameMappingTest.java?rev=1648192&r1=1648191&r2=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionForEjbFileNameMappingTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/NoVersionForEjbFileNameMappingTest.java Sun Dec 28 12:39:04 2014 @@ -1,5 +1,9 @@ package org.apache.maven.plugin.ear.output; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,15 +27,17 @@ package org.apache.maven.plugin.ear.outp * @author Philippe Marschall */ public class NoVersionForEjbFileNameMappingTest - extends AbstractFileNameMappingTest + extends AbstractFileNameMappingTestBase { private final NoVersionForEjbFileNameMapping instance = new NoVersionForEjbFileNameMapping(); + @Test public void testJarArtifact() { assertEquals( "foo-1.0-SNAPSHOT.jar", instance.mapFileName( createArtifact( "foo", "1.0-SNAPSHOT", "jar" ) ) ); } + @Test public void testEjbArtifact() { assertEquals( "foo.jar", instance.mapFileName( createArtifact( "foo", "1.0-SNAPSHOT", "ejb" ) ) ); Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/StandardFileNameMappingTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/StandardFileNameMappingTest.java?rev=1648192&r1=1648191&r2=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/StandardFileNameMappingTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/output/StandardFileNameMappingTest.java Sun Dec 28 12:39:04 2014 @@ -1,5 +1,9 @@ package org.apache.maven.plugin.ear.output; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -23,16 +27,18 @@ package org.apache.maven.plugin.ear.outp * @author <a href="snic...@apache.org">Stephane Nicoll</a> */ public class StandardFileNameMappingTest - extends AbstractFileNameMappingTest + extends AbstractFileNameMappingTestBase { private final StandardFileNameMapping instance = new StandardFileNameMapping(); + @Test public void testSimpleArtifact() { assertEquals( "foo-1.0-SNAPSHOT.jar", instance.mapFileName( createArtifact( "foo", "1.0-SNAPSHOT", "jar" ) ) ); } + @Test public void testArtifactWithClassifier() { assertEquals( "foo-1.0-SNAPSHOT-sources.jar", Copied: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactHandlerTestStub.java (from r1648190, maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactHandlerTestStub.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactHandlerTestStub.java?p2=maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactHandlerTestStub.java&p1=maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactHandlerTestStub.java&r1=1648190&r2=1648192&rev=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactHandlerTestStub.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactHandlerTestStub.java Sun Dec 28 12:39:04 2014 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.ear; +package org.apache.maven.plugin.ear.stub; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactTestStub.java (from r1648190, maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactTestStub.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactTestStub.java?p2=maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactTestStub.java&p1=maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactTestStub.java&r1=1648190&r2=1648192&rev=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/ArtifactTestStub.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/stub/ArtifactTestStub.java Sun Dec 28 12:39:04 2014 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.ear; +package org.apache.maven.plugin.ear.stub; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java?rev=1648192&r1=1648191&r2=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactRepositoryTest.java Sun Dec 28 12:39:04 2014 @@ -19,26 +19,25 @@ package org.apache.maven.plugin.ear.util * under the License. */ -import org.apache.maven.plugin.ear.AbstractEarTest; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import org.apache.maven.plugin.ear.AbstractEarTestBase; import org.apache.maven.plugin.ear.EarPluginException; import org.codehaus.plexus.configuration.PlexusConfigurationException; +import org.junit.Test; /** * @author <a href="snic...@apache.org">Stephane Nicoll</a> * @version $Id$ */ public class ArtifactRepositoryTest - extends AbstractEarTest + extends AbstractEarTestBase { - protected void setUp() - throws Exception - { - super.setUp(); - } - public static final String MAIN_ARTIFACT_ID = "none"; + @Test public void testEmptyRepository() { ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService(); @@ -49,6 +48,7 @@ public class ArtifactRepositoryTest assertNull( repo.getUniqueArtifact( "ear", "ar", "jar", "class" ) ); } + @Test public void testRepositoryWithOneUnclassifiedArtifact() { ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService(); @@ -59,6 +59,7 @@ public class ArtifactRepositoryTest assertNotNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar", null ) ); } + @Test public void testRepositoryWithOneClassifiedArtifact() { ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService(); @@ -71,6 +72,7 @@ public class ArtifactRepositoryTest assertNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar", "wrong" ) ); } + @Test public void testRepositoryWithMultipleClassifiedArtifacts() { ArtifactTypeMappingService artifactTypeMappingService = new ArtifactTypeMappingService(); @@ -86,6 +88,7 @@ public class ArtifactRepositoryTest assertNull( repo.getUniqueArtifact( DEFAULT_GROUPID, "myartifact", "jar", "wrong" ) ); } + @Test public void testRepositoryWithMultipleClassifiedArtifactsAndMainArtifact() throws PlexusConfigurationException, EarPluginException { Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java?rev=1648192&r1=1648191&r2=1648192&view=diff ============================================================================== --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java Sun Dec 28 12:39:04 2014 @@ -1,12 +1,15 @@ package org.apache.maven.plugin.ear.util; -import org.apache.maven.plugin.ear.AbstractEarTest; -import org.apache.maven.plugin.ear.EarModule; -import org.apache.maven.plugin.ear.EjbModule; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; +import org.apache.maven.plugin.ear.AbstractEarTestBase; +import org.apache.maven.plugin.ear.EarModule; +import org.apache.maven.plugin.ear.EjbModule; +import org.junit.Test; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -30,9 +33,10 @@ import java.util.List; * @author <a href="snic...@apache.org">Stephane Nicoll</a> */ public class EarMavenArchiverTest - extends AbstractEarTest + extends AbstractEarTestBase { + @Test public void testSimpleEjbModule() { final List<EarModule> modules = new ArrayList<EarModule>(); @@ -45,6 +49,7 @@ public class EarMavenArchiverTest } + @Test public void testSimpleJarModuleWithCustomBundleDir() { final List<EarModule> modules = new ArrayList<EarModule>(); @@ -57,6 +62,7 @@ public class EarMavenArchiverTest } + @Test public void testTwoModules() { final List<EarModule> modules = new ArrayList<EarModule>();