performance improvements and integration-test for fitnesse

Author: Ben Romberg

pom.xml

@@ -85,7 +85,7 @@
 				<version>2.14.1</version>
 				<configuration>
 					<excludes>
-						<exclude>junit-target/**</exclude>
+						<exclude>*-target/**</exclude>
 					</excludes>
 				</configuration>
 			</plugin>

src/main/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRule.java

@@ -46,7 +46,8 @@ private void executePackageCycleCheck(File classesDir) throws IOException, Enfor
 		jdepend.addDirectory(classesDir.getAbsolutePath());
 		jdepend.analyze();
 		if (jdepend.containsCycles()) {
-			throw new EnforcerRuleException("There are package cycles:" + getPackageCycles(jdepend));
+			String packageCycles = getPackageCycles(jdepend);
+			throw new EnforcerRuleException("There are package cycles:" + packageCycles);
 		}
 	}
 

src/main/java/de/andrena/tools/nopackagecycles/PackageCycleCollector.java

@@ -29,6 +29,7 @@ private Set<JavaPackage> collectAllDependencyCycles(JavaPackage javaPackage, Lis
 					visitedPackages));
 			if (dependencyPackageCycle.contains(javaPackage)) {
 				allCycles.addAll(dependencyPackageCycle);
+				visitedPackages.addAll(dependencyPackageCycle);
 			}
 		}
 		return allCycles;

src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleIntegrationTest.java

@@ -5,6 +5,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 import org.apache.commons.io.IOUtils;
@@ -17,9 +18,10 @@
 import de.andrena.tools.nopackagecycles.mock.EnforcerRuleHelperMock;
 
 public class NoPackageCyclesRuleIntegrationTest {
-	private static final URL TARGET_FOLDER = Thread.currentThread().getContextClassLoader().getResource("junit-target");
-	private static final URL EXPECTED_OUTPUT = Thread.currentThread().getContextClassLoader()
-			.getResource("junit-expected-output.txt");
+	private static final URL FITNESSE_TARGET_FOLDER = getResource("fitnesse-target");
+	private static final URL FITNESSE_EXPECTED_OUTPUT = getResource("fitnesse-expected-output.txt");
+	private static final URL JUNIT_TARGET_FOLDER = getResource("junit-target");
+	private static final URL JUNIT_EXPECTED_OUTPUT = getResource("junit-expected-output.txt");
 
 	private NoPackageCyclesRule rule;
 	private EnforcerRuleHelperMock helper;
@@ -31,20 +33,34 @@ public class NoPackageCyclesRuleIntegrationTest {
 	public void setUp() throws Exception {
 		rule = new NoPackageCyclesRule();
 		helper = new EnforcerRuleHelperMock();
-		helper.setTargetDir(new File(TARGET_FOLDER.toURI()));
 	}
 
 	@Test
-	public void integrationTest() throws Exception {
+	public void fitnesseIntegrationTest() throws Exception {
+		assertPackageCycles(FITNESSE_TARGET_FOLDER, FITNESSE_EXPECTED_OUTPUT);
+	}
+
+	@Test
+	public void junitIntegrationTest() throws Exception {
+		assertPackageCycles(JUNIT_TARGET_FOLDER, JUNIT_EXPECTED_OUTPUT);
+	}
+
+	private void assertPackageCycles(URL targetFolder, URL expectedOutput) throws URISyntaxException, IOException {
+		helper.setTargetDir(new File(targetFolder.toURI()));
 		try {
 			rule.execute(helper);
 			fail("expected EnforcerRuleException");
 		} catch (EnforcerRuleException e) {
-			assertEquals(getExpectedOutput(), e.getMessage());
+			// using assertEquals to get a nice comparison editor in eclipse
+			assertEquals(getExpectedOutput(expectedOutput), e.getMessage());
 		}
 	}
 
-	private String getExpectedOutput() throws IOException {
-		return IOUtils.toString(EXPECTED_OUTPUT.openStream()).replaceAll("\r", "");
+	private String getExpectedOutput(URL expectedOutput) throws IOException {
+		return IOUtils.toString(expectedOutput.openStream()).replaceAll("\r", "");
+	}
+
+	private static URL getResource(String path) {
+		return Thread.currentThread().getContextClassLoader().getResource(path);
 	}
 }

src/test/resources/fitnesse-expected-output.txt

@@ -0,0 +1 @@
+v20130528