From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 16 Apr 2019 09:33:42 +0000 (+0100)
Subject: JAL-1189 JAL-3130 patch broken tests
X-Git-Tag: Release_2_11_0~17^2~7^2~33
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=05efc2ac3c6427a4dabce842ebbd6f2ae17f49b9;p=jalview.git

JAL-1189 JAL-3130 patch broken tests
---

diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java
index 1761261..98e4eb5 100644
--- a/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@ -20,9 +20,6 @@
  */
 package jalview.bin;
 
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
 import jalview.gui.JvOptionPane;
 
 import java.io.BufferedReader;
@@ -265,7 +262,8 @@ public class CommandLineOperations
     file.deleteOnExit();
     Worker worker = getJalviewDesktopRunner(withAWT, cmd, timeout);
     assertNotNull(worker, "worker is null");
-    String msg = "Didn't create an output" + type + " file.[" + harg + "]";
+    String msg = "Didn't create an output" + type + " file at '"
+            + file.getAbsolutePath() + "'.[" + harg + "]";
     assertTrue(file.exists(), msg);
     FileAssert.assertFile(file, msg);
     FileAssert.assertMinLength(file, expectedMinFileSize);
@@ -314,53 +312,58 @@ public class CommandLineOperations
   @DataProvider(name = "headlessModeOutputOperationsData")
   public static Object[][] getHeadlessModeOutputParams()
   {
+    // JBPNote: I'm not clear why need to specify full path for output file
+    // when running tests on build server, but we will keep this patch for now
+    // since it works.
+    // https://issues.jalview.org/browse/JAL-1889?focusedCommentId=21609&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-21609
+    String workingDir = "test/jalview/bin/";
     return new Object[][] { { "nodisplay -open examples/uniref50.fa",
-        " -eps", "test/jalview/bin/test_uniref50_out.eps", true,
+        " -eps", workingDir + "test_uniref50_out.eps", true,
         MINFILESIZE_BIG, TEST_TIMEOUT },
         { "nodisplay -open examples/uniref50.fa", " -eps",
-            "test/jalview/bin/test_uniref50_out.eps", false,
+            workingDir + "test_uniref50_out.eps", false,
             MINFILESIZE_BIG, TEST_TIMEOUT },
         { "nogui -open examples/uniref50.fa", " -eps",
-            "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG,
+            workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG,
             TEST_TIMEOUT },
         { "nogui -open examples/uniref50.fa", " -eps",
-            "test/jalview/bin/test_uniref50_out.eps", false,
+            workingDir + "test_uniref50_out.eps", false,
             MINFILESIZE_BIG, TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -eps",
-            "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG,
+            workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -svg",
-            "test/jalview/bin/test_uniref50_out.svg", false,
+            workingDir + "test_uniref50_out.svg", false,
             MINFILESIZE_BIG, TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -png",
-            "test/jalview/bin/test_uniref50_out.png", true, MINFILESIZE_BIG,
+            workingDir + "test_uniref50_out.png", true, MINFILESIZE_BIG,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -html",
-            "test/jalview/bin/test_uniref50_out.html", true,
+            workingDir + "test_uniref50_out.html", true,
             MINFILESIZE_BIG, TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -fasta",
-            "test_uniref50_out.mfa", true, MINFILESIZE_SMALL,
+            workingDir + "test_uniref50_out.mfa", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -clustal",
-            "test_uniref50_out.aln", true, MINFILESIZE_SMALL,
+            workingDir + "test_uniref50_out.aln", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -msf",
-            "test_uniref50_out.msf", true, MINFILESIZE_SMALL,
+            workingDir + "test_uniref50_out.msf", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -pileup",
-            "test_uniref50_out.aln", true, MINFILESIZE_SMALL,
+            workingDir + "test_uniref50_out.aln", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -pir",
-            "test_uniref50_out.pir", true, MINFILESIZE_SMALL,
+            workingDir + "test_uniref50_out.pir", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -pfam",
-            "test_uniref50_out.pfam", true, MINFILESIZE_SMALL,
+            workingDir + "test_uniref50_out.pfam", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -blc",
-            "test_uniref50_out.blc", true, MINFILESIZE_SMALL,
+            workingDir + "test_uniref50_out.blc", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -jalview",
-            "test_uniref50_out.jvp", true, MINFILESIZE_SMALL,
+            workingDir + "test_uniref50_out.jvp", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT }, };
   }
 }