Issue #4575: Modified NPathComplexityCheckTest.java and moved its input files to the npathcomplexity subdirectory

3 files changed, 7 insertions, 7 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputNPathComplexity.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexity.java
index c4ce47035..105a8bff1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputNPathComplexity.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexity.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.metrics;
+package com.puppycrawl.tools.checkstyle.checks.metrics.npathcomplexity;
 // Advise: for lack of ambiguity try to make all factors prime numbers
 public class InputNPathComplexity {
     //NP = 5
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexity.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityDefault.java
index 0d44a79d2..390d4dd44 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexity.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityDefault.java
@@ -1,6 +1,6 @@
-package com.puppycrawl.tools.checkstyle.checks.metrics;
+package com.puppycrawl.tools.checkstyle.checks.metrics.npathcomplexity;
 
-public class InputComplexity {
+public class InputNPathComplexityDefault {
     // NP = 2
     public void foo() {
         //NP(while-statement) = (while-range=1) + (expr=0) + 1 = 2
@@ -60,7 +60,7 @@ public class InputComplexity {
     }
 
     // NP = 3
-    public InputComplexity()
+    public InputNPathComplexityDefault()
     {
         int i = 1;
         // NP = (if-range=1) + (else-range=2) + 0 = 3
@@ -97,7 +97,7 @@ public class InputComplexity {
     
     /** Inner */
     // NP = 0
-    public InputComplexity(int aParam)
+    public InputNPathComplexityDefault(int aParam)
     {
         Runnable runnable = new Runnable() {
             // NP = 2
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexityOverflow.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityOverflow.java
index 6a49ca2a3..f60d657c8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexityOverflow.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/npathcomplexity/InputNPathComplexityOverflow.java
@@ -1,10 +1,10 @@
-package com.puppycrawl.tools.checkstyle.checks.metrics;
+package com.puppycrawl.tools.checkstyle.checks.metrics.npathcomplexity;
 
 /**
  * This class has methods that have an NPath complexity larger than MAXINT.
  * Test case for bug 1654769.  
  */
-public class InputComplexityOverflow {
+public class InputNPathComplexityOverflow {
 
     /* NP = (if-range[1]=9) * (if-range[2]=9) * (if-range[3]=9) * (if-range[4]=9)
      *          (if-range[5]=9) * (if-range[6]=9) * (if-range[7]=9) * (if-range[8]=9)