From 569e44550d96973e49582067767ab6149b8797b2 Mon Sep 17 00:00:00 2001
From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 23 Mar 2017 14:17:55 +0000
Subject: [PATCH] JAL-2314 Re-annotated unit tests using Jws2Discoverer

---
 test/jalview/ws/jabaws/DisorderAnnotExportImport.java |    8 ++++++--
 test/jalview/ws/jabaws/RNAStructExportImport.java     |   11 ++++++++---
 test/jalview/ws/jws2/ParameterUtilsTest.java          |    9 +++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
index 2d317e4..9b1dc19 100644
--- a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
+++ b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
@@ -44,7 +44,11 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-@Test(groups = { "External" })
+/*
+ * All methods in this class are set to the Network group because setUpBeforeClass will fail
+ * if there is no network.
+ */
+@Test(singleThreaded = true)
 public class DisorderAnnotExportImport
 {
 
@@ -100,7 +104,7 @@ public class DisorderAnnotExportImport
   /**
    * test for patches to JAL-1294
    */
-  @Test
+  @Test(groups = { "External", "Network" })
   public void testDisorderAnnotExport()
   {
     disorderClient = new AADisorderClient(iupreds.get(0), af, null, null);
diff --git a/test/jalview/ws/jabaws/RNAStructExportImport.java b/test/jalview/ws/jabaws/RNAStructExportImport.java
index f1430f6..6cd32c7 100644
--- a/test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/test/jalview/ws/jabaws/RNAStructExportImport.java
@@ -55,6 +55,11 @@ import org.testng.annotations.Test;
 import compbio.metadata.Argument;
 import compbio.metadata.WrongParameterException;
 
+/*
+ * All methods in this class are set to the Network group because setUpBeforeClass will fail
+ * if there is no network.
+ */
+@Test(singleThreaded = true)
 public class RNAStructExportImport
 {
 
@@ -139,7 +144,7 @@ public class RNAStructExportImport
     }
   }
 
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Network" })
   public void testRNAAliFoldValidStructure()
   {
 
@@ -172,7 +177,7 @@ public class RNAStructExportImport
     }
   }
 
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Network" })
   public void testRNAStructExport()
   {
 
@@ -242,7 +247,7 @@ public class RNAStructExportImport
             + "\nCouldn't complete Annotation file roundtrip input/output/input test.");
   }
 
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Network" })
   public void testRnaalifoldSettingsRecovery()
   {
     List<Argument> opts = new ArrayList<Argument>();
diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java
index 0662e5b..e859cb0 100644
--- a/test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/test/jalview/ws/jws2/ParameterUtilsTest.java
@@ -42,6 +42,11 @@ import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.WrongParameterException;
 
+/*
+ * All methods in this class are set to the Network group because setUpBeforeClass will fail
+ * if there is no network.
+ */
+@Test(singleThreaded = true)
 public class ParameterUtilsTest
 {
 
@@ -129,7 +134,7 @@ public class ParameterUtilsTest
             || serviceTests.contains(service.serviceType.toLowerCase());
   }
 
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Network" })
   public void testCopyOption()
   {
     for (Jws2Instance service : disc.getServices())
@@ -153,7 +158,7 @@ public class ParameterUtilsTest
 
   /**
    */
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Network" })
   public void testCopyParameter()
   {
     for (Jws2Instance service : disc.getServices())
-- 
1.7.10.2