Merge 92c9970 into 17f4fdd

sevntu-checkstyle · Sep 1, 2014 · 1c3168a · 1c3168a
2 parents 17f4fdd + 92c9970
commit 1c3168a
Show file tree

Hide file tree

Showing 5 changed files with 273 additions and 58 deletions.
diff --git a/sevntu-checks/pom.xml b/sevntu-checks/pom.xml
@@ -45,6 +45,27 @@
 	    <target>1.5</target>
 	  </configuration>
 	</plugin>
+	<plugin>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>build-helper-maven-plugin</artifactId>
+      <version>1.9</version>
+      <executions>
+        <execution>
+        <id>add-test-source</id>
+        <phase>generate-test-sources</phase>
+        <goals>
+          <goal>add-test-source</goal>
+        </goals>
+        <configuration>
+          <sources>
+            <source>sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputReturnCountExtendedCheckCtors.java</source>
+            <source>sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputReturnCountExtendedCheckMethods.java</source>
+            <source>sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputReturnCountExtendedCheckMethodsInMethods.java</source>
+          </sources>
+        </configuration>
+        </execution>
+       </executions>
+    </plugin>
       </plugins>
     </build>
 

diff --git a/...rc/test/java/com/github/sevntu/checkstyle/checks/coding/ReturnCountExtendedCheckTest.java b/...rc/test/java/com/github/sevntu/checkstyle/checks/coding/ReturnCountExtendedCheckTest.java
@@ -41,9 +41,28 @@ public void testMethodsMaxReturnLiteralsIsOne() throws Exception
         checkConfig.addAttribute("topLinesToIgnoreCount", "0");
 
         String[] expected = {
-        	"25:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "twoReturnsInMethod", 2, 1),
-        	"37:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "threeReturnsInMethod", 3, 1),
-        	"57:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 1)
+               "26:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "twoReturnsInMethod", 2, 1),    
+        	"38:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "threeReturnsInMethod", 3, 1),
+        	"58:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 1),
+        	"92:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "nm", 2, 1)
+        };
+
+        verify(checkConfig, getPath("InputReturnCountExtendedCheckMethods.java"), expected);
+    }
+
+    @Test
+    public void testMethodsMaxReturnLiteralsIsTwo() throws Exception
+    {
+
+        checkConfig.addAttribute("maxReturnCount", "2");
+        checkConfig.addAttribute("ignoreMethodLinesCount", "0"); // swithed off
+        checkConfig.addAttribute("minIgnoreReturnDepth", "5");
+        checkConfig.addAttribute("ignoreEmptyReturns", "false");
+        checkConfig.addAttribute("topLinesToIgnoreCount", "0");
+
+        String[] expected = {
+            "38:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "threeReturnsInMethod", 3, 2),
+            "58:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 2),
         };
 
         verify(checkConfig, getPath("InputReturnCountExtendedCheckMethods.java"), expected);
@@ -60,9 +79,9 @@ public void testConstructorsMaxReturnLiteralsIsOne() throws Exception
         checkConfig.addAttribute("topLinesToIgnoreCount", "0");
 
         String[] expected = {
-        	"28:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 2, 1),
-        	"41:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 3, 1),
-        	"63:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 4, 1),
+        	"29:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 2, 1),
+        	"42:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 3, 1),
+        	"64:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 4, 1),
         };
 
         verify(checkConfig, getPath("InputReturnCountExtendedCheckCtors.java"), expected);
@@ -79,8 +98,8 @@ public void testignoreMethodLinesCount() throws Exception
         checkConfig.addAttribute("topLinesToIgnoreCount", "0");
 
         String[] expected = {
-        	"37:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "threeReturnsInMethod", 3, 1),
-        	"57:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 1),
+        	"38:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "threeReturnsInMethod", 3, 1),
+        	"58:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 1),
         };
 
         verify(checkConfig, getPath("InputReturnCountExtendedCheckMethods.java"), expected);
@@ -96,7 +115,7 @@ public void testignoreMethodLinesCount2() throws Exception
         checkConfig.addAttribute("topLinesToIgnoreCount", "0");
 
         String[] expected = {
-        	"57:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 1),
+        	"58:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 1),
         };
 
         verify(checkConfig, getPath("InputReturnCountExtendedCheckMethods.java"), expected);
@@ -112,26 +131,27 @@ public void testminIgnoreReturnDepth() throws Exception
         checkConfig.addAttribute("topLinesToIgnoreCount", "0");
 
         String[] expected = {
-        	"6:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "oneReturnInMethod", 1, 0),
-        	"10:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "oneReturnInMethod2", 1, 0),
+        	"7:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "oneReturnInMethod", 1, 0),
+        	"11:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "oneReturnInMethod2", 1, 0),
+        	"92:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "nm", 1, 0)
         };
 
         verify(checkConfig, getPath("InputReturnCountExtendedCheckMethods.java"), expected);
     }
 
     @Test
-    public void testIgnoreEmptyReturns() throws Exception
+    public void testIgnoreNonEmptyReturns() throws Exception
     {
         checkConfig.addAttribute("maxReturnCount", "1");
         checkConfig.addAttribute("ignoreMethodLinesCount", "0");
         checkConfig.addAttribute("minIgnoreReturnDepth", "5");
-        checkConfig.addAttribute("ignoreEmptyReturns", "true");
+        checkConfig.addAttribute("ignoreEmptyReturns", "false");
         checkConfig.addAttribute("topLinesToIgnoreCount", "0");
 
         String[] expected = {
-        	"28:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 2, 1),
-        	"41:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 3, 1),
-        	"63:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 3, 1),
+        	"29:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 2, 1),
+        	"42:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 3, 1),
+        	"64:12: " + getCheckMessage(WARNING_MSG_KEY_CTOR, "InputReturnCountExtendedCheckCtors", 4, 1),
         };
 
         verify(checkConfig, getPath("InputReturnCountExtendedCheckCtors.java"), expected);
@@ -147,7 +167,7 @@ public void testMethodsInMethods() throws Exception
         checkConfig.addAttribute("topLinesToIgnoreCount", "0");
 
         String[] expected = {
-        	"100:24: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "handleEvent", 3, 1),
+        	"104:24: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "handleEvent", 3, 1),
         };
 
         verify(checkConfig, getPath("InputReturnCountExtendedCheckMethodsInMethods.java"),
@@ -165,7 +185,8 @@ public void testIgnoreMethodsNamesProperty() throws Exception
         checkConfig.addAttribute("ignoreMethodsNames", "threeReturnsInMethod, twoReturnsInMethod");
 
         String[] expected = {
-        	"57:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 1),
+        	"58:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "fourReturnsInMethod", 4, 1),
+        	"92:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "nm", 2, 1)
         };
 
         verify(checkConfig, getPath("InputReturnCountExtendedCheckMethods.java"), expected);
@@ -182,7 +203,8 @@ public void testRegexIgnoreMethodsNamesProperty() throws Exception
 		checkConfig.addAttribute("ignoreMethodsNames", "(?iu)(?:TwO|Four)(?-iu)ReturnsInMethod");
 
 		String[] expected = {
-			"37:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "threeReturnsInMethod", 3, 1),
+			"38:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "threeReturnsInMethod", 3, 1),
+			"92:16: " + getCheckMessage(WARNING_MSG_KEY_METHOD, "nm", 2, 1)
 		};
 
 		verify(checkConfig, getPath("InputReturnCountExtendedCheckMethods.java"), expected);

diff --git a/...ources/com/github/sevntu/checkstyle/checks/coding/InputReturnCountExtendedCheckCtors.java b/...ources/com/github/sevntu/checkstyle/checks/coding/InputReturnCountExtendedCheckCtors.java
@@ -1,11 +1,12 @@
+package com.github.sevntu.checkstyle.checks.coding;
 public class InputReturnCountExtendedCheckCtors
 {
 
     public int a = 0;
 
     // one "return"
     public InputReturnCountExtendedCheckCtors() {
-        return a;
+        return;
     }
 
     // one "return"
@@ -21,40 +22,40 @@ public InputReturnCountExtendedCheckCtors(int x) {
                 }
             }
         }
-        return a + a * a;
+        return;
     }
 
     // two "returns"
     public InputReturnCountExtendedCheckCtors(int x, String s) {
         System.out.println();
         int a = x + s.length();
         if (a != 4) {
-            return 1;
+            return;
         }
         else {
             System.out.println(a);
-            return 2;
+            return;
         }
     }
 
     // three "returns"
     public InputReturnCountExtendedCheckCtors(String z, double y) {
         System.out.println();
-        int a = z;
+        int a = Integer.parseInt(z);
         y+=0.6;
         if (a != 4)
         {
-            return 1;
+            return;
         }
         else
         {
             if (a - 1 != 2) {
                 this.a = 0;
-                return 6;
+                return;
             }
             else {
                 System.out.println();
-                return 2;
+                return;
             }
         }
     }
@@ -65,7 +66,7 @@ public InputReturnCountExtendedCheckCtors(String z, int x, double y) {
         int a = x;
         if (a != 4)  {
             if (a != 6) {
-                return 1;
+                return;
             }
             else {
                 a++;
@@ -75,11 +76,11 @@ public InputReturnCountExtendedCheckCtors(String z, int x, double y) {
         else {
             if (a - 1 != 2) {
                 this.a = 0;
-                return 6;
+                return;
             }
             else {
                 System.out.println();
-                return 2;
+                return;
             }
         }
     }

diff --git a/...rces/com/github/sevntu/checkstyle/checks/coding/InputReturnCountExtendedCheckMethods.java b/...rces/com/github/sevntu/checkstyle/checks/coding/InputReturnCountExtendedCheckMethods.java
@@ -1,3 +1,4 @@
+package com.github.sevntu.checkstyle.checks.coding;
 public class InputReturnCountExtendedCheckMethods
 {
 
@@ -98,6 +99,7 @@ public int nm()
                     return 5;
             }
         }
+        return a;
     }
 
 }