Merge pull request #37 from Nordstrom/pr/revise-javaagent-definition

Revise 'javaagent' definition; upgrade to latest Java Utils (1.8.0)

Author: sbabcoc

README.md

@@ -184,23 +184,21 @@ repositories {
     mavenCentral()
     ...
 }
-configurations {
+dependencies {
     ...
-    junitAgent
+    compile 'com.nordstrom.tools:junit-foundation:9.0.3'
+}
+ext {
+    junitFoundation = configurations.compile.resolvedConfiguration.resolvedArtifacts.find { it.name == 'junit-foundation' }
 }
 test.doFirst {
-    jvmArgs "-javaagent:${configurations.junitAgent.files.iterator().next()}"
+    jvmArgs "-javaagent:${junitFoundation.file}"
 }
 test {
 //  debug true
     // not required, but definitely useful
     testLogging.showStandardStreams = true
 }
-dependencies {
-    ...
-    compile 'com.nordstrom.tools:junit-foundation:9.0.3'
-    junitAgent 'com.nordstrom.tools:junit-foundation:9.0.3'
-}
 ```
 
 #### IDE Configuration for JUnit Foundation

pom.xml

@@ -29,7 +29,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <java-utils.version>1.7.3</java-utils.version>
+    <java-utils.version>1.8.0</java-utils.version>
     <surefire-plugin.version>2.22.0</surefire-plugin.version>
     <source-plugin.version>3.0.1</source-plugin.version>
     <javadoc-plugin.version>2.10.4</javadoc-plugin.version>

src/main/java/com/nordstrom/automation/junit/ArtifactParams.java

@@ -1,16 +1,16 @@
 package com.nordstrom.automation.junit;
 
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
 import org.junit.runner.Description;
 
+import com.nordstrom.common.params.Params;
+
 /**
  * This interface enables implementers to provide method-related parameters to the artifact capture framework.
  */
-public interface ArtifactParams {
+public interface ArtifactParams extends Params {
 
     /**
      * Get the JUnit method description object for the current test class instance.
@@ -19,30 +19,14 @@ public interface ArtifactParams {
      */
     Description getDescription();
 
-    /**
-     * Get the parameters associated with this test class instance.
-     * 
-     * @return optional map of named test class parameters
-     */
-    default Optional<Map<String, Object>> getParameters() {
-        return Optional.empty();
-    }
-    
     /**
      * Assemble a map of test class instance parameters.
      * 
      * @param params array of {@link Param} objects; may be {@code null} or empty
      * @return optional map of parameters (may be empty)
      */
     public static Optional<Map<String, Object>> mapOf(Param... params) {
-        if ((params == null) || (params.length == 0)) {
-            return Optional.empty();
-        }
-        Map<String, Object> paramMap = new HashMap<>();
-        for (Param param : params) {
-            paramMap.put(param.key, param.val);
-        }
-        return Optional.of(Collections.unmodifiableMap(paramMap));
+        return Params.mapOf(params);
     }
 
     /**
@@ -53,30 +37,6 @@ public static Optional<Map<String, Object>> mapOf(Param... params) {
      * @return test parameter object
      */
     public static Param param(String key, Object val) {
-        return new Param(key, val);
+        return Params.param(key, val);
     }
-    
-    /**
-     * This class defines a test parameter object.
-     */
-    static class Param {
-        
-        private final String key;
-        private final Object val;
-        
-        /**
-         * Constructor for test parameter object.
-         * 
-         * @param key test parameter key
-         * @param val test parameter value
-         */
-        public Param(String key, Object val) {
-            if ((key == null) || key.isEmpty()) {
-                throw new IllegalArgumentException("[key] must be a non-empty string");
-            }
-            this.key = key;
-            this.val = val;
-        }
-    }
-
 }