Merge pull request #38 from BetonQuest/ITTests

added IT tests to pmd rule set and AvoidDuplicateLiterals now ignores…
BetonQuest · Jan 6, 2025 · e657dc6 · e657dc6
2 parents 48d17d5 + 5a04f6a
commit e657dc6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/configs/pmd-ruleset.xml b/configs/pmd-ruleset.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
-<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         name="Custom Rules"
+<ruleset name="Custom Rules" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
          xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
 
@@ -72,8 +72,7 @@
 
   <rule ref="category/java/codestyle.xml/AtLeastOneConstructor">
     <properties>
-      <property name="violationSuppressXPath"
-                value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(Test|Fixture)$')]"/>
+      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(IT|Test|Fixture)$')]"/>
     </properties>
   </rule>
   <rule ref="category/java/codestyle.xml/AvoidDollarSigns"/>
@@ -126,7 +125,7 @@
   <rule ref="category/java/codestyle.xml/LambdaCanBeMethodReference"/>
   <rule ref="category/java/codestyle.xml/LinguisticNaming">
     <properties>
-      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*Test$')]"/>
+      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(IT|Test|Fixture)$')]"/>
     </properties>
   </rule>
   <rule ref="category/java/codestyle.xml/LocalHomeNamingConvention"/>
@@ -152,8 +151,7 @@
   <rule ref="category/java/codestyle.xml/ShortVariable"/>
   <rule ref="category/java/codestyle.xml/TooManyStaticImports">
     <properties>
-      <property name="violationSuppressXPath"
-                value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(Test|Fixture)$')]"/>
+      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(IT|Test|Fixture)$')]"/>
     </properties>
   </rule>
   <rule ref="category/java/codestyle.xml/UnnecessaryAnnotationValueElement"/>
@@ -216,7 +214,7 @@
   <rule ref="category/java/design.xml/TooManyFields"/>
   <rule ref="category/java/design.xml/TooManyMethods">
     <properties>
-      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*Test$')]"/>
+      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(IT|Test|Fixture)$')]"/>
     </properties>
   </rule>
   <rule ref="category/java/design.xml/UselessOverridingMethod"/>
@@ -226,8 +224,7 @@
   <rule ref="category/java/documentation.xml/CommentContent"/>
   <rule ref="category/java/documentation.xml/CommentRequired">
     <properties>
-      <property name="violationSuppressXPath"
-                value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(Test|Fixture)$')]"/>
+      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(IT|Test|Fixture)$')]"/>
     </properties>
   </rule>
   <rule ref="category/java/documentation.xml/CommentSize">
@@ -250,7 +247,8 @@
   <rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
   <rule ref="category/java/errorprone.xml/AvoidDuplicateLiterals">
     <properties>
-      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*Test$')]"/>
+      <property name="skipAnnotations" value="true" />
+      <property name="violationSuppressXPath" value="//ancestor::ClassDeclaration[matches(@SimpleName, '^.*(IT|Test|Fixture)$')]"/>
     </properties>
   </rule>
   <rule ref="category/java/errorprone.xml/AvoidEnumAsIdentifier"/>

diff --git a/configs/pom.xml b/configs/pom.xml
@@ -16,7 +16,7 @@
 
   <properties>
     <!-- project version -->
-    <revision>1.2.0</revision>
+    <revision>1.3.0</revision>
     <changelist>-SNAPSHOT</changelist>
   </properties>
 

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
   <properties>
     <!-- project version -->
-    <revision>1.2.0</revision>
+    <revision>1.3.0</revision>
     <changelist>-SNAPSHOT</changelist>
     <!-- project properties -->
     <skipShade>false</skipShade>

diff --git a/versions/pom.xml b/versions/pom.xml
@@ -27,7 +27,7 @@
 
   <properties>
     <!-- project version -->
-    <revision>1.2.0</revision>
+    <revision>1.3.0</revision>
     <changelist>-SNAPSHOT</changelist>
     <!-- project settings -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>