X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandsTest2.java;h=5fa9ba0d496338af0d68b5a7626f7d1256cbd628;hb=2b830243eed0188ae6704640bd24b7f99f61bc1b;hp=34966ae7f3cc9c4ac10b4a3202758eaabf8629fc;hpb=bf95499e2c08367f60183e13cde467408fdba591;p=jalview.git

diff --git a/test/jalview/bin/CommandsTest2.java b/test/jalview/bin/CommandsTest2.java
index 34966ae..5fa9ba0 100644
--- a/test/jalview/bin/CommandsTest2.java
+++ b/test/jalview/bin/CommandsTest2.java
@@ -26,7 +26,7 @@ public class CommandsTest2
   @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
-    Cache.loadProperties("test/jalview/bin/commandsTest.jvprops");
+    Cache.loadProperties("test/jalview/bin/commandsTest2.jvprops");
     Date oneHourFromNow = new Date(
             System.currentTimeMillis() + 3600 * 1000);
     Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", oneHourFromNow);
@@ -57,7 +57,7 @@ public class CommandsTest2
 
   @Test(
     groups =
-    { "Functional" },
+    { "Functional", "testTask1" },
     dataProvider = "structureOpeningArgsParams",
     singleThreaded = true)
   public void structureOpeningArgsTest(String cmdLine, int seqNum,
@@ -69,7 +69,7 @@ public class CommandsTest2
     try
     {
       // sleep for slow build server to open annotations and viewer windows
-      Thread.sleep(seqNum * 100 + annNum * 200 + viewerNum * 1500);
+      Thread.sleep(seqNum * 50 + annNum * 50 + viewerNum * 500);
     } catch (InterruptedException e)
     {
       e.printStackTrace();
@@ -101,8 +101,6 @@ public class CommandsTest2
     int dcount = 0;
     for (AlignmentAnnotation aa : aas)
     {
-      System.err.println("##### DIAGNOSIS: annotation " + ++dcount
-              + " is labelled '" + aa.label + "'");
       if (aa.visible)
         visibleAnn++;
     }
@@ -180,8 +178,10 @@ public class CommandsTest2
                 + "--noannotations " + "--nossannotations "
                 + "--props=test/jalview/bin/commandsTest2.jvprops1 ",
             15, 0, 1 },
-        { "--argfile=test/jalview/bin/commandsTest2.argfile1 ", 16, 19, 3 },
-        { "--argfile=test/jalview/bin/commandsTest2.argfile2 ", 16, 0, 2 },
+        { "--nonews --nosplash --debug --nowebservicediscovery --props=test/jalview/bin/commandsTest.jvprops --argfile=test/jalview/bin/commandsTest2.argfile1 ",
+            16, 19, 3 },
+        { "--nonews --nosplash --debug --nowebservicediscovery --props=test/jalview/bin/commandsTest.jvprops --argfile=test/jalview/bin/commandsTest2.argfile2 ",
+            16, 0, 2 },
         //
     };
   }