Skip to content

Improve ArchUnit class name test #2152

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

Merged
bitwiseman merged 2 commits into from
Oct 24, 2025
Merged

Improve ArchUnit class name test #2152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a3d5a0
Improve ArchUnit class name test
bitwiseman Oct 23, 2025
88eeb5a
Merge branch 'main' into archunit-class-name
bitwiseman Oct 24, 2025
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
13 changes: 5 additions & 8 deletions src/test/java/org/kohsuke/github/ArchTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import static com.tngtech.archunit.core.domain.JavaCall.Predicates.target;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.assignableTo;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.resideInAPackage;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.simpleNameContaining;
import static com.tngtech.archunit.core.domain.JavaClass.Predicates.type;
import static com.tngtech.archunit.core.domain.JavaMember.Predicates.declaredIn;
import static com.tngtech.archunit.core.domain.JavaModifier.STATIC;
Expand Down Expand Up @@ -90,8 +91,6 @@ public boolean test(T input) {
}
}

private static final JavaClasses apacheCommons = new ClassFileImporter().importPackages("org.apache.commons.lang3");

private static final JavaClasses classFiles = new ClassFileImporter()
.withImportOption(new ImportOption.DoNotIncludeTests())
.importPackages("org.kohsuke.github");
Expand Down Expand Up @@ -197,8 +196,6 @@ public static <T> DescribedPredicate<T> unless(DescribedPredicate<? super T> fir
return new UnlessPredicate(first, second);
}

private DescribedPredicate<JavaField> and;

/**
* Default constructor.
*/
Expand Down Expand Up @@ -227,12 +224,12 @@ public void testRequireFollowingNamingConvention() {
var notStaticFinalFields = DescribedPredicate.<JavaField>not(modifier(STATIC).and(modifier(STATIC)));
var notEnumOrStaticFinalFields = DescribedPredicate.<JavaField>and(not(enumConstants()), notStaticFinalFields);

final ArchRule instanceFieldsShouldNotBePublic = fields().that(notEnumOrStaticFinalFields)
.should(notHaveModifier(JavaModifier.PUBLIC))
final ArchRule instanceFieldsShouldNotBePublic = noFields().that(notEnumOrStaticFinalFields)
.should(haveModifier(JavaModifier.PUBLIC))
.because("This project does not allow public instance fields.");

final ArchRule instanceFieldsShouldFollowConvention = noFields().that(notEnumOrStaticFinalFields)
.should(haveNamesContainingUnless("_"))
.should(have(nameContaining("_")))
.because("This project follows standard java naming conventions for fields.");

@SuppressWarnings("AccessStaticViaInstance")
Expand All @@ -253,7 +250,7 @@ public void testRequireFollowingNamingConvention() {
declaredIn(GHRelease.class).and(name("getPublished_at"))))
.because(reason);

final ArchRule classesNotFollowingConvention = noClasses().should(haveNamesContainingUnless("_"))
final ArchRule classesNotFollowingConvention = noClasses().should(have(simpleNameContaining("_")))
.because(reason);

enumsShouldFollowConvention.check(classFiles);
Expand Down