You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/06/08 20:38:29 UTC
[maven-archetype] 03/05: ARCHETYPE-584 refactored test according to
review comments
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch ARCHETYPE-584
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 86cd0e3b6285431d95e0fdff634d20c4ea3e22b4
Author: Ruwen Reddig <ru...@gmail.com>
AuthorDate: Thu Apr 16 22:26:36 2020 +0200
ARCHETYPE-584 refactored test according to review comments
---
.../apache/maven/archetype/old/ArchetypeTest.java | 159 +++++++++++++--------
1 file changed, 98 insertions(+), 61 deletions(-)
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
index 9fb315a..cf6fba6 100644
--- a/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
@@ -61,19 +61,11 @@ import static org.xmlunit.matchers.CompareMatcher.isIdenticalTo;
public class ArchetypeTest
extends PlexusTestCase
{
- private static final String XML_VERSION_1_0 =
- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
- private static final String PROJECT_ELEMENT = "<project " +
- "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
- "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
- "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n";
- private static final String PROJECT_ELEMENT_END = "</project>";
- private static final String MODEL_VERSION = " <modelVersion>4.0.0</modelVersion>\n";
- private static final String PACKAGING = " <packaging>pom</packaging>\n";
private OldArchetype archetype;
+ private StringWriter out;
+
public void testArchetype()
throws Exception
{
@@ -253,103 +245,139 @@ public class ArchetypeTest
public void testAddModuleToParentBasic()
throws Exception
{
- String pom = PROJECT_ELEMENT
- + PACKAGING
- + PROJECT_ELEMENT_END;
+ String pom = ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <packaging>pom</packaging>\n"
+ + "</project>";
- StringWriter out = new StringWriter();
+ out = new StringWriter();
assertTrue( DefaultOldArchetype.addModuleToParentPom( "myArtifactId1", new StringReader( pom ), out ) );
- assertThat( out.toString(), isIdenticalTo( XML_VERSION_1_0
- + PROJECT_ELEMENT
- + PACKAGING
+ assertThat( out.toString(), isIdenticalTo( "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ + ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " <module>myArtifactId1</module>\n"
+ " </modules>\n"
- + PROJECT_ELEMENT_END ) );
+ + "</project>") );
}
public void testAddModuleToParentWithModelVersion()
throws Exception
{
- String pom = PROJECT_ELEMENT
- + MODEL_VERSION
- + PACKAGING
- + PROJECT_ELEMENT_END;
+ String pom = ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <packaging>pom</packaging>\n"
+ + "</project>";
- StringWriter out = new StringWriter();
+ out = new StringWriter();
assertTrue( DefaultOldArchetype.addModuleToParentPom( "myArtifactId2", new StringReader( pom ), out ) );
- assertThat( out.toString(), isIdenticalTo( XML_VERSION_1_0
- + PROJECT_ELEMENT
- + MODEL_VERSION
- + PACKAGING
+ assertThat( out.toString(), isIdenticalTo( "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ + ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " <module>myArtifactId2</module>\n"
+ " </modules>\n"
- + PROJECT_ELEMENT_END ) );
+ + "</project>") );
}
public void testAddModuleToParentWithEmptyModulesElement()
throws Exception
{
- String pom = PROJECT_ELEMENT
- + MODEL_VERSION
- + PACKAGING
+ String pom = ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " </modules>\n"
- + PROJECT_ELEMENT_END;
+ + "</project>";
- StringWriter out = new StringWriter();
+ out = new StringWriter();
assertTrue( DefaultOldArchetype.addModuleToParentPom( "myArtifactId3", new StringReader( pom ), out ) );
- assertThat( out.toString(), isIdenticalTo( XML_VERSION_1_0
- + PROJECT_ELEMENT
- + MODEL_VERSION
- + PACKAGING
+ assertThat( out.toString(), isIdenticalTo( "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ + ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " <module>myArtifactId3</module>\n"
+ " </modules>\n"
- + PROJECT_ELEMENT_END ) );
+ + "</project>") );
}
public void testAddModuleToParentWithOneModulePresent()
throws Exception
{
- String pom = PROJECT_ELEMENT
- + MODEL_VERSION
- + PACKAGING
+ String pom = ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " <module>myArtifactId3</module>\n"
+ " </modules>\n"
- + PROJECT_ELEMENT_END;
+ + "</project>";
- StringWriter out = new StringWriter();
+ out = new StringWriter();
assertTrue( DefaultOldArchetype.addModuleToParentPom( "myArtifactId4", new StringReader( pom ), out ) );
- assertThat( out.toString(), isIdenticalTo( XML_VERSION_1_0
- + PROJECT_ELEMENT
- + MODEL_VERSION
- + PACKAGING
+ assertThat( out.toString(), isIdenticalTo( "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ + ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " <module>myArtifactId3</module>\n"
+ " <module>myArtifactId4</module>\n"
+ " </modules>\n"
- + PROJECT_ELEMENT_END ) );
+ + "</project>") );
}
public void testAddModuleToParentDoesNothingWhenSameModuleAdded()
throws Exception
{
- String pom = PROJECT_ELEMENT
+ String pom = ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ " <modelVersion>4.0.0</modelVersion>\n"
+ " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " <module>myArtifactId3</module>\n"
+ " </modules>\n"
- + PROJECT_ELEMENT_END;
+ + "</project>";
- StringWriter out = new StringWriter();
+ out = new StringWriter();
assertFalse( DefaultOldArchetype.addModuleToParentPom( "myArtifactId3", new StringReader( pom ), out ) );
// empty means unchanged
@@ -359,9 +387,13 @@ public class ArchetypeTest
public void testAddModuleToParentWithProfiles()
throws Exception
{
- String pom = PROJECT_ELEMENT
- + MODEL_VERSION
- + PACKAGING
+ String pom = ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " <module>myArtifactId1</module>\n"
+ " <module>myArtifactId2</module>\n"
@@ -381,15 +413,19 @@ public class ArchetypeTest
+ " </modules>\n"
+ " </profile>\n"
+ " </profiles>\n" +
- PROJECT_ELEMENT_END;
+ "</project>";
- StringWriter out = new StringWriter();
+ out = new StringWriter();
assertTrue( DefaultOldArchetype.addModuleToParentPom( "module1", new StringReader( pom ), out ) );
- assertThat( out.toString(), isIdenticalTo(XML_VERSION_1_0
- + PROJECT_ELEMENT
- + MODEL_VERSION
- + PACKAGING
+ assertThat( out.toString(), isIdenticalTo("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+ + ("<project " +
+ "xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 " +
+ "http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n")
+ + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <packaging>pom</packaging>\n"
+ " <modules>\n"
+ " <module>myArtifactId1</module>\n"
+ " <module>myArtifactId2</module>\n"
@@ -410,7 +446,7 @@ public class ArchetypeTest
+ " </modules>\n"
+ " </profile>\n"
+ " </profiles>\n"
- + PROJECT_ELEMENT_END ) );
+ + "</project>") );
}
public void testAddModuleToParentPOMNoPackaging()
@@ -453,5 +489,6 @@ public class ArchetypeTest
{
super.setUp();
archetype = (OldArchetype) lookup( OldArchetype.ROLE );
+ out = new StringWriter();
}
}