fix test for moved org.apache.camel.util.component package

windup · Mar 2, 2020 · b602cad · b602cad
1 parent b679ee0
commit b602cad
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/rules-reviewed/camel3/camel2/tests/xml-moved-components.windup.test.xml b/rules-reviewed/camel3/camel2/tests/xml-moved-components.windup.test.xml
@@ -139,7 +139,7 @@
                     <fail message="[xml-moved-components] camel-zip-deflater dependency moved hint was not found!"/>
                 </perform>
             </rule>
-            <rule id="xml-moved-components-00012-test">
+            <rule id="xml-moved-components-00011-test">
                 <when>
                     <not>
                         <iterable-filter size="1">
@@ -150,30 +150,31 @@
                 <perform>
                     <fail message="[xml-moved-components] `camel-xpath` dependency moved hint was not found!"/>
                 </perform>
-            </rule> <rule id="xml-moved-components-00011-test">
+            </rule>
+            <rule id="xml-moved-components-00012-test">
                 <when>
                     <not>
                         <iterable-filter size="1">
-                            <hint-exists message="camel-xpath` dependency required.*"/>
+                            <hint-exists message="All the classes from `org.apache.camel.util.component.*"/>
+                        </iterable-filter>
+                    </not>
+                </when>
+                <perform>
+                    <fail message="All the classes from `org.apache.camel.util.component`have been moved "/>
+                </perform>
+            </rule>
+            <rule id="xml-moved-components-00013-test">
+                <when>
+                    <not>
+                        <iterable-filter size="3">
+                            <hint-exists message="The class `org.apache.camel.impl.*` has been moved to `org.apache.camel.impl.engine`.*"/>
                         </iterable-filter>
                     </not>
                 </when>
                 <perform>
                     <fail message="All the classes from `org.apache.camel.util.component`.* "/>
                 </perform>
             </rule>
-        <rule id="xml-moved-components-00012-test">
-        <when>
-            <not>
-                <iterable-filter size="3">
-                    <hint-exists message="The class `org.apache.camel.impl.*` has been moved to `org.apache.camel.impl.engine`.*"/>
-                </iterable-filter>
-            </not>
-        </when>
-        <perform>
-            <fail message="All the classes from `org.apache.camel.util.component`.* "/>
-        </perform>
-    </rule>
         </rules>
     </ruleset>
 </ruletest>
diff --git a/rules-reviewed/camel3/camel2/xml-moved-components.windup.xml b/rules-reviewed/camel3/camel2/xml-moved-components.windup.xml
@@ -328,7 +328,7 @@
                 </iteration>
             </perform>
         </rule>
-        <rule id="xml-moved-components-00011">
+        <rule id="xml-moved-components-00012">
             <when>
                 <xmlfile as="dependencies-block" in="pom.xml"
                         matches="/m:project/m:dependencies[count(m:dependency/m:artifactId[text()='camel-support'])=0]">
@@ -350,7 +350,7 @@
                 </iteration>
             </perform>
         </rule>
-        <rule id="xml-moved-components-00012">
+        <rule id="xml-moved-components-00013">
             <when>
                 <javaclass references="org.apache.camel.impl.{moved}" as="javaClass">
                     <location>IMPORT</location>