Issue #14769: Implemented metrics package structure for IT Regression area

SteLeo1602 · romani · commit cb690d09debd · 2025-08-06T18:21:14.000-07:00
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionBooleanExpressionComplexityTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionBooleanExpressionComplexityTest.java
@@ -17,12 +17,13 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package org.checkstyle.suppressionxpathfilter;
+package org.checkstyle.suppressionxpathfilter.metrics;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
 
+import org.checkstyle.suppressionxpathfilter.AbstractXpathTestSupport;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
@@ -36,6 +37,11 @@ protected String getCheckName() {
         return BooleanExpressionComplexityCheck.class.getSimpleName();
     }
 
+    @Override
+    protected String getPackageLocation() {
+        return "org/checkstyle/suppressionxpathfilter/metrics/booleanexpressioncomplexity";
+    }
+
     @Test
     public void testCatchBlock() throws Exception {
         final File fileToProcess =
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionClassDataAbstractionCouplingTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionClassDataAbstractionCouplingTest.java
@@ -17,12 +17,13 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package org.checkstyle.suppressionxpathfilter;
+package org.checkstyle.suppressionxpathfilter.metrics;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
+import org.checkstyle.suppressionxpathfilter.AbstractXpathTestSupport;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
@@ -37,6 +38,11 @@ protected String getCheckName() {
         return checkName;
     }
 
+    @Override
+    protected String getPackageLocation() {
+        return "org/checkstyle/suppressionxpathfilter/metrics/classdataabstractioncoupling";
+    }
+
     @Test
     public void testClassDataAbstractCouplingClass() throws Exception {
         final File classPath =
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionClassFanOutComplexityTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionClassFanOutComplexityTest.java
@@ -17,11 +17,12 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package org.checkstyle.suppressionxpathfilter;
+package org.checkstyle.suppressionxpathfilter.metrics;
 
 import java.io.File;
 import java.util.List;
 
+import org.checkstyle.suppressionxpathfilter.AbstractXpathTestSupport;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
@@ -36,6 +37,11 @@ protected String getCheckName() {
         return checkName;
     }
 
+    @Override
+    protected String getPackageLocation() {
+        return "org/checkstyle/suppressionxpathfilter/metrics/classfanoutcomplexity";
+    }
+
     @Test
     public void testInClass() throws Exception {
         final File fileToProcess = new File(
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionCyclomaticComplexityTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionCyclomaticComplexityTest.java
@@ -17,12 +17,13 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package org.checkstyle.suppressionxpathfilter;
+package org.checkstyle.suppressionxpathfilter.metrics;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
+import org.checkstyle.suppressionxpathfilter.AbstractXpathTestSupport;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
@@ -37,6 +38,11 @@ protected String getCheckName() {
         return checkName;
     }
 
+    @Override
+    protected String getPackageLocation() {
+        return "org/checkstyle/suppressionxpathfilter/metrics/cyclomaticcomplexity";
+    }
+
     @Test
     public void testConditionals() throws Exception {
 
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionJavaNCSSTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionJavaNCSSTest.java
@@ -17,11 +17,12 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package org.checkstyle.suppressionxpathfilter;
+package org.checkstyle.suppressionxpathfilter.metrics;
 
 import java.io.File;
 import java.util.List;
 
+import org.checkstyle.suppressionxpathfilter.AbstractXpathTestSupport;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
@@ -37,6 +38,11 @@ protected String getCheckName() {
         return checkName;
     }
 
+    @Override
+    protected String getPackageLocation() {
+        return "org/checkstyle/suppressionxpathfilter/metrics/javancss";
+    }
+
     @Test
     public void testOne() throws Exception {
         final File fileToProcess =
diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionNPathComplexityTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/metrics/XpathRegressionNPathComplexityTest.java
@@ -17,13 +17,14 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-package org.checkstyle.suppressionxpathfilter;
+package org.checkstyle.suppressionxpathfilter.metrics;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.checkstyle.suppressionxpathfilter.AbstractXpathTestSupport;
 import org.junit.jupiter.api.Test;
 
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
@@ -39,6 +40,11 @@ protected String getCheckName() {
         return checkName;
     }
 
+    @Override
+    protected String getPackageLocation() {
+        return "org/checkstyle/suppressionxpathfilter/metrics/npathcomplexity";
+    }
+
     @Test
     public void testMethod() throws Exception {
         final File fileToProcess =
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityCatchBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityCatchBlock.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.booleanexpressioncomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.booleanexpressioncomplexity;
 
 public class InputXpathBooleanExpressionComplexityCatchBlock {
     public boolean methodOne() {
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityClassFields.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityClassFields.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.booleanexpressioncomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.booleanexpressioncomplexity;
 
 public class InputXpathBooleanExpressionComplexityClassFields {
     public void methodTwo() {
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityConditionals.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/booleanexpressioncomplexity/InputXpathBooleanExpressionComplexityConditionals.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.booleanexpressioncomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.booleanexpressioncomplexity;
 
 public class InputXpathBooleanExpressionComplexityConditionals {
     public void methodThree() {
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classdataabstractioncoupling/InputXpathClassDataAbstractionCouplingClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classdataabstractioncoupling/InputXpathClassDataAbstractionCouplingClass.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.classdataabstractioncoupling;
+package org.checkstyle.suppressionxpathfilter.metrics.classdataabstractioncoupling;
 
 import java.io.ByteArrayInputStream;
 import java.io.CharArrayWriter;
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classdataabstractioncoupling/InputXpathClassDataAbstractionCouplingEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classdataabstractioncoupling/InputXpathClassDataAbstractionCouplingEnum.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.classdataabstractioncoupling;
+package org.checkstyle.suppressionxpathfilter.metrics.classdataabstractioncoupling;
 
 import java.io.CharArrayWriter;
 import java.io.File;
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classdataabstractioncoupling/InputXpathClassDataAbstractionCouplingInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classdataabstractioncoupling/InputXpathClassDataAbstractionCouplingInterface.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.classdataabstractioncoupling;
+package org.checkstyle.suppressionxpathfilter.metrics.classdataabstractioncoupling;
 
 import java.io.CharArrayWriter;
 import java.io.File;
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classfanoutcomplexity/InputXpathClassFanOutComplexityClass.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classfanoutcomplexity/InputXpathClassFanOutComplexityClass.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.classfanoutcomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.classfanoutcomplexity;
 
 import java.util.Date;
 import java.util.Timer;
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classfanoutcomplexity/InputXpathClassFanOutComplexityEnum.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classfanoutcomplexity/InputXpathClassFanOutComplexityEnum.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.classfanoutcomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.classfanoutcomplexity;
 
 import java.util.Date;
 
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classfanoutcomplexity/InputXpathClassFanOutComplexityInterface.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/classfanoutcomplexity/InputXpathClassFanOutComplexityInterface.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.classfanoutcomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.classfanoutcomplexity;
 
 public class InputXpathClassFanOutComplexityInterface {
 
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/cyclomaticcomplexity/InputXpathCyclomaticComplexityConditionals.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/cyclomaticcomplexity/InputXpathCyclomaticComplexityConditionals.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.cyclomaticcomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.cyclomaticcomplexity;
 
 public class InputXpathCyclomaticComplexityConditionals {
     public void test(int a, int b) { //warn
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/cyclomaticcomplexity/InputXpathCyclomaticComplexitySwitchBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/cyclomaticcomplexity/InputXpathCyclomaticComplexitySwitchBlock.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.cyclomaticcomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.cyclomaticcomplexity;
 
 public class InputXpathCyclomaticComplexitySwitchBlock {
 
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/javancss/InputXpathJavaNCSSOne.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/javancss/InputXpathJavaNCSSOne.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.javancss;
+package org.checkstyle.suppressionxpathfilter.metrics.javancss;
 
 public class InputXpathJavaNCSSOne {
 
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/javancss/InputXpathJavaNCSSThree.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/javancss/InputXpathJavaNCSSThree.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.javancss; // warn
+package org.checkstyle.suppressionxpathfilter.metrics.javancss; // warn
 
 public class InputXpathJavaNCSSThree {
     int a1 = 1;
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/javancss/InputXpathJavaNCSSTwo.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/javancss/InputXpathJavaNCSSTwo.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.javancss;
+package org.checkstyle.suppressionxpathfilter.metrics.javancss;
 
 public class InputXpathJavaNCSSTwo { // warn
 
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/npathcomplexity/InputXpathNPathComplexityMethod.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/npathcomplexity/InputXpathNPathComplexityMethod.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.npathcomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.npathcomplexity;
 
 public class InputXpathNPathComplexityMethod {
     public void test() { //warn
diff --git a/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/npathcomplexity/InputXpathNPathComplexityStaticBlock.java b/src/it/resources/org/checkstyle/suppressionxpathfilter/metrics/npathcomplexity/InputXpathNPathComplexityStaticBlock.java
@@ -1,4 +1,4 @@
-package org.checkstyle.suppressionxpathfilter.npathcomplexity;
+package org.checkstyle.suppressionxpathfilter.metrics.npathcomplexity;
 
 public class InputXpathNPathComplexityStaticBlock {
     static { //warn

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.checkstyle.suppressionxpathfilter.booleanexpressioncomplexity;`
	`1`	`+package org.checkstyle.suppressionxpathfilter.metrics.booleanexpressioncomplexity;`
`2`	`2`
`3`	`3`	`public class InputXpathBooleanExpressionComplexityCatchBlock {`
`4`	`4`	`public boolean methodOne() {`