added support for junit5

- made the value of @name annotation optional, it defaults to "" 
- added collaborator provider provided instances to the DefaultServiceInstance
- refactored the location of parameter resolvers
- added the ability to resolve @real and @name parameters
- added more test cases
- fixed @systemtest annotation (missing SystemTestExtension)

Author: saden1

modules/api/src/main/java/org/testifyproject/annotation/Name.java

@@ -40,5 +40,5 @@
      *
      * @return the name
      */
-    String value();
+    String value() default "";
 }

modules/api/src/test/resources/org/testifyproject/fixture/DiscoverableExplicitService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Testify Project.
+ * Copyright 2016-2018 Testify Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
  * @author saden
  */
 @Discoverable(DiscoverableExplicitContract.class)
-public class DiscoverableExplicitService implements DiscoverableContract, DiscoverableExplicitContract {
+public class DiscoverableExplicitService 
+        implements DiscoverableContract, DiscoverableExplicitContract {
 
     @Override
     public String sayHello() {

modules/api/src/test/resources/org/testifyproject/fixture/DiscoverableMultiContractService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Testify Project.
+ * Copyright 2016-2018 Testify Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
  * @author saden
  */
 @Discoverable
-public class DiscoverableMultiContractService implements DiscoverableMultiContract1, DiscoverableMultiContract2 {
+public class DiscoverableMultiContractService 
+        implements DiscoverableMultiContract1, DiscoverableMultiContract2 {
 
     @Override
     public String sayHello() {

modules/core/src/main/java/org/testifyproject/core/DefaultServiceInstance.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Testify Project.
+ * Copyright 2016-2018 Testify Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,8 +87,14 @@ public <T> T getService(Type type, Annotation... qualifiers) {
             }
 
         } else if (Name.class.equals(qualifiers[0].annotationType())) {
-            Name name = (Name) qualifiers[0];
-            instance = serviceContext.get(ServiceKey.of(type, name.value()));
+            Name annotation = (Name) qualifiers[0];
+            String name = annotation.value();
+
+            if ("".equals(name)) {
+                instance = serviceContext.get(ServiceKey.of(type));
+            } else {
+                instance = serviceContext.get(ServiceKey.of(type, name));
+            }
         }
 
         return (T) instance;

modules/core/src/main/java/org/testifyproject/core/DefaultServiceProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 Testify Project.
+ * Copyright 2016-2018 Testify Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,16 @@
 package org.testifyproject.core;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.testifyproject.ServiceInstance;
 import org.testifyproject.ServiceProvider;
 import org.testifyproject.TestContext;
+import org.testifyproject.TestDescriptor;
 import org.testifyproject.annotation.Discoverable;
+import org.testifyproject.annotation.Name;
+import org.testifyproject.core.extension.FindCollaborators;
 import org.testifyproject.core.util.ServiceLocatorUtil;
 import org.testifyproject.extension.InstanceProvider;
 import org.testifyproject.extension.annotation.UnitCategory;
@@ -45,7 +49,6 @@ public Map<ServiceKey, Object> create(TestContext testContext) {
     @Override
     public ServiceInstance configure(TestContext testContext,
             Map<ServiceKey, Object> serviceContext) {
-
         //add instances
         ServiceLocatorUtil.INSTANCE
                 .findAllWithFilter(InstanceProvider.class)
@@ -58,6 +61,29 @@ public ServiceInstance configure(TestContext testContext,
                     );
                 });
 
+        Object testInstance = testContext.getTestInstance();
+        TestDescriptor testDescriptor = testContext.getTestDescriptor();
+
+        testDescriptor.getCollaboratorProviders().stream().forEach(methodDescriptor -> {
+            new FindCollaborators(testDescriptor, methodDescriptor, testInstance)
+                    .execute()
+                    .filter(Objects::nonNull)
+                    .ifPresent(value -> {
+                        String name = methodDescriptor.getAnnotation(Name.class)
+                                .map(Name::value)
+                                .filter(p -> !p.isEmpty())
+                                .orElseGet(methodDescriptor::getDeclaredName);
+
+                        Class<?> contract = value.getClass();
+                        ServiceKey contractAndNameKey = ServiceKey.of(contract, name);
+                        ServiceKey contractKey = ServiceKey.of(contract, name);
+
+                        serviceContext.computeIfAbsent(contractAndNameKey, t -> value);
+                        serviceContext.computeIfAbsent(contractKey, t -> value);
+
+                    });
+        });
+
         return new DefaultServiceInstance(serviceContext);
     }
 

modules/core/src/main/java/org/testifyproject/core/extension/FindCollaborators.java

@@ -23,7 +23,7 @@
 import org.testifyproject.extension.Query;
 
 /**
- * TODO.
+ * A query to find collaborators for a method.
  *
  * @author saden
  */
@@ -43,12 +43,14 @@ public FindCollaborators(TestDescriptor testDescriptor,
 
     @Override
     public Optional<Object> execute() {
+        //get the collaborators for the method
         Object[] collaborators = new GetCollaborators(
                 testDescriptor,
                 methodDescriptor,
                 testInstance
         ).execute();
 
+        //invoke the method and get the acutal collaborator
         return methodDescriptor.getInstance()
                 .map(instance -> {
                     return methodDescriptor.invoke(instance, convertToArray(collaborators));

modules/core/src/main/java/org/testifyproject/core/extension/GetCollaborator.java

@@ -34,7 +34,8 @@ public class GetCollaborator implements Operation<Object> {
     private final Parameter parameter;
     private final Object testInstance;
 
-    public GetCollaborator(TestDescriptor testDescriptor, Parameter parameter,
+    public GetCollaborator(TestDescriptor testDescriptor,
+            Parameter parameter,
             Object testInstance) {
         this.testDescriptor = testDescriptor;
         this.parameter = parameter;
@@ -52,10 +53,10 @@ public Object execute() {
                 parameter.getType().getSimpleName(),
                 parameter.getName());
 
-        return foundMethodDescriptor.map(parameterMethodDescriptor -> {
+        return foundMethodDescriptor.map(methodDescriptor -> {
             FindCollaborators query = new FindCollaborators(
                     testDescriptor,
-                    parameterMethodDescriptor,
+                    methodDescriptor,
                     testInstance);
             return query.execute().orElse(null);
         }).orElse(null);

modules/core/src/main/java/org/testifyproject/core/extension/GetCollaborators.java

@@ -40,11 +40,9 @@ public GetCollaborators(TestDescriptor testDescriptor,
 
     @Override
     public Object[] execute() {
-        return methodDescriptor.getParameters().stream()
-                .map(parameter -> {
-                    return new GetCollaborator(testDescriptor, parameter, testInstance)
-                            .execute();
-                }).toArray();
+        return methodDescriptor.getParameters().stream().map(parameter -> {
+            return new GetCollaborator(testDescriptor, parameter, testInstance).execute();
+        }).toArray();
     }
 
 }

modules/core/src/main/java/org/testifyproject/core/extension/GetMetaAnnotations.java

@@ -24,7 +24,9 @@
 import org.testifyproject.extension.Operation;
 
 /**
- * TODO.
+ * Get annotations with meta annotations for a parameter. This operation can discover
+ * annotations on a parameter with the specified meta annotations. This is useful for
+ * discovering custom qualifiers.
  *
  * @author saden
  */
@@ -41,7 +43,6 @@ public GetMetaAnnotations(Parameter parameter,
 
     @Override
     public Annotation[] execute() {
-        //XXX: dont execute on this stream in parallel
         return Stream.of(metaAnnotationTypes).parallel()
                 .flatMap(Collection::parallelStream)
                 .distinct()

modules/core/src/main/java/org/testifyproject/core/util/logger/SimpleLoggerConfiguration.java

@@ -121,18 +121,16 @@ void init() {
     }
 
     private void loadProperties() {
-        // Add props from the resource simplelogger.properties
-        InputStream in = AccessController.doPrivileged(new PrivilegedAction<InputStream>() {
-            @Override
-            public InputStream run() {
-                ClassLoader threadCL = Thread.currentThread().getContextClassLoader();
-                if (threadCL != null) {
-                    return threadCL.getResourceAsStream(CONFIGURATION_FILE);
-                } else {
-                    return ClassLoader.getSystemResourceAsStream(CONFIGURATION_FILE);
-                }
+        // add props from the resource simplelogger.properties
+        InputStream in = AccessController.doPrivileged((PrivilegedAction<InputStream>) () -> {
+            ClassLoader threadCL = Thread.currentThread().getContextClassLoader();
+            if (threadCL != null) {
+                return threadCL.getResourceAsStream(CONFIGURATION_FILE);
+            } else {
+                return ClassLoader.getSystemResourceAsStream(CONFIGURATION_FILE);
             }
         });
+
         if (null != in) {
             try {
                 properties.load(in);