Skip to content
This repository has been archived by the owner on Jan 26, 2021. It is now read-only.

#10 Fix build issues #11

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

#10 Fix build issues #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2b1795
#10 Replace hard-coded dependency versions with pom version references
Jan 29, 2016
1536a9a
#10 Fix test to check for the specific package names, not the string …
Jan 29, 2016
11d445d
#10 Fix test to account for random ordering of classes
Jan 29, 2016
cba54d0
#10 Fix test to ignore param type ordering
Jan 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions kawala-common-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-common</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-converters</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-testing</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions kawala-converters/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-common</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-guice</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Expand Down
6 changes: 3 additions & 3 deletions kawala-converters/src/test/java/com/kaching/platform/converters/InstantiatorErrorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import static com.kaching.platform.converters.InstantiatorErrors.noSuchField;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.util.List;
Expand Down Expand Up @@ -95,8 +96,7 @@ public void addinTwiceTheSameMessageDoesNotDuplicateTheError() {
@Test
public void cannotSpecifyDefaultValueAndConstant() throws Exception {
check(
"cannot specify both a default constant and a default value " +
"@Optional(constant=FOO, value=4)",
"cannot specify both a default constant and a default value ",
InstantiatorErrors.cannotSpecifyDefaultValueAndConstant(
new Errors(), inspectMeCannotSpecifyDefaultValueAndConstant(8)));
}
Expand All @@ -122,7 +122,7 @@ private void check(String expected, Errors errors) {
errors.throwIfHasErrors();
fail();
} catch (RuntimeException e) {
assertEquals("1) " + expected, e.getMessage());
assertTrue(e.getMessage(), e.getMessage().startsWith("1) " + expected));
}
}

Expand Down
4 changes: 2 additions & 2 deletions kawala-guice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-common</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-testing</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions kawala-hibernate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-common</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-converters</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Expand Down
2 changes: 1 addition & 1 deletion kawala-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>com.kaching.platform</groupId>
<artifactId>kawala-common</artifactId>
<version>0.1.6-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jdepend</groupId>
Expand Down
14 changes: 9 additions & 5 deletions ...la-testing/src/test/java/com/kaching/platform/testing/CyclicDependencyTestRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.util.Set;

import jdepend.framework.JavaPackage;
import org.junit.Test;

import com.kaching.platform.testing.CyclicDependencyTestRunner.Packages;
Expand Down Expand Up @@ -76,11 +78,13 @@ public void testBasePackage_Cycles() throws IOException {
Result result = runner.getTestResults(BasePackage.class.getAnnotation(Packages.class));
assertTrue(result.numClasses > 0);
assertEquals(1, result.getUniqueCycles().size());
assertEquals("Strongly connected components: {\n" +
"[com.kaching.platform.testing.testexamples.a,\n"
+ " com.kaching.platform.testing.testexamples.b,\n"
+ " com.kaching.platform.testing.testexamples.c]\n"
+ "}", result.toString());

Set<JavaPackage> packages = result.getUniqueCycles().iterator().next();

assertEquals(3, packages.size());
assertTrue(packages.contains(new JavaPackage("com.kaching.platform.testing.testexamples.a")));
assertTrue(packages.contains(new JavaPackage("com.kaching.platform.testing.testexamples.b")));
assertTrue(packages.contains(new JavaPackage("com.kaching.platform.testing.testexamples.c")));
}

}
31 changes: 27 additions & 4 deletions kawala-testing/src/test/java/com/kaching/platform/testing/DependencyTestRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import static com.google.common.collect.Lists.newArrayList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import jdepend.framework.JavaClass;
import jdepend.framework.JavaPackage;
Expand Down Expand Up @@ -183,11 +184,33 @@ public void violationToString() {
classB.addImportedPackage(violation.efferent);
violation.javaPackage.addClass(classB);

violation.javaPackage.addClass(new JavaClass("a.BigC"));
JavaClass classC = new JavaClass("a.BigC");
violation.javaPackage.addClass(classC);

String message = violation.toString();

String packageName = violation.javaPackage.getName();

assertTrue(message, message.contains("package a cannot depend on package b"));
assertTrue(
message,
message.contains(
classA.getName().substring(packageName.length() + 1)
)
);
assertTrue(
message,
message.contains(
classB.getName().substring(packageName.length() + 1)
)
);
assertFalse(
message,
message.contains(
classC.getName().substring(packageName.length() + 1)
)
);

assertEquals(
"package a cannot depend on package b (classes BigA, BigB)",
violation.toString());
}

@Test
Expand Down