Skip to content

Commit a3b6391

Browse files
author
Ben Romberg
committed
close #1: remove check on maven packaging, as availability of
classes-dir is sufficient
1 parent 80a98b9 commit a3b6391

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private String getPackageCycles(JDepend jdepend) {
6161
}
6262

6363
private boolean checkIsNecessary(MavenProject project, File classesDir) {
64-
return project.getPackaging().equalsIgnoreCase(MAVEN_JAR_PACKAGING) && classesDir.exists();
64+
return classesDir.exists();
6565
}
6666

6767
public String getCacheId() {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,17 @@ public void result_IsNotValid() {
6262

6363
@Test
6464
public void execute_checkNotNecessary_ClassesDirNotFound() throws Exception {
65+
jdependMock.setContainsCycles(true);
6566
helper.setTargetDir(temporaryFolder.newFolder());
6667
rule.execute(helper);
6768
}
6869

6970
@Test
7071
public void execute_checkNotNecessary_PackagingNotJar() throws Exception {
72+
jdependMock.setContainsCycles(true);
7173
helper.setPackaging(MAVEN_WAR_PACKAGING);
74+
expectedException.expect(EnforcerRuleException.class);
75+
expectedException.expectMessage(containsString("There are package cycles"));
7276
rule.execute(helper);
7377
}
7478

0 commit comments

Comments
 (0)