diff --git a/pom.xml b/pom.xml index d6bded8b8..5aeecc83d 100644 --- a/pom.xml +++ b/pom.xml @@ -278,7 +278,7 @@ com.tngtech.archunit archunit - 0.23.0 + 1.3.0 test @@ -486,4 +486,4 @@ oss-parent 7 - \ No newline at end of file + diff --git a/src/test/java/com/twilio/compliance/ComplianceTest.java b/src/test/java/com/twilio/compliance/ComplianceTest.java index 7b1372706..0ee8995c1 100644 --- a/src/test/java/com/twilio/compliance/ComplianceTest.java +++ b/src/test/java/com/twilio/compliance/ComplianceTest.java @@ -6,7 +6,6 @@ import com.tngtech.archunit.core.domain.JavaModifier; import com.tngtech.archunit.core.importer.ClassFileImporter; import com.tngtech.archunit.core.importer.ImportOption; -import com.tngtech.archunit.core.importer.ImportOptions; import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.syntax.elements.GivenClasses; import com.tngtech.archunit.lang.syntax.elements.GivenClassesConjunction; @@ -15,6 +14,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.resideInAPackage; +import static com.tngtech.archunit.core.importer.ImportOption.Predefined.DO_NOT_INCLUDE_TESTS; import static com.tngtech.archunit.lang.conditions.ArchConditions.dependOnClassesThat; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; import static com.tngtech.archunit.library.GeneralCodingRules.*; @@ -29,15 +29,21 @@ import java.util.stream.Collectors; public class ComplianceTest { - static final private ImportOptions importOpts = new ImportOptions().with(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS); + static final private List importOpts = buildImportOptions(); static final private JavaClasses twilioClasses = new ClassFileImporter(importOpts).importPackages("com.twilio"); static final private List resourceClasses = getResourceClasses(twilioClasses); static final private List variantClasses = new ArrayList(); // classes that do not follow the generic template + private static List buildImportOptions() { + List options = new ArrayList(); + options.add(DO_NOT_INCLUDE_TESTS); + return options; + } + private static DescribedPredicate areNotInVariantList() { return new DescribedPredicate("classes that follow the same template pattern") { @Override - public boolean apply(final JavaClass input) { + public boolean test(final JavaClass input) { return !variantClasses.contains(input.getName()); } };