From bea95010ae90a0f86940422a302fb188e9b580ca Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 22 Jun 2018 15:16:30 +0200 Subject: [PATCH] #2 - Fixes and improves the Dependency test. Now considers the new packages appropriately as well. consideres the `repository` package to be part of the sub-module `repository.reactive`. --- .../data/jdbc/degraph/DependencyTests.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java b/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java index 97a3cefa..4e6a4a01 100644 --- a/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java +++ b/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java @@ -19,9 +19,9 @@ import static de.schauderhaft.degraph.check.JCheck.*; import static org.junit.Assert.*; import de.schauderhaft.degraph.check.JCheck; +import de.schauderhaft.degraph.configuration.NamedPattern; import scala.runtime.AbstractFunction1; -import org.junit.Ignore; import org.junit.Test; /** @@ -38,13 +38,14 @@ public class DependencyTests { classpath() // .noJars() // .including("org.springframework.data.jdbc.**") // + .including("org.springframework.data.relational.**") // + .including("org.springframework.data.r2dbc.**") // .filterClasspath("*target/classes") // exclude test code - .printOnFailure("degraph.graphml"), + .withSlicing("modules", "org.springframework.data.(*).**").printOnFailure("degraph.graphml"), JCheck.violationFree()); } @Test // DATAJDBC-220 - @Ignore("I don't understand why this fails after adding reactive repos - mp911de") public void acrossModules() { assertThat( // @@ -60,8 +61,11 @@ public class DependencyTests { }) // exclude test code .withSlicing("sub-modules", // sub-modules are defined by any of the following pattern. "org.springframework.data.jdbc.(**).*", // + "org.springframework.data.relational.(**).*", // + new NamedPattern("org.springframework.data.r2dbc.**", "repository.reactive"), // "org.springframework.data.(**).*") // .printTo("degraph-across-modules.graphml"), // writes a graphml to this location JCheck.violationFree()); } + }