fix description of targetOwner predicate

targetOwner was producing the same message as target() eg. "access target that is annotated with" instead of "access target with owner that is annotated with"

Signed-off-by: John Burns <wakingrufus@gmail.com>

Author: wakingrufus

archunit/src/main/java/com/tngtech/archunit/core/domain/JavaAccess.java

@@ -15,9 +15,6 @@
  */
 package com.tngtech.archunit.core.domain;
 
-import java.util.Collections;
-import java.util.Set;
-
 import com.tngtech.archunit.PublicAPI;
 import com.tngtech.archunit.base.ChainableFunction;
 import com.tngtech.archunit.base.DescribedPredicate;
@@ -29,6 +26,9 @@
 import com.tngtech.archunit.core.domain.properties.HasSourceCodeLocation;
 import com.tngtech.archunit.core.importer.DomainBuilders.JavaAccessBuilder;
 
+import java.util.Collections;
+import java.util.Set;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.tngtech.archunit.PublicAPI.Usage.ACCESS;
@@ -112,7 +112,7 @@ public <T> Set<T> convertTo(Class<T> type) {
     @Override
     public String toString() {
         return getClass().getSimpleName() +
-                "{origin=" + origin + ", target=" + target + ", lineNumber=" + getLineNumber() + additionalToStringFields() + '}';
+               "{origin=" + origin + ", target=" + target + ", lineNumber=" + getLineNumber() + additionalToStringFields() + '}';
     }
 
     String additionalToStringFields() {
@@ -168,12 +168,15 @@ public static DescribedPredicate<JavaAccess<?>> originOwnerEqualsTargetOwner() {
 
         @PublicAPI(usage = ACCESS)
         public static DescribedPredicate<JavaAccess<?>> targetOwner(DescribedPredicate<? super JavaClass> predicate) {
-            return target(Get.<JavaClass>owner().is(predicate));
+            DescribedPredicate<AccessTarget> ownerPredicate = predicate.onResultOf(HasOwner.Functions.Get.owner());
+            return target(ownerPredicate.as("with owner %s", predicate.getDescription()));
         }
 
         @PublicAPI(usage = ACCESS)
         public static DescribedPredicate<JavaAccess<?>> target(DescribedPredicate<? super AccessTarget> predicate) {
-            return new TargetPredicate<>(predicate);
+            DescribedPredicate<JavaAccess<?>> targetPredicate =
+                    predicate.onResultOf(JavaAccess.Functions.Get.target());
+            return targetPredicate.as("target %s", predicate.getDescription());
         }
 
         private static class OriginOwnerEqualsTargetOwnerPredicate extends DescribedPredicate<JavaAccess<?>> {

archunit/src/test/java/com/tngtech/archunit/core/domain/JavaAccessTest.java

@@ -60,6 +60,32 @@ public void origin_predicate() {
         assertThat(predicate).rejects(anyAccess());
     }
 
+    @Test
+    public void target_predicate() {
+        DescribedPredicate<JavaAccess<?>> predicate =
+                JavaAccess.Predicates.target(DescribedPredicate.<AccessTarget>alwaysTrue().as("some text"));
+
+        assertThat(predicate)
+                .hasDescription("target some text")
+                .accepts(anyAccess());
+
+        predicate = JavaAccess.Predicates.target(alwaysFalse());
+        assertThat(predicate).rejects(anyAccess());
+    }
+
+    @Test
+    public void targetOwner_predicate() {
+        DescribedPredicate<JavaAccess<?>> predicate =
+                JavaAccess.Predicates.targetOwner(DescribedPredicate.<JavaClass>alwaysTrue().as("some text"));
+
+        assertThat(predicate)
+                .hasDescription("target with owner some text")
+                .accepts(anyAccess());
+
+        predicate = JavaAccess.Predicates.targetOwner(alwaysFalse());
+        assertThat(predicate).rejects(anyAccess());
+    }
+
     @Test
     public void convertTo() {
         TestJavaAccess access = javaAccessFrom(importClassWithContext(String.class), "toString")