Wdt system test save logs during cleanup (#465)

* Create after method to save logs even if exception

Author: CarolynRountree

system-test/src/test/java/oracle/weblogic/deploy/integration/BaseTest.java

@@ -90,6 +90,15 @@ protected static void cleanup() throws Exception {
         }
     }
 
+    protected static void saveLogFiles(String testMethodName) throws Exception {
+        logger.info("saving log files ...");
+
+        // save the logs for this test instance in the workspace target directory
+        String cmd = "tar -cvf" + getTargetDir() +FS + testMethodName + ".tar " +  getTargetDir() + FS + WDT_HOME_DIR +
+            FS + "logs";
+        executeNoVerify(cmd);
+    }
+
     protected static String getProjectRoot() {
         return projectRoot;
     }

system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java

@@ -10,7 +10,11 @@
 import org.junit.runners.MethodSorters;
 import org.junit.BeforeClass;
 import org.junit.AfterClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -43,6 +47,22 @@ public static void staticUnprepare() throws Exception {
         cleanup();
     }
 
+
+    @Rule
+    public TestWatcher watcher = new TestWatcher() {
+        @Override
+        protected void failed(Throwable e, Description description) {
+            if (e != null) {
+                logger.info("Method " + description.getMethodName() + " Exception: " + e.getLocalizedMessage());
+            }
+            try {
+                saveLogFiles(description.getMethodName());
+            } catch (Exception le) {
+                logger.info("Unable to save log files : " + le.getLocalizedMessage());
+            }
+        }
+    };
+
     /**
      * test createDomain.sh with only -oracle_home argument
      * @throws Exception - if any error occurs
@@ -362,6 +382,7 @@ public void testFDiscoverDomainWithRequiredArgument() throws Exception {
 
         logger.info("executing command: " + cmd);
         ExecResult result = ExecCommand.exec(cmd);
+
         verifyResult(result, "discoverDomain.sh completed successfully");
 
         // unzip discoveredArchive.zip
@@ -393,6 +414,7 @@ public void testGDiscoverDomainWithModelFile() throws Exception {
 
         logger.info("executing command: " + cmd);
         ExecResult result = ExecCommand.exec(cmd);
+
         verifyResult(result, "discoverDomain.sh completed successfully");
 
         // verify model file
@@ -418,6 +440,7 @@ public void testHDiscoverDomainJRFDomainType() throws Exception {
 
         logger.info("executing command: " + cmd);
         ExecResult result = ExecCommand.exec(cmd);
+
         verifyResult(result, "discoverDomain.sh completed successfully");
 
         // verify model file