X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjws2%2FParameterUtilsTest.java;h=b92f1a23af6b47c2788b4295a74fbfb998c99233;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=bf1b8eee60ae5613818c10f0b3577e2c769a6f8e;hpb=86c580ce122275898f6ecb1a3d70d32fd79d5815;p=jalview.git

diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java
index bf1b8ee..b92f1a2 100644
--- a/test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/test/jalview/ws/jws2/ParameterUtilsTest.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,16 +20,20 @@
  */
 package jalview.ws.jws2;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+
+import jalview.bin.Cache;
+import jalview.ws.jabaws.JalviewJabawsTestUtils;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 import compbio.metadata.Option;
 import compbio.metadata.Parameter;
@@ -37,10 +41,6 @@ import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.WrongParameterException;
 
-import jalview.bin.Cache;
-import jalview.ws.jabaws.JalviewJabawsTestUtils;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
-
 public class ParameterUtilsTest
 {
   /*
@@ -51,7 +51,7 @@ public class ParameterUtilsTest
 
   private static Jws2Discoverer disc = null;
 
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
     serviceTests.add("AAConWS".toLowerCase());
@@ -59,7 +59,7 @@ public class ParameterUtilsTest
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testWriteParameterSet() throws WrongParameterException
   {
     for (Jws2Instance service : disc.getServices())
@@ -96,8 +96,8 @@ public class ParameterUtilsTest
             String on = o.next();
             String sn = s.next();
             String st = t.next();
-            final String errorMsg = "Original was " + on + " Phase 1 wrote " + sn
-                    + "\tPhase 2 wrote " + st;
+            final String errorMsg = "Original was " + on
+                    + " Phase 1 wrote " + sn + "\tPhase 2 wrote " + st;
             assertEquals(errorMsg, sn, st);
             assertEquals(errorMsg, sn, on);
           }
@@ -119,7 +119,7 @@ public class ParameterUtilsTest
             || serviceTests.contains(service.serviceType.toLowerCase());
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testCopyOption()
   {
     for (Jws2Instance service : disc.getServices())
@@ -143,7 +143,7 @@ public class ParameterUtilsTest
 
   /**
    */
-  @Test
+  @Test(groups = { "Functional" })
   public void testCopyParameter()
   {
     for (Jws2Instance service : disc.getServices())