Merge pull request #9 from Nordstrom/pr/track-suites

Pr/track suites

Author: sbabcoc

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.nordstrom.tools</groupId>
   <artifactId>junit-foundation</artifactId>
-  <version>3.2.2-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JUnit Foundation</name>
@@ -28,17 +28,19 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java-utils.version>1.3.3</java-utils.version>
-    <surefire-plugin.version>2.19.1</surefire-plugin.version>
+    <surefire-plugin.version>2.22.0</surefire-plugin.version>
     <compiler-plugin.version>3.6.0</compiler-plugin.version>
     <source-plugin.version>3.0.1</source-plugin.version>
     <javadoc-plugin.version>2.10.4</javadoc-plugin.version>
-    <settings.version>2.0.7</settings.version>
+    <settings.version>2.2.0</settings.version>
     <junit.version>4.12</junit.version>
-    <bytebuddy.version>1.7.9</bytebuddy.version>
+    <testng.version>6.10</testng.version>
+    <bytebuddy.version>1.8.13</bytebuddy.version>
     <logback.version>1.2.2</logback.version>
     <gpg-plugin.version>1.6</gpg-plugin.version>
     <staging-plugin.version>1.6.7</staging-plugin.version>
     <release-plugin.version>2.5.3</release-plugin.version>
+    <jar-plugin.version>3.0.0</jar-plugin.version>
     <skipSigning>true</skipSigning>
   </properties>
 
@@ -77,11 +79,21 @@
         <artifactId>junit</artifactId>
         <version>${junit.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.testng</groupId>
+        <artifactId>testng</artifactId>
+        <version>${testng.version}</version>
+      </dependency>
       <dependency>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>
         <version>${bytebuddy.version}</version>
       </dependency>
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy-agent</artifactId>
+        <version>${bytebuddy.version}</version>
+      </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
@@ -103,10 +115,20 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>
     </dependency>
+    <dependency>
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy-agent</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -160,6 +182,11 @@
           <artifactId>maven-release-plugin</artifactId>
           <version>${release-plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${jar-plugin.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -185,6 +212,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>-javaagent:src/test/resources/test-agent.jar</argLine>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -248,6 +278,19 @@
           <goals>deploy</goals>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Premain-Class>com.nordstrom.automation.junit.LifecycleHooks</Premain-Class>
+              <Can-Redefine-Classes>false</Can-Redefine-Classes>
+              <Can-Retransform-Classes>true</Can-Retransform-Classes>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

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

@@ -15,6 +15,11 @@
 
 import com.nordstrom.common.file.PathUtils;
 
+/**
+ * This is the base class for implementations of scenario-specific artifact collectors.
+ * 
+ * @param <T> scenario-specific artifact type
+ */
 public class ArtifactCollector<T extends ArtifactType> extends TestWatcher {
 
     private static final Map<Description, List<ArtifactCollector<? extends ArtifactType>>> watcherMap =