Merge pull request #46 from Nordstrom/pr/add-tool-chain

Add tool chain to use Java 7 for compilation; fix global timeout impl

Author: sbabcoc

pom.xml

@@ -29,16 +29,17 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
-    <java-utils.version>1.9.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>
-    <settings.version>2.3.0</settings.version>
+    <java-utils.version>1.9.1</java-utils.version>
+    <settings.version>2.3.1</settings.version>
     <junit.version>4.12</junit.version>
     <testng.version>6.10</testng.version>
     <bytebuddy.version>1.9.5</bytebuddy.version>
     <logback.version>1.2.2</logback.version>
-    <guava.version>23.5-jre</guava.version>
+    <guava.version>19.0</guava.version>
+    <toolchains-plugin.version>1.1</toolchains-plugin.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>
     <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>
@@ -149,6 +150,11 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-toolchains-plugin</artifactId>
+          <version>${toolchains-plugin.version}</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -184,10 +190,53 @@
           <artifactId>maven-jar-plugin</artifactId>
           <version>${jar-plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-toolchains-plugin</artifactId>
+                    <versionRange>[1.0.0,)</versionRange>
+                    <goals>
+                      <goal>toolchain</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute />
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
 
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-toolchains-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>toolchain</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <toolchains>
+            <jdk>
+              <version>1.7</version>
+              <vendor>oracle</vendor>
+            </jdk>
+          </toolchains>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

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

@@ -55,7 +55,6 @@ public static Object intercept(@This final Object runner,
 
         TARGET_TO_RUNNER.put(testObj, runner);
         RUNNER_TO_TARGET.put(runner, testObj);
-        LifecycleHooks.applyTimeout(testObj);
 
         if (DEPTH.get().atGroundLevel()) {
             synchronized(objectWatcherLoader) {

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

@@ -212,30 +212,6 @@ public static Description describeChild(Object target, Object child) {
         return invoke(runner, "describeChild", child);
     }
 
-    /**
-     * If configured for default test timeout, apply this value to every test that doesn't already specify a longer
-     * timeout interval.
-     * 
-     * @param testObj test class object
-     */
-    static void applyTimeout(Object testObj) {
-        // if default test timeout is defined
-        if (getConfig().containsKey(JUnitSettings.TEST_TIMEOUT.key())) {
-            // get default test timeout
-            long defaultTimeout = getConfig().getLong(JUnitSettings.TEST_TIMEOUT.key());
-            // iterate over test object methods
-            for (Method method : testObj.getClass().getDeclaredMethods()) {
-                // get @Test annotation
-                Test annotation = method.getAnnotation(Test.class);
-                // if annotation declared and current timeout is less than default
-                if ((annotation != null) && (annotation.timeout() < defaultTimeout)) {
-                    // set test timeout interval
-                    MutableTest.proxyFor(method).setTimeout(defaultTimeout);
-                }
-            }
-        }
-    }
-    
     /**
      * Get class of specified test class instance.
      * 

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

@@ -2,11 +2,9 @@
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runners.model.TestTimedOutException;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -104,7 +102,7 @@ public static MutableTest proxyFor(Method testMethod) {
         }
         if (declared != null) {
             try {
-                Field field = Executable.class.getDeclaredField(DECLARED_ANNOTATIONS);
+                Field field = Method.class.getDeclaredField(DECLARED_ANNOTATIONS);
                 field.setAccessible(true);
                 try {
                     @SuppressWarnings("unchecked")

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

@@ -4,8 +4,12 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 import org.junit.Ignore;
+import org.junit.Test;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.model.FrameworkMethod;
+
+import com.nordstrom.automation.junit.JUnitConfig.JUnitSettings;
+
 import net.bytebuddy.implementation.bind.annotation.Argument;
 import net.bytebuddy.implementation.bind.annotation.SuperCall;
 import net.bytebuddy.implementation.bind.annotation.This;
@@ -47,6 +51,8 @@ public static void intercept(@This final Object runner, @SuperCall final Callabl
             Run.pushThreadRunner(runner);
             if (child instanceof FrameworkMethod) {
                 FrameworkMethod method = (FrameworkMethod) child;
+                
+                applyTimeout(method);
                 int count = RetryHandler.getMaxRetry(runner, method);
                 boolean isIgnored = (null != method.getAnnotation(Ignore.class));
 
@@ -77,4 +83,25 @@ static void finished() {
             }
         }
     }
+    
+    /**
+     * If configured for default test timeout, apply the timeout value to the specified framework method if it doesn't
+     * already specify a longer timeout interval.
+     * 
+     * @param method {@link FrameworkMethod} object
+     */
+    private static void applyTimeout(FrameworkMethod method) {
+        // if default test timeout is defined
+        if (LifecycleHooks.getConfig().containsKey(JUnitSettings.TEST_TIMEOUT.key())) {
+            // get default test timeout
+            long defaultTimeout = LifecycleHooks.getConfig().getLong(JUnitSettings.TEST_TIMEOUT.key());
+            // get @Test annotation
+            Test annotation = method.getAnnotation(Test.class);
+            // if annotation declared and current timeout is less than default
+            if ((annotation != null) && (annotation.timeout() < defaultTimeout)) {
+                // set test timeout interval
+                MutableTest.proxyFor(method.getMethod()).setTimeout(defaultTimeout);
+            }
+        }
+    } 
 }

src/test/java/com/nordstrom/automation/junit/MethodExpectedTimeout.java

@@ -5,14 +5,9 @@
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
-import com.nordstrom.automation.junit.JUnitConfig.JUnitSettings;
 
 public class MethodExpectedTimeout {
 
-    static {
-        System.setProperty(JUnitSettings.TEST_TIMEOUT.key(), "500");
-    }
-    
     @Test
     public void testTimeout() throws InterruptedException {
         System.out.println("testTimeout");

src/test/java/com/nordstrom/automation/junit/MethodTimeoutTest.java

@@ -10,8 +10,12 @@
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 import org.junit.runners.model.TestTimedOutException;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import com.nordstrom.automation.junit.JUnitConfig.JUnitSettings;
+
 public class MethodTimeoutTest {
 
     private static final Map<String, String> MESSAGE_MAP;
@@ -22,6 +26,11 @@ public class MethodTimeoutTest {
         MESSAGE_MAP.put("testTimeoutWithShorterInterval", "test timed out after 500 milliseconds");
         MESSAGE_MAP.put("testTimeoutWithLongerInterval", "test timed out after 600 milliseconds");
     }
+    
+    @BeforeClass
+    public static void before() {
+        System.setProperty(JUnitSettings.TEST_TIMEOUT.key(), "500");
+    }
 
     @Test
     public void verifyHappyPath() {
@@ -52,6 +61,11 @@ public void verifyExpectedTimeout() {
         verifyFailureMessages(result);
     }
 
+    @AfterClass
+    public static void after() {
+        System.clearProperty(JUnitSettings.TEST_TIMEOUT.key());
+    }
+    
     private static void verifyFailureMessages(Result result) {
         for (Failure failure : result.getFailures()) {
             String methodName = failure.getDescription().getMethodName();