Fix test expectations after removing the library sorting #SCL-22833

JetBrains · Aug 13, 2024 · fff8dcd · fff8dcd
1 parent f87b3bf
commit fff8dcd
Show file tree

Hide file tree

Showing 21 changed files with 749 additions and 743 deletions.
diff --git a/extractor/src/test/data/0.13/classifiers/structure.xml b/extractor/src/test/data/0.13/classifiers/structure.xml
@@ -1730,11 +1730,11 @@
       <modules>
         <forTest/>
         <forProduction>
-          <module configurations="compile" organization="javax.activation" name="activation" revision="1.1.1" artifactType="jar" classifier=""/>
-          <module configurations="compile" organization="org.apache.james" name="apache-mailet-api" revision="2.5.0" artifactType="jar" classifier=""/>
+          <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.7" artifactType="jar" classifier=""/>
           <module configurations="compile" organization="org.apache.james" name="apache-mailet-base" revision="2.5.0" artifactType="jar" classifier=""/>
           <module configurations="compile" organization="javax.mail" name="mail" revision="1.4.4" artifactType="jar" classifier=""/>
-          <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.7" artifactType="jar" classifier=""/>
+          <module configurations="compile" organization="javax.activation" name="activation" revision="1.1.1" artifactType="jar" classifier=""/>
+          <module configurations="compile" organization="org.apache.james" name="apache-mailet-api" revision="2.5.0" artifactType="jar" classifier=""/>
         </forProduction>
       </modules>
       <jars>
@@ -3305,12 +3305,12 @@
       <modules>
         <forTest/>
         <forProduction>
+          <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.7" artifactType="jar" classifier=""/>
+          <module configurations="compile" organization="org.apache.james" name="apache-mailet-base" revision="2.5.0" artifactType="jar" classifier=""/>
+          <module configurations="compile" organization="javax.mail" name="mail" revision="1.4.4" artifactType="jar" classifier=""/>
           <module configurations="compile" organization="javax.activation" name="activation" revision="1.1.1" artifactType="jar" classifier=""/>
           <module configurations="compile" organization="org.apache.james" name="apache-mailet-api" revision="2.5.0" artifactType="jar" classifier=""/>
-          <module configurations="compile" organization="org.apache.james" name="apache-mailet-base" revision="2.5.0" artifactType="jar" classifier=""/>
           <module configurations="test" organization="org.apache.james" name="apache-mailet-base" revision="2.5.0" artifactType="jar" classifier="tests"/>
-          <module configurations="compile" organization="javax.mail" name="mail" revision="1.4.4" artifactType="jar" classifier=""/>
-          <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.7" artifactType="jar" classifier=""/>
         </forProduction>
       </modules>
       <jars>
@@ -4834,30 +4834,30 @@
     <mainSourceDir>$BASE/foo/src/main</mainSourceDir>
   </project>
   <repository>
-    <module organization="javax.activation" name="activation" revision="1.1.1" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/javax.activation/activation/jars/activation-1.1.1.jar</jar>
-      <src>$IVY2/cache/javax.activation/activation/srcs/activation-1.1.1-sources.jar</src>
+    <module organization="org.scala-lang" name="scala-library" revision="2.10.7" artifactType="jar" classifier="">
+      <jar>$SBT_BOOT/scala-2.10.7/lib/scala-library.jar</jar>
+      <src>$IVY2/cache/org.scala-lang/scala-library/srcs/scala-library-2.10.7-sources.jar</src>
+    </module>
+    <module organization="org.apache.james" name="apache-mailet-base" revision="2.5.0" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.apache.james/apache-mailet-base/bundles/apache-mailet-base-2.5.0.jar</jar>
+      <jar>$IVY2/cache/org.apache.james/apache-mailet-base/jars/apache-mailet-base-2.5.0.jar</jar>
+      <src>$IVY2/cache/org.apache.james/apache-mailet-base/srcs/apache-mailet-base-2.5.0-sources.jar</src>
     </module>
     <module organization="javax.mail" name="mail" revision="1.4.4" artifactType="jar" classifier="">
       <jar>$IVY2/cache/javax.mail/mail/jars/mail-1.4.4.jar</jar>
       <src>$IVY2/cache/javax.mail/mail/srcs/mail-1.4.4-sources.jar</src>
     </module>
+    <module organization="javax.activation" name="activation" revision="1.1.1" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/javax.activation/activation/jars/activation-1.1.1.jar</jar>
+      <src>$IVY2/cache/javax.activation/activation/srcs/activation-1.1.1-sources.jar</src>
+    </module>
     <module organization="org.apache.james" name="apache-mailet-api" revision="2.5.0" artifactType="jar" classifier="">
       <jar>$IVY2/cache/org.apache.james/apache-mailet-api/bundles/apache-mailet-api-2.5.0.jar</jar>
       <src>$IVY2/cache/org.apache.james/apache-mailet-api/srcs/apache-mailet-api-2.5.0-sources.jar</src>
     </module>
-    <module organization="org.apache.james" name="apache-mailet-base" revision="2.5.0" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.apache.james/apache-mailet-base/bundles/apache-mailet-base-2.5.0.jar</jar>
-      <jar>$IVY2/cache/org.apache.james/apache-mailet-base/jars/apache-mailet-base-2.5.0.jar</jar>
-      <src>$IVY2/cache/org.apache.james/apache-mailet-base/srcs/apache-mailet-base-2.5.0-sources.jar</src>
-    </module>
     <module organization="org.apache.james" name="apache-mailet-base" revision="2.5.0" artifactType="jar" classifier="tests">
       <jar>$IVY2/cache/org.apache.james/apache-mailet-base/jars/apache-mailet-base-2.5.0-tests.jar</jar>
     </module>
-    <module organization="org.scala-lang" name="scala-library" revision="2.10.7" artifactType="jar" classifier="">
-      <jar>$SBT_BOOT/scala-2.10.7/lib/scala-library.jar</jar>
-      <src>$IVY2/cache/org.scala-lang/scala-library/srcs/scala-library-2.10.7-sources.jar</src>
-    </module>
   </repository>
   <localCachePath>$IVY2</localCachePath>
 </structure>
diff --git a/extractor/src/test/data/0.13/custom-test-config/structure.xml b/extractor/src/test/data/0.13/custom-test-config/structure.xml
@@ -166,13 +166,13 @@
         <forTest/>
         <forProduction>
           <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="org.scala-lang" name="scala-reflect" revision="2.10.1" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="org.scalaz" name="scalaz-concurrent_2.10" revision="7.1.0" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="org.scalaz" name="scalaz-core_2.10" revision="7.1.0" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="org.scalaz" name="scalaz-effect_2.10" revision="7.1.0" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="org.specs2" name="specs2-common_2.10" revision="2.4.14" artifactType="jar" classifier=""/>
           <module configurations="test" organization="org.specs2" name="specs2-core_2.10" revision="2.4.14" artifactType="jar" classifier=""/>
           <module configurations="test" organization="org.specs2" name="specs2-matcher_2.10" revision="2.4.14" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.specs2" name="specs2-common_2.10" revision="2.4.14" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.scalaz" name="scalaz-core_2.10" revision="7.1.0" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.scalaz" name="scalaz-concurrent_2.10" revision="7.1.0" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.scalaz" name="scalaz-effect_2.10" revision="7.1.0" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.scala-lang" name="scala-reflect" revision="2.10.1" artifactType="jar" classifier=""/>
         </forProduction>
       </modules>
       <jars>
@@ -1697,33 +1697,33 @@
       <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
       <src>$IVY2/cache/org.scala-lang/scala-library/srcs/scala-library-2.10.1-sources.jar</src>
     </module>
-    <module organization="org.scala-lang" name="scala-reflect" revision="2.10.1" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.scala-lang/scala-reflect/jars/scala-reflect-2.10.1.jar</jar>
-      <src>$IVY2/cache/org.scala-lang/scala-reflect/srcs/scala-reflect-2.10.1-sources.jar</src>
+    <module organization="org.specs2" name="specs2-core_2.10" revision="2.4.14" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.specs2/specs2-core_2.10/jars/specs2-core_2.10-2.4.14.jar</jar>
+      <src>$IVY2/cache/org.specs2/specs2-core_2.10/srcs/specs2-core_2.10-2.4.14-sources.jar</src>
     </module>
-    <module organization="org.scalaz" name="scalaz-concurrent_2.10" revision="7.1.0" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.scalaz/scalaz-concurrent_2.10/bundles/scalaz-concurrent_2.10-7.1.0.jar</jar>
-      <src>$IVY2/cache/org.scalaz/scalaz-concurrent_2.10/srcs/scalaz-concurrent_2.10-7.1.0-sources.jar</src>
+    <module organization="org.specs2" name="specs2-matcher_2.10" revision="2.4.14" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.specs2/specs2-matcher_2.10/jars/specs2-matcher_2.10-2.4.14.jar</jar>
+      <src>$IVY2/cache/org.specs2/specs2-matcher_2.10/srcs/specs2-matcher_2.10-2.4.14-sources.jar</src>
+    </module>
+    <module organization="org.specs2" name="specs2-common_2.10" revision="2.4.14" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.specs2/specs2-common_2.10/jars/specs2-common_2.10-2.4.14.jar</jar>
+      <src>$IVY2/cache/org.specs2/specs2-common_2.10/srcs/specs2-common_2.10-2.4.14-sources.jar</src>
     </module>
     <module organization="org.scalaz" name="scalaz-core_2.10" revision="7.1.0" artifactType="jar" classifier="">
       <jar>$IVY2/cache/org.scalaz/scalaz-core_2.10/bundles/scalaz-core_2.10-7.1.0.jar</jar>
       <src>$IVY2/cache/org.scalaz/scalaz-core_2.10/srcs/scalaz-core_2.10-7.1.0-sources.jar</src>
     </module>
+    <module organization="org.scalaz" name="scalaz-concurrent_2.10" revision="7.1.0" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.scalaz/scalaz-concurrent_2.10/bundles/scalaz-concurrent_2.10-7.1.0.jar</jar>
+      <src>$IVY2/cache/org.scalaz/scalaz-concurrent_2.10/srcs/scalaz-concurrent_2.10-7.1.0-sources.jar</src>
+    </module>
     <module organization="org.scalaz" name="scalaz-effect_2.10" revision="7.1.0" artifactType="jar" classifier="">
       <jar>$IVY2/cache/org.scalaz/scalaz-effect_2.10/bundles/scalaz-effect_2.10-7.1.0.jar</jar>
       <src>$IVY2/cache/org.scalaz/scalaz-effect_2.10/srcs/scalaz-effect_2.10-7.1.0-sources.jar</src>
     </module>
-    <module organization="org.specs2" name="specs2-common_2.10" revision="2.4.14" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.specs2/specs2-common_2.10/jars/specs2-common_2.10-2.4.14.jar</jar>
-      <src>$IVY2/cache/org.specs2/specs2-common_2.10/srcs/specs2-common_2.10-2.4.14-sources.jar</src>
-    </module>
-    <module organization="org.specs2" name="specs2-core_2.10" revision="2.4.14" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.specs2/specs2-core_2.10/jars/specs2-core_2.10-2.4.14.jar</jar>
-      <src>$IVY2/cache/org.specs2/specs2-core_2.10/srcs/specs2-core_2.10-2.4.14-sources.jar</src>
-    </module>
-    <module organization="org.specs2" name="specs2-matcher_2.10" revision="2.4.14" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.specs2/specs2-matcher_2.10/jars/specs2-matcher_2.10-2.4.14.jar</jar>
-      <src>$IVY2/cache/org.specs2/specs2-matcher_2.10/srcs/specs2-matcher_2.10-2.4.14-sources.jar</src>
+    <module organization="org.scala-lang" name="scala-reflect" revision="2.10.1" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.scala-lang/scala-reflect/jars/scala-reflect-2.10.1.jar</jar>
+      <src>$IVY2/cache/org.scala-lang/scala-reflect/srcs/scala-reflect-2.10.1-sources.jar</src>
     </module>
   </repository>
   <localCachePath>$IVY2</localCachePath>

diff --git a/extractor/src/test/data/0.13/dependency_resolve_javadocs/structure.xml b/extractor/src/test/data/0.13/dependency_resolve_javadocs/structure.xml
@@ -107,9 +107,9 @@
       <modules>
         <forTest/>
         <forProduction>
-          <module configurations="test" organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier=""/>
           <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier=""/>
         </forProduction>
       </modules>
       <jars>
@@ -1633,6 +1633,10 @@
     <mainSourceDir>$BASE/src/main</mainSourceDir>
   </project>
   <repository>
+    <module organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
+      <doc>$IVY2/cache/org.scala-lang/scala-library/docs/scala-library-2.10.1-javadoc.jar</doc>
+    </module>
     <module organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier="">
       <jar>$IVY2/cache/junit/junit/jars/junit-4.13.2.jar</jar>
       <doc>$IVY2/cache/junit/junit/docs/junit-4.13.2-javadoc.jar</doc>
@@ -1641,10 +1645,6 @@
       <jar>$IVY2/cache/org.hamcrest/hamcrest-core/jars/hamcrest-core-1.3.jar</jar>
       <doc>$IVY2/cache/org.hamcrest/hamcrest-core/docs/hamcrest-core-1.3-javadoc.jar</doc>
     </module>
-    <module organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
-      <doc>$IVY2/cache/org.scala-lang/scala-library/docs/scala-library-2.10.1-javadoc.jar</doc>
-    </module>
   </repository>
   <localCachePath>$IVY2</localCachePath>
 </structure>
diff --git a/extractor/src/test/data/0.13/dependency_resolve_none/structure.xml b/extractor/src/test/data/0.13/dependency_resolve_none/structure.xml
@@ -107,9 +107,9 @@
       <modules>
         <forTest/>
         <forProduction>
-          <module configurations="test" organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier=""/>
           <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier=""/>
         </forProduction>
       </modules>
       <jars>
@@ -1633,15 +1633,15 @@
     <mainSourceDir>$BASE/src/main</mainSourceDir>
   </project>
   <repository>
+    <module organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
+    </module>
     <module organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier="">
       <jar>$IVY2/cache/junit/junit/jars/junit-4.13.2.jar</jar>
     </module>
     <module organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier="">
       <jar>$IVY2/cache/org.hamcrest/hamcrest-core/jars/hamcrest-core-1.3.jar</jar>
     </module>
-    <module organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
-    </module>
   </repository>
   <localCachePath>$IVY2</localCachePath>
 </structure>
diff --git a/extractor/src/test/data/0.13/dependency_resolve_none_with_explicit_classifiers/structure.xml b/extractor/src/test/data/0.13/dependency_resolve_none_with_explicit_classifiers/structure.xml
@@ -107,9 +107,9 @@
       <modules>
         <forTest/>
         <forProduction>
-          <module configurations="test" organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier=""/>
           <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier=""/>
         </forProduction>
       </modules>
       <jars>
@@ -1633,6 +1633,9 @@
     <mainSourceDir>$BASE/src/main</mainSourceDir>
   </project>
   <repository>
+    <module organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
+    </module>
     <module organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier="">
       <jar>$IVY2/cache/junit/junit/jars/junit-4.13.2.jar</jar>
       <doc>$IVY2/cache/junit/junit/docs/junit-4.13.2-javadoc.jar</doc>
@@ -1641,9 +1644,6 @@
     <module organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier="">
       <jar>$IVY2/cache/org.hamcrest/hamcrest-core/jars/hamcrest-core-1.3.jar</jar>
     </module>
-    <module organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
-    </module>
   </repository>
   <localCachePath>$IVY2</localCachePath>
 </structure>
diff --git a/extractor/src/test/data/0.13/dependency_resolve_sources/structure.xml b/extractor/src/test/data/0.13/dependency_resolve_sources/structure.xml
@@ -107,9 +107,9 @@
       <modules>
         <forTest/>
         <forProduction>
-          <module configurations="test" organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier=""/>
-          <module configurations="test" organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier=""/>
           <module configurations="compile" organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier=""/>
+          <module configurations="test" organization="org.hamcrest" name="hamcrest-core" revision="1.3" artifactType="jar" classifier=""/>
         </forProduction>
       </modules>
       <jars>
@@ -1633,6 +1633,10 @@
     <mainSourceDir>$BASE/src/main</mainSourceDir>
   </project>
   <repository>
+    <module organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier="">
+      <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
+      <src>$IVY2/cache/org.scala-lang/scala-library/srcs/scala-library-2.10.1-sources.jar</src>
+    </module>
     <module organization="junit" name="junit" revision="4.13.2" artifactType="jar" classifier="">
       <jar>$IVY2/cache/junit/junit/jars/junit-4.13.2.jar</jar>
       <src>$IVY2/cache/junit/junit/srcs/junit-4.13.2-sources.jar</src>
@@ -1641,10 +1645,6 @@
       <jar>$IVY2/cache/org.hamcrest/hamcrest-core/jars/hamcrest-core-1.3.jar</jar>
       <src>$IVY2/cache/org.hamcrest/hamcrest-core/srcs/hamcrest-core-1.3-sources.jar</src>
     </module>
-    <module organization="org.scala-lang" name="scala-library" revision="2.10.1" artifactType="jar" classifier="">
-      <jar>$IVY2/cache/org.scala-lang/scala-library/jars/scala-library-2.10.1.jar</jar>
-      <src>$IVY2/cache/org.scala-lang/scala-library/srcs/scala-library-2.10.1-sources.jar</src>
-    </module>
   </repository>
   <localCachePath>$IVY2</localCachePath>
 </structure>