Merge 83c1b3a into fbab1b4

sevntu-checkstyle · Sep 3, 2014 · 66a2981 · 66a2981
2 parents fbab1b4 + 83c1b3a
commit 66a2981
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 14 deletions.
diff --git a/sevntu-checks/pom.xml b/sevntu-checks/pom.xml
@@ -45,6 +45,26 @@
 	    <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/InputForbidCertainImportsDefaultPackageWithoutImports.java</source>
+            <source>sevntu-checks/src/test/resources/com/github/sevntu/checkstyle/checks/coding/InputForbidsCertainImports.java</source>
+          </sources>
+        </configuration>
+        </execution>
+       </executions>
+    </plugin>
       </plugins>
     </build>
 

diff --git a/...c/test/java/com/github/sevntu/checkstyle/checks/coding/ForbidCertainImportsCheckTest.java b/...c/test/java/com/github/sevntu/checkstyle/checks/coding/ForbidCertainImportsCheckTest.java
@@ -39,14 +39,14 @@ public void testNormalWork() throws Exception
     {
         String importRegexp = ".+\\.api\\..+";
 
-        checkConfig.addAttribute("packageNameRegexp", ".+\\.old\\..+");
+        checkConfig.addAttribute("packageNameRegexp", ".+\\.sevntu\\..+");
         checkConfig.addAttribute("forbiddenImportsRegexp", importRegexp);
         checkConfig.addAttribute("forbiddenImportsExcludesRegexp", "");
 
         String[] expected = {
-        	"3: " + getCheckMessage(MSG_KEY, importRegexp, "com.puppycrawl.tools.checkstyle.api.Check"),
-        	"9: " + getCheckMessage(MSG_KEY, importRegexp, "com.puppycrawl.tools.checkstyle.api.Check"),
-        	"21: " + getCheckMessage(MSG_KEY, importRegexp, "com.smth.tools.checkstyle.api.Smth"),
+        	"3: " + getCheckMessage(MSG_KEY, importRegexp, "com.puppycrawl.tools.checkstyle.api.AutomaticBean"),
+        	"9: " + getCheckMessage(MSG_KEY, importRegexp, "com.puppycrawl.tools.checkstyle.api.AutomaticBean"),
+        	"21: " + getCheckMessage(MSG_KEY, importRegexp, "com.puppycrawl.tools.checkstyle.api.AutomaticBean"),
         };
 
         verify(checkConfig, getPath("InputForbidsCertainImports.java"), expected);
@@ -57,13 +57,11 @@ public void testNormalWorkWithExcludes() throws Exception
 	{
 		String importRegexp = ".+\\.api\\..+";
 
-		checkConfig.addAttribute("packageNameRegexp", ".+\\.old\\..+");
+		checkConfig.addAttribute("packageNameRegexp", ".+\\.sevntu\\..+");
 		checkConfig.addAttribute("forbiddenImportsRegexp", importRegexp);
 		checkConfig.addAttribute("forbiddenImportsExcludesRegexp", "com.puppycrawl.+");
 
-		String[] expected = {
-			"21: " + getCheckMessage(MSG_KEY, importRegexp, "com.smth.tools.checkstyle.api.Smth"),
-		};
+		String[] expected = {};
 
 		verify(checkConfig, getPath("InputForbidsCertainImports.java"), expected);
 	}

diff --git a/...test/resources/com/github/sevntu/checkstyle/checks/coding/InputForbidsCertainImports.java b/...test/resources/com/github/sevntu/checkstyle/checks/coding/InputForbidsCertainImports.java
@@ -1,24 +1,30 @@
-package coding.rocket.old.generation;
+package com.github.sevntu.checkstyle.checks.coding;
 
-import com.puppycrawl.tools.checkstyle.api.Check; // forbidden
+import com.puppycrawl.tools.checkstyle.api.AutomaticBean; // forbidden
 import java.io.File;
 import org.junit.Test;
-import File;
+
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 
-import com.puppycrawl.tools.checkstyle.api.Check; // forbidden!
+import com.puppycrawl.tools.checkstyle.api.AutomaticBean; // forbidden!
 
 /**
  * @author <a href="mailto:Daniil.Yaroslavtsev@gmail.com"> Daniil
  *         Yaroslavtsev</a>
  */
 public class InputForbidsCertainImports extends Check
 {
-    @Override
+
     public int a()
     {
+
+        AutomaticBean smth = new com.puppycrawl.tools.checkstyle.api.AutomaticBean(); // forbidden!
         return 5;
-        Smth smth = new com.smth.tools.checkstyle.api.Smth(); // forbidden!
     }
 
+	public int[] getDefaultTokens()
+	{
+		return null;
+	}
+
 }