svn commit: r1686633 - in /maven/plugins/trunk/maven-ear-plugin/src: main/java/org/apache/maven/plugin/ear/EjbRef.java test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java

[kh...@apache.org]

Author: khmarbaise
Date: Sat Jun 20 14:56:54 2015
New Revision: 1686633

URL: http://svn.apache.org/r1686633
Log:
Added tests.

Modified:
    maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java
    maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java

Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java?rev=1686633&r1=1686632&r2=1686633&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EjbRef.java Sat Jun 20 14:56:54 2015
@@ -81,7 +81,6 @@ public class EjbRef
      */
     public void appendEjbRefEntry( XMLWriter writer )
     {
-        System.out.println( "appendEjbRefEntry()" );
         writer.startElement( EJB_REF );
 
         // description

Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java?rev=1686633&r1=1686632&r2=1686633&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ModuleIdentifierValidatorTest.java Sat Jun 20 14:56:54 2015
@@ -59,6 +59,19 @@ public class ModuleIdentifierValidatorTe
         return earModule;
     }
 
+    private EarModule createMockEarModule( String groupId, String artifactId, String classifier, String version )
+    {
+        EarModule earModule = mock( EarModule.class );
+        Artifact artifact = mock( Artifact.class );
+        when( earModule.getArtifact() ).thenReturn( artifact );
+        when( earModule.getArtifact().getGroupId() ).thenReturn( groupId );
+        when( earModule.getArtifact().getArtifactId() ).thenReturn( artifactId );
+        when( earModule.getArtifact().getClassifier() ).thenReturn( classifier );
+        when( earModule.getArtifact().getVersion() ).thenReturn( version );
+        when( earModule.getArtifact().getId() ).thenReturn( groupId + ":" + artifactId + ":" + classifier + ":" + version );
+        return earModule;
+    }
+
     @Test
     public void existDuplicateShouldResultFalseWithEmptyList()
     {
@@ -99,6 +112,23 @@ public class ModuleIdentifierValidatorTe
     }
 
     @Test
+    public void shouldNotFailCauseTheClassifiersAreDifferent()
+    {
+        earModules.add( createMockEarModule( "org.apache", "artifact-1", "first", "1.0.0" ) );
+        earModules.add( createMockEarModule( "org.apache", "artifact-2", "second", "1.0.0" ) );
+        earModules.add( createMockEarModule( "org.apache.maven", "aid-1", "first", "1.0.0" ) );
+        earModules.add( createMockEarModule( "org.apache.maven", "aid-2", "second", "1.0.0" ) );
+        earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-a", "first", "1.0.0" ) );
+        earModules.add( createMockEarModule( "org.apache.maven.test", "result-artifact-b", "second", "1.0.0" ) );
+
+        assertFalse( miv.checkForDuplicateArtifacts().existDuplicateArtifacts() );
+
+        Map<String, List<EarModule>> result = miv.getDuplicateArtifacts();
+
+        assertTrue( result.isEmpty() );
+    }
+
+    @Test
     public void shouldFailCauseTheArtifactIdsAreIdenticalWithDifferentGroupIds()
     {
         EarModule earModule1 = createMockEarModule( "org.apache.maven.test", "result-artifact", "1.0.0" );
@@ -106,6 +136,23 @@ public class ModuleIdentifierValidatorTe
         earModules.add( earModule1 );
         earModules.add( earModule2 );
 
+        miv.checkForDuplicateArtifacts();
+        Map<String, List<EarModule>> result = miv.getDuplicateArtifacts();
+
+        assertFalse( result.isEmpty() );
+        assertEquals( 1, result.size() );
+        assertTrue( result.containsKey( "result-artifact:1.0.0" ) );
+        assertEquals( 2, result.get( "result-artifact:1.0.0" ).size() );
+    }
+
+    @Test
+    public void shouldFailCauseTheArtifactIdsAreIdenticalWithClassifiers()
+    {
+        EarModule earModule1 = createMockEarModule( "org.apache.maven.test", "result-artifact", "first", "1.0.0" );
+        EarModule earModule2 = createMockEarModule( "org.apache.maven", "result-artifact", "second", "1.0.0" );
+        earModules.add( earModule1 );
+        earModules.add( earModule2 );
+
         miv.checkForDuplicateArtifacts();
         Map<String, List<EarModule>> result = miv.getDuplicateArtifacts();