WINDUPRULE-985 Fixed 'number-found' consistently with actual values i…

…n the reports (#947)
windup · May 11, 2023 · 290bda6 · 290bda6
1 parent fddf9ab
commit 290bda6
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 46 deletions.
diff --git a/...reviewed/technology-usage/tests/configuration-management-technology-usage.windup.test.xml b/...reviewed/technology-usage/tests/configuration-management-technology-usage.windup.test.xml
@@ -14,7 +14,7 @@
          <rule id="configuration-management-technology-usage-0100-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Cloud Config" number-found="1">
+                  <technology-statistics-exists name="Spring Cloud Config" number-found="3">
                      <tag name="Sustain"/>
                      <tag name="Configuration Management"/>
                      <tag name="Embedded"/>
@@ -28,7 +28,7 @@
          <rule id="configuration-management-technology-usage-0200-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Application Properties File" number-found="1">
+                  <technology-statistics-exists name="Application Properties File" number-found="2">
                      <tag name="Sustain"/>
                      <tag name="Configuration Management"/>
                      <tag name="Embedded"/>
@@ -42,7 +42,7 @@
          <rule id="configuration-management-technology-usage-0300-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Properties" number-found="1">
+                  <technology-statistics-exists name="Spring Properties" number-found="3">
                      <tag name="Sustain"/>
                      <tag name="Configuration Management"/>
                      <tag name="Embedded"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/database-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/database-technology-usage.windup.test.xml
@@ -252,7 +252,7 @@
          <rule id="technology-usage-database-02600-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Data" number-found="1">
+                  <technology-statistics-exists name="Spring Data" number-found="2">
                      <tag name="Store"/>
                      <tag name="Embedded"/>
                      <tag name="Object Mapping"/>
@@ -336,7 +336,7 @@
          <rule id="technology-usage-database-03200-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Data JPA" number-found="1">
+                  <technology-statistics-exists name="Spring Data JPA" number-found="2">
                      <tag name="Store"/>
                      <tag name="Persistence"/>
                      <tag name="Embedded"/>

diff --git a/...rules-reviewed/technology-usage/tests/embedded-framework-technology-usage.windup.test.xml b/...rules-reviewed/technology-usage/tests/embedded-framework-technology-usage.windup.test.xml
@@ -17,7 +17,7 @@
          <rule id="technology-usage-embedded-framework-01000-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Axis" number-found="1">
+                  <technology-statistics-exists name="Axis" number-found="2">
                      <tag name="Connect"/>
                      <tag name="Embedded"/>
                      <tag name="Web Service"/>
@@ -101,7 +101,7 @@
          <rule id="technology-usage-embedded-framework-01500-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Hibernate" number-found="1">
+                  <technology-statistics-exists name="Hibernate" number-found="2">
                      <tag name="Store"/>
                      <tag name="Embedded"/>
                      <tag name="Object Mapping"/>
@@ -157,7 +157,7 @@
          <rule id="technology-usage-embedded-framework-02100-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring" number-found="1">
+                  <technology-statistics-exists name="Spring" number-found="21">
                      <tag name="Execute"/>
                      <tag name="Embedded"/>
                      <tag name="Inversion of Control"/>
@@ -213,7 +213,7 @@
          <rule id="embedded-framework-embedded-framework-02700-test">
             <when>
                <not>
-                  <technology-statistics-exists name="ehcache" number-found="1">
+                  <technology-statistics-exists name="ehcache" number-found="2">
                      <tag name="Store"/>
                      <tag name="Embedded"/>
                      <tag name="Caching"/>
@@ -227,7 +227,7 @@
          <rule id="embedded-framework-embedded-framework-02800-test">
             <when>
                <not>
-                  <technology-statistics-exists name="infinispan" number-found="1">
+                  <technology-statistics-exists name="infinispan" number-found="2">
                      <tag name="Store"/>
                      <tag name="Embedded"/>
                      <tag name="Caching"/>
@@ -493,7 +493,7 @@
          <rule id="technology-usage-embedded-framework-04700-test">
             <when>
                <not>
-                  <technology-statistics-exists name="AOP Alliance" number-found="1">
+                  <technology-statistics-exists name="AOP Alliance" number-found="2">
                      <tag name="Execute"/>
                      <tag name="Embedded"/>
                      <tag name="Inversion of Control"/>
@@ -955,7 +955,7 @@
          <rule id="technology-usage-embedded-framework-08400-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Web" number-found="1"> 
+                  <technology-statistics-exists name="Spring Web" number-found="3">
                      <tag name="View"/>
                      <tag name="Web"/>
                      <tag name="Embedded"/>
@@ -969,7 +969,7 @@
          <rule id="technology-usage-embedded-framework-08500-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Boot Cache" number-found="1"> 
+                  <technology-statistics-exists name="Spring Boot Cache" number-found="4">
                      <tag name="Store"/>
                      <tag name="Caching"/>
                      <tag name="Embedded"/>
@@ -983,7 +983,7 @@
          <rule id="technology-usage-embedded-framework-08600-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Shell" number-found="1"> 
+                  <technology-statistics-exists name="Spring Shell" number-found="4">
                      <tag name="Execute"/>
                      <tag name="Utilities"/>
                      <tag name="Embedded"/>
@@ -1011,7 +1011,7 @@
          <rule id="technology-usage-embedded-framework-08800-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Cloud Function" number-found="1"> 
+                  <technology-statistics-exists name="Spring Cloud Function" number-found="2">
                      <tag name="Execute"/>
                      <tag name="Serverless / FAAS"/>
                      <tag name="Embedded"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/integration-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/integration-technology-usage.windup.test.xml
@@ -41,7 +41,7 @@
          <rule id="technology-usage-integration-00003-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Integration" number-found="1">
+                  <technology-statistics-exists name="Spring Integration" number-found="2">
                      <tag name="Execute"/>
                      <tag name="Embedded"/>
                      <tag name="Integration"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/jta-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/jta-technology-usage.windup.test.xml
@@ -70,7 +70,7 @@
          <rule id="technology-usage-jta-00050-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Evo JTA" number-found="1">
+                  <technology-statistics-exists name="Evo JTA" number-found="2">
                      <tag name="Sustain"/>
                      <tag name="Transaction"/>
                      <tag name="Embedded"/>
@@ -224,7 +224,7 @@
          <rule id="technology-usage-jta-00160-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Java Transaction API" number-found="1">
+                  <technology-statistics-exists name="Java Transaction API" number-found="3">
                      <tag name="Sustain"/>
                      <tag name="Transaction"/>
                      <tag name="Embedded"/>
@@ -238,7 +238,7 @@
          <rule id="technology-usage-jta-00170-test">
             <when>
                <not>
-                  <technology-statistics-exists name="JBoss Transactions" number-found="1">
+                  <technology-statistics-exists name="JBoss Transactions" number-found="9">
                      <tag name="Sustain"/>
                      <tag name="Transaction"/>
                      <tag name="Embedded"/>
@@ -252,7 +252,7 @@
          <rule id="technology-usage-jta-00180-test">
             <when>
                <not>
-                  <technology-statistics-exists name="GlassFish JTA" number-found="1">
+                  <technology-statistics-exists name="GlassFish JTA" number-found="3">
                      <tag name="Sustain"/>
                      <tag name="Transaction"/>
                      <tag name="Embedded"/>
@@ -266,7 +266,7 @@
          <rule id="technology-usage-jta-00190-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Atomikos JTA" number-found="1">
+                  <technology-statistics-exists name="Atomikos JTA" number-found="3">
                      <tag name="Sustain"/>
                      <tag name="Transaction"/>
                      <tag name="Embedded"/>
@@ -280,7 +280,7 @@
          <rule id="technology-usage-jta-00200-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Narayana Arjuna" number-found="1">
+                  <technology-statistics-exists name="Narayana Arjuna" number-found="3">
                      <tag name="Sustain"/>
                      <tag name="Transaction"/>
                      <tag name="Embedded"/>
@@ -294,7 +294,7 @@
          <rule id="technology-usage-jta-00210-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Transactions" number-found="1">
+                  <technology-statistics-exists name="Spring Transactions" number-found="2">
                      <tag name="Sustain"/>
                      <tag name="Transaction"/>
                      <tag name="Embedded"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/logging-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/logging-technology-usage.windup.test.xml
@@ -15,7 +15,7 @@
          <rule id="technology-usage-logging-00010-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Log4J" number-found="1">
+                  <technology-statistics-exists name="Log4J" number-found="2">
                      <tag name="Sustain"/>
                      <tag name="Embedded"/>
                      <tag name="Logging"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/markup-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/markup-technology-usage.windup.test.xml
@@ -9,7 +9,7 @@
             <rule id="technology-usage-markup-01000-test">
                 <when>
                     <not>
-                        <technology-statistics-exists name="HTML" number-found="1">
+                        <technology-statistics-exists name="HTML" number-found="2">
                             <tag name="View"/>
                             <tag name="Embedded"/>
                             <tag name="Markup"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/mvc-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/mvc-technology-usage.windup.test.xml
@@ -36,7 +36,7 @@
             <rule id="technology-usage-mvc-01200-test">
                 <when>
                     <not>
-                        <technology-statistics-exists name="Spring MVC" number-found="1">
+                        <technology-statistics-exists name="Spring MVC" number-found="4">
                             <tag name="View"/>
                             <tag name="Embedded"/>
                             <tag name="MVC"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/non-xml-rules-technology-usage.rhamt.test.xml b/rules/rules-reviewed/technology-usage/tests/non-xml-rules-technology-usage.rhamt.test.xml
@@ -141,7 +141,7 @@
             <rule id="non-xml-technology-usage-20000-test">
                 <when>
                     <not>
-                        <technology-statistics-exists name="Properties" number-found="1">
+                        <technology-statistics-exists name="Properties" number-found="4">
                             <tag name="Sustain"/>
                             <tag name="Embedded"/>
                             <tag name="Other"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/security-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/security-technology-usage.windup.test.xml
@@ -27,7 +27,7 @@
          <rule id="technology-usage-security-01100-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Security" number-found="1">
+                  <technology-statistics-exists name="Spring Security" number-found="2">
                      <tag name="Sustain"/>
                      <tag name="Security"/>
                      <tag name="Embedded"/>

diff --git a/rules/rules-reviewed/technology-usage/tests/web-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/web-technology-usage.windup.test.xml
@@ -63,7 +63,7 @@
             <rule id="technology-usage-web-01400-test">
                 <when>
                     <not>
-                        <technology-statistics-exists name="Applet" number-found="2">
+                        <technology-statistics-exists name="Applet" number-found="3">
                             <tag name="View"/>
                             <tag name="Rich"/>
                             <tag name="Java EE"/>
@@ -74,34 +74,21 @@
                     <fail message="Applet Technology Statistic Not Found" />
                 </perform>
             </rule>
-            <rule id="technology-usage-web-01500-test">
+            <rule id="technology-usage-web-01500-01600-test">
                 <when>
                     <not>
-                        <technology-statistics-exists name="JNLP" number-found="1">
+                        <technology-statistics-exists name="JNLP" number-found="3">
                             <tag name="View"/>
                             <tag name="Rich"/>
                             <tag name="Java EE"/>
+                            <tag name="Embedded"/>
                         </technology-statistics-exists>
                     </not>
                 </when>
                 <perform>
                     <fail message="JNLP Technology Statistic Not Found" />
                 </perform>
             </rule>
-            <rule id="technology-usage-web-01600-test">
-               <when>
-                  <not>
-                     <technology-statistics-exists name="JNLP" number-found="1">
-                        <tag name="View"/>
-                        <tag name="Rich"/>
-                        <tag name="Embedded"/>
-                     </technology-statistics-exists>
-                  </not>
-               </when>
-               <perform>
-                  <fail message="Expected data not found for rule technology-usage-web-01600"/>
-               </perform>
-            </rule>
             <rule id="technology-usage-web-01700-test">
                <when>
                   <not>
@@ -203,7 +190,7 @@
             <rule id="technology-usage-web-02400-test">
                <when>
                   <not>
-                     <technology-statistics-exists name="Eclipse RCP" number-found="1">
+                     <technology-statistics-exists name="Eclipse RCP" number-found="4">
                         <tag name="View"/>
                         <tag name="Rich"/>
                         <tag name="Embedded"/>