SimpleAccessorNameNotationCheck_195

sevntu-checkstyle · Sep 1, 2014 · 3c7db16 · 3c7db16
1 parent f36b26c
commit 3c7db16
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 45 deletions.
diff --git a/.../test/java/com/github/sevntu/checkstyle/checks/coding/SimpleAccessorNameNotationTest.java b/.../test/java/com/github/sevntu/checkstyle/checks/coding/SimpleAccessorNameNotationTest.java
@@ -35,8 +35,8 @@ public void correctWithoutPrefix() throws Exception
     {
         final DefaultConfiguration checkConfig = createCheckConfig(SimpleAccessorNameNotationCheck.class);
         final String[] expected = {
-                "16: " + warningSetterMessage,
-                "21: " + warningGetterMessage,
+                "17: " + warningSetterMessage,
+                "22: " + warningGetterMessage,
         };
         verify(checkConfig, getPath("InputSimpleAccessorNameNotation1.java"), expected);
     }
@@ -47,8 +47,8 @@ public void correctWithtPrefix() throws Exception
         final DefaultConfiguration checkConfig = createCheckConfig(SimpleAccessorNameNotationCheck.class);
         checkConfig.addAttribute("prefix", "m");
         final String[] expected = {
-                "6: " + warningSetterMessage,
-                "11: " + warningGetterMessage,
+                "7: " + warningSetterMessage,
+                "12: " + warningGetterMessage,
         };
         verify(checkConfig, getPath("InputSimpleAccessorNameNotation1.java"), expected);
     }
@@ -58,12 +58,12 @@ public void partlyWithoutPrefix() throws Exception
     {
         final DefaultConfiguration checkConfig = createCheckConfig(SimpleAccessorNameNotationCheck.class);
         final String[] expected = {
-                "14: " + warningGetterMessage,
-                "19: " + warningSetterMessage,
-                "29: " + warningSetterMessage,
-                "34: " + warningGetterMessage,
-                "39: " + warningSetterMessage,
-                "44: " + warningGetterMessage,
+                "15: " + warningGetterMessage,
+                "20: " + warningSetterMessage,
+                "30: " + warningSetterMessage,
+                "35: " + warningGetterMessage,
+                "40: " + warningSetterMessage,
+                "45: " + warningGetterMessage,
         };
         verify(checkConfig, getPath("InputSimpleAccessorNameNotation2.java"), expected);
     }
@@ -74,12 +74,12 @@ public void partlyWithPrefix() throws Exception
         final DefaultConfiguration checkConfig = createCheckConfig(SimpleAccessorNameNotationCheck.class);
         checkConfig.addAttribute("prefix", "m");
         final String[] expected = {
-                "9: " + warningSetterMessage,
-                "14: " + warningGetterMessage,
-                "19: " + warningSetterMessage,
-                "24: " + warningGetterMessage,
-                "34: " + warningGetterMessage,
-                "39: " + warningSetterMessage,
+                "10: " + warningSetterMessage,
+                "15: " + warningGetterMessage,
+                "20: " + warningSetterMessage,
+                "25: " + warningGetterMessage,
+                "35: " + warningGetterMessage,
+                "40: " + warningSetterMessage,
         };
         verify(checkConfig, getPath("InputSimpleAccessorNameNotation2.java"), expected);
     }
@@ -89,10 +89,10 @@ public void errorsWithoutPrefix() throws Exception
     {
         final DefaultConfiguration checkConfig = createCheckConfig(SimpleAccessorNameNotationCheck.class);
         final String[] expected = {
-                "6: " + warningSetterMessage,
-                "11: " + warningGetterMessage,
-                "16: " + warningSetterMessage,
-                "21: " + warningGetterMessage,
+                "7: " + warningSetterMessage,
+                "12: " + warningGetterMessage,
+                "17: " + warningSetterMessage,
+                "22: " + warningGetterMessage,
         };
         verify(checkConfig, getPath("InputSimpleAccessorNameNotation3.java"), expected);
     }
@@ -103,10 +103,10 @@ public void errorsWithPrefix() throws Exception
         final DefaultConfiguration checkConfig = createCheckConfig(SimpleAccessorNameNotationCheck.class);
         checkConfig.addAttribute("prefix", "m");
         final String[] expected = {
-                "6: " + warningSetterMessage,
-                "11: " + warningGetterMessage,
-                "16: " + warningSetterMessage,
-                "21: " + warningGetterMessage,
+                "7: " + warningSetterMessage,
+                "12: " + warningGetterMessage,
+                "17: " + warningSetterMessage,
+                "22: " + warningGetterMessage,
         };
         verify(checkConfig, getPath("InputSimpleAccessorNameNotation3.java"), expected);
     }
@@ -133,8 +133,8 @@ public void testBoolean() throws Exception
     {
         final DefaultConfiguration checkConfig = createCheckConfig(SimpleAccessorNameNotationCheck.class);
         final String[] expected = {
-                "27: " + warningSetterMessage,
-                "32: " + warningGetterMessage,
+                "28: " + warningSetterMessage,
+                "33: " + warningGetterMessage,
         };
         verify(checkConfig, getPath("InputSimpleAccessorNameNotation5.java"), expected);
     }

diff --git a/...resources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation.java b/...resources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation.java
@@ -1,5 +1,5 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
-public class InputSimpleAccesorNameNotation {
+package com.github.sevntu.checkstyle.checks.coding;
+public class InputSimpleAccessorNameNotation {
 	private int mFirst;
 	private int mSecond;
 	private int mA;

diff --git a/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation1.java b/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation1.java
@@ -1,3 +1,4 @@
+package com.github.sevntu.checkstyle.checks.coding;
 public class InputSimpleAccessorNameNotation1
 {
     private String field1;

diff --git a/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation2.java b/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation2.java
@@ -1,8 +1,9 @@
+package com.github.sevntu.checkstyle.checks.coding;
 public class InputSimpleAccessorNameNotation2
 {
     private String field1;
     private int field2;
-
+    private String field3;
     private String mField3;
     private int mField4;
 
@@ -18,7 +19,7 @@ public String getFiel1() // !! in both case
 
     public void setFiel2(String aField2) // !! in both case
     {
-        field2 = aField2;
+        field3 = aField2;
     }
 
     public int getField2() //prefix "m" !!
@@ -38,7 +39,7 @@ public String getFiel3() // !! in both case
 
     public void setFiel4(String aField4) // !! in both case
     {
-        mField4 = aField4;
+        mField3 = aField4;
     }
 
     public int getField4() //prefix "" !!

diff --git a/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation3.java b/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation3.java
@@ -1,8 +1,9 @@
+package com.github.sevntu.checkstyle.checks.coding;
 public class InputSimpleAccessorNameNotation3
 {
     private String field1;
     private int mField2;
-
+    private String mField3;
     public void setFiel1(String aField1) // !! in both case
     {
         field1 = aField1;
@@ -15,7 +16,7 @@ public String getFiel1() // !! in both case
 
     public void setFie2(String aField2) // !! in both case
     {
-        mField2 = aField2;
+        mField3 = aField2;
     }
 
     public int getFiel2() // !! in both case

diff --git a/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation4.java b/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation4.java
@@ -1,3 +1,4 @@
+package com.github.sevntu.checkstyle.checks.coding;
 public class InputSimpleAccessorNameNotation4
 {
     private String field1;
@@ -22,6 +23,6 @@ public void setField2(int field2)
     public int getField2()
     {
         String anyString = null;
-        return anyString;
+        return 4;
     }
 }
diff --git a/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation5.java b/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation5.java
@@ -1,3 +1,4 @@
+package com.github.sevntu.checkstyle.checks.coding;
 public class InputSimpleAccessorNameNotation5
 {
     private boolean field1; 

diff --git a/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation6.java b/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation6.java
@@ -1,18 +1,16 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.github.sevntu.checkstyle.checks.coding;
 
-public class InputSimpleAccesorNameNotation7
+public class InputSimpleAccessorNameNotation6
 {
     public static void
-            updateCheckSum(final InputStream metadataFile, File metadataFileSum, HashFunction hashFunction)
-                    throws IOException
+            updateCheckSum(final String metadataFile, String metadataFileSum, String hashFunction)
+                    throws Exception
     {
-        HashCode hash = ByteStreams.hash(new InputSupplier<InputStream>()
-        {
-            @Override
-                    public InputStream getInput() throws IOException
+        new Object() {
+            public String getInput() throws Exception
             {
                 return metadataFile;
             }
-        }, hashFunction);
+        };
     }
 }
diff --git a/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation7.java b/...esources/com/github/sevntu/checkstyle/checks/coding/InputSimpleAccessorNameNotation7.java
@@ -1,6 +1,6 @@
-package com.puppycrawl.tools.checkstyle.checks.coding;
+package com.github.sevntu.checkstyle.checks.coding;
 
-public interface InputSimpleAccesorNameNotation8
+public interface InputSimpleAccessorNameNotation7
 {
     String getSmth();
 }