Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

[jalview.git] / test / jalview / ws / jabaws / JpredJabaStructExportImport.java

diff --git a/test/jalview/ws/jabaws/JpredJabaStructExportImport.java b/test/jalview/ws/jabaws/JpredJabaStructExportImport.java
index 49a3064..e347e55 100644 (file)
--- a/test/jalview/ws/jabaws/JpredJabaStructExportImport.java
+++ b/test/jalview/ws/jabaws/JpredJabaStructExportImport.java
@@ -71,7 +71,6 @@ public class JpredJabaStructExportImport
 
     for (Jws2Instance svc : disc.getServices())
     {
-
       if (svc.getServiceTypeURI().toLowerCase().contains("jpred"))
       {
         jpredws = svc;
@@ -79,18 +78,10 @@ public class JpredJabaStructExportImport
     }
 
     System.out.println("State of jpredws: " + jpredws);
-
-    if (jpredws == null)
-    {
-      Assert.fail("jpredws is null");
-    }
-
+    Assert.assertNotNull(jpredws, "jpredws is null!");
     jalview.io.FileLoader fl = new jalview.io.FileLoader(false);
-
     af = fl.LoadFileWaitTillLoaded(testseqs, jalview.io.FormatAdapter.FILE);
-
     assertNotNull("Couldn't load test data ('" + testseqs + "')", af);
-
   }
 
   @AfterClass
@@ -103,7 +94,7 @@ public class JpredJabaStructExportImport
     }
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testJPredStructOneSeqOnly()
   {
     af.selectAllSequenceMenuItem_actionPerformed(null);
@@ -155,7 +146,7 @@ public class JpredJabaStructExportImport
 
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testJPredStructExport()
   {
 
@@ -226,7 +217,7 @@ public class JpredJabaStructExportImport
             + "\nCouldn't complete Annotation file roundtrip input/output/input test.");
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testJpredwsSettingsRecovery()
   {
     Assert.fail("not implemnented");