Cover sorting of tags for sort dependency exclusions

Ekryd · Apr 3, 2021 · 97a1d7b · 97a1d7b
1 parent 8c9aa29
commit 97a1d7b
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/sorter/src/test/java/sortpom/sort/SortDependenciesTest.java b/sorter/src/test/java/sortpom/sort/SortDependenciesTest.java
@@ -20,15 +20,17 @@ final void scopeInSortDependenciesShouldSortByScope() throws Exception {
     }
 
     /**
-     * This is an odd test since we add an extra tag in the sort order file (under plugins and dependencies)
-     * so that it will be sorted beside dependency and plugin tags. The extra tag does not play well with
-     * the pom xml validation.
+     * This is an odd test since we add an EXTRA tag in the SORT ORDER FILE (under plugins and dependencies)
+     * so that it will be sorted beside dependency and plugin tags. 
+     * 
+     * The extra tag does not play well with the pom xml validation.
      */
     @Test
     final void extraTagInDependenciesAndPluginShouldBeSortedFirst() throws Exception {
         SortPomImplUtil.create()
                 .defaultOrderFileName("sortOrderFiles/extra_dummy_tags.xml")
                 .sortDependencies("scope,groupId,artifactId")
+                .sortDependencyExclusions("groupId,artifactId")
                 .sortPlugins("groupId,artifactId")
                 .lineSeparator("\r\n")
                 .testFiles("/Extra_tags_dep_and_plugin.xml", "/Extra_tags_dep_and_plugin_expected.xml");

diff --git a/sorter/src/test/java/sortpom/util/TestHandler.java b/sorter/src/test/java/sortpom/util/TestHandler.java
@@ -78,7 +78,6 @@ void performSortThatSorted() throws Exception {
 
             expectedSortedPomInputStream = new FileInputStream("src/test/resources/" + expectedResourceFileName);
             String expectedSorted = IOUtils.toString(expectedSortedPomInputStream, pluginParameters.encoding);
-            assertThat(actualSorted, is(expectedSorted));
             assertEquals(expectedSorted, actualSorted);
         } finally {
             cleanupAfterTest();

diff --git a/sorter/src/test/resources/Extra_tags_dep_and_plugin.xml b/sorter/src/test/resources/Extra_tags_dep_and_plugin.xml
@@ -24,6 +24,19 @@
       <artifactId>cglib</artifactId>
       <version>2.2</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+        <this is="dummy">
+          <element></element>
+        </this>
+        <exclusion>
+          <groupId>org.sonatype.aether</groupId>
+          <artifactId>aether</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <this is="dummy">
       <element></element>

diff --git a/sorter/src/test/resources/Extra_tags_dep_and_plugin_expected.xml b/sorter/src/test/resources/Extra_tags_dep_and_plugin_expected.xml
@@ -20,6 +20,19 @@
       <artifactId>cglib</artifactId>
       <version>2.2</version>
       <scope>test</scope>
+      <exclusions>
+        <this is="dummy">
+          <element></element>
+        </this>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.sonatype.aether</groupId>
+          <artifactId>aether</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>cheesymock</groupId>

diff --git a/sorter/src/test/resources/sortOrderFiles/extra_dummy_tags.xml b/sorter/src/test/resources/sortOrderFiles/extra_dummy_tags.xml
@@ -34,6 +34,7 @@
         <systemPath>systemPath</systemPath>
         <optional>false</optional>
         <exclusions>
+                    <this/>
           <exclusion>
             <groupId>groupId</groupId>
             <artifactId>artifactId</artifactId>
@@ -54,6 +55,7 @@
       <systemPath>systemPath</systemPath>
       <optional>false</optional>
       <exclusions>
+                    <this/>
         <exclusion>
           <groupId>groupId</groupId>
           <artifactId>artifactId</artifactId>
@@ -122,6 +124,7 @@
               <systemPath>systemPath</systemPath>
               <optional>false</optional>
               <exclusions>
+                    <this/>
                 <exclusion>
                   <groupId>groupId</groupId>
                   <artifactId>artifactId</artifactId>
@@ -165,6 +168,7 @@
             <systemPath>systemPath</systemPath>
             <optional>false</optional>
             <exclusions>
+                    <this/>
               <exclusion>
                 <groupId>groupId</groupId>
                 <artifactId>artifactId</artifactId>
@@ -401,6 +405,7 @@
             <systemPath>systemPath</systemPath>
             <optional>false</optional>
             <exclusions>
+                    <this/>
               <exclusion>
                 <groupId>groupId</groupId>
                 <artifactId>artifactId</artifactId>
@@ -421,6 +426,7 @@
           <systemPath>systemPath</systemPath>
           <optional>false</optional>
           <exclusions>
+                    <this/>
             <exclusion>
               <groupId>groupId</groupId>
               <artifactId>artifactId</artifactId>
@@ -484,6 +490,7 @@
                   <systemPath>systemPath</systemPath>
                   <optional>false</optional>
                   <exclusions>
+                    <this/>
                     <exclusion>
                       <groupId>groupId</groupId>
                       <artifactId>artifactId</artifactId>
@@ -527,6 +534,7 @@
                 <systemPath>systemPath</systemPath>
                 <optional>false</optional>
                 <exclusions>
+                    <this/>
                   <exclusion>
                     <groupId>groupId</groupId>
                     <artifactId>artifactId</artifactId>