must start beClass and notBeClass

Issue: TNG#60 Signed-off-by: Michael Sherman <msherman32@gatech.edu>
msherman32 · Jun 19, 2018 · 60899d5 · 60899d5
1 parent 55c3108
commit 60899d5
Show file tree

Hide file tree

Showing 3 changed files with 389 additions and 2,054 deletions.
diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/conditions/ArchConditions.java b/archunit/src/main/java/com/tngtech/archunit/lang/conditions/ArchConditions.java
@@ -467,7 +467,7 @@ private static ArchCondition<JavaClass> residesConditionForPredicate(final Descr
             @Override
             public void check(JavaClass item, ConditionEvents events) {
                 boolean satisfied = resideInAPackage.apply(item);
-                String message = String.format("Class %s %s %s in %s",
+                String message = String.format("class %s %s %s in %s",
                         item.getName(),
                         satisfied ? "does" : "doesn't",
                         resideInAPackage.getDescription(),

diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java
@@ -1153,7 +1153,7 @@ static String locationPattern(Class<?> clazz) {
         return String.format("\\(%s.java:0\\)", quote(clazz.getSimpleName()));
     }
 
-    private String singleLineFailureReportOf(EvaluationResult result) {
+    static String singleLineFailureReportOf(EvaluationResult result) {
         return result.getFailureReport().toString().replaceAll("\\r?\\n", FAILURE_REPORT_NEWLINE_MARKER);
     }
 
@@ -1166,7 +1166,7 @@ public boolean apply(JavaAnnotation input) {
         };
     }
 
-    private static String containsPartOfRegex(String fullString) {
+    static String containsPartOfRegex(String fullString) {
         return String.format(".*%s.*", fullString.substring(1, fullString.length() - 1));
     }
 
@@ -1194,7 +1194,7 @@ private static DescribedPredicate<JavaCall<?>> callTargetIs(Class<?> type) {
         return JavaCall.Predicates.target(owner(type(type))).as("target is " + type.getSimpleName());
     }
 
-    private static DescribedPredicate<JavaAccess<?>> accessTargetIs(Class<?> type) {
+    static DescribedPredicate<JavaAccess<?>> accessTargetIs(Class<?> type) {
         return JavaAccess.Predicates.target(owner(type(type))).as("target is " + type.getSimpleName());
     }
 
@@ -1233,7 +1233,7 @@ private void checkTestStillValid(String thePackage,
         }
     }
 
-    private Pattern accessesFieldRegex(Class<?> origin, String accessType, Class<?> targetClass, String fieldName) {
+    static Pattern accessesFieldRegex(Class<?> origin, String accessType, Class<?> targetClass, String fieldName) {
         String originAccesses = String.format("%s[^%s]* %s", quote(origin.getName()), FAILURE_REPORT_NEWLINE_MARKER, accessType);
         String target = String.format("[^%s]*%s\\.%s", FAILURE_REPORT_NEWLINE_MARKER, quote(targetClass.getName()), fieldName);
         return Pattern.compile(String.format(".*%s field %s.*", originAccesses, target));