Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade to archunit 1.3.0 #805

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

chore: upgrade to archunit 1.3.0 #805

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
4d3c10e
upgrade to archunit 1.3.0
sullis Jul 7, 2024
eee2986
Merge branch 'main' into sean/archunit-1.3.0
sullis Jul 30, 2024
9cf732d
Merge branch 'main' into sean/archunit-1.3.0
sullis Aug 21, 2024
3846a1b
Merge branch 'main' into sean/archunit-1.3.0
sullis Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit</artifactId>
<version>0.23.0</version>
<version>1.3.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -486,4 +486,4 @@
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
</project>
</project>
12 changes: 9 additions & 3 deletions src/test/java/com/twilio/compliance/ComplianceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.*;
Expand All @@ -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<ImportOption> importOpts = buildImportOptions();
static final private JavaClasses twilioClasses = new ClassFileImporter(importOpts).importPackages("com.twilio");
static final private List<Class> resourceClasses = getResourceClasses(twilioClasses);
static final private List<Class> variantClasses = new ArrayList<Class>(); // classes that do not follow the generic template

private static List<ImportOption> buildImportOptions() {
List<ImportOption> options = new ArrayList<ImportOption>();
options.add(DO_NOT_INCLUDE_TESTS);
return options;
}

private static DescribedPredicate<JavaClass> areNotInVariantList() {
return new DescribedPredicate<JavaClass>("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());
}
};
Expand Down
Loading