JAL-3691 automatic insertion of Locale.ROOT to toUpperCase() and toLowerCase() and...

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

diff --git a/test/jalview/ws/jabaws/RNAStructExportImport.java b/test/jalview/ws/jabaws/RNAStructExportImport.java
index 6cd32c7..cc9aba0 100644 (file)
--- a/test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/test/jalview/ws/jabaws/RNAStructExportImport.java
@@ -20,19 +20,21 @@
  */
 package jalview.ws.jabaws;
 
+import java.util.Locale;
+
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
-import jalview.gui.Jalview2XML;
 import jalview.gui.JvOptionPane;
 import jalview.io.AnnotationFile;
 import jalview.io.DataSourceType;
 import jalview.io.FileFormat;
 import jalview.io.FormatAdapter;
 import jalview.io.StockholmFileTest;
+import jalview.project.Jalview2XML;
 import jalview.ws.jws2.Jws2Discoverer;
 import jalview.ws.jws2.RNAalifoldClient;
 import jalview.ws.jws2.SequenceAnnotationWSClient;
@@ -89,10 +91,16 @@ public class RNAStructExportImport
     Cache.initLogger();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer(false);
 
+    while (disc.isRunning())
+    {
+      // don't get services until discoverer has finished
+      Thread.sleep(100);
+    }
+
     for (Jws2Instance svc : disc.getServices())
     {
 
-      if (svc.getServiceTypeURI().toLowerCase().contains("rnaalifoldws"))
+      if (svc.getServiceTypeURI().toLowerCase(Locale.ROOT).contains("rnaalifoldws"))
       {
         rnaalifoldws = svc;
       }
@@ -112,7 +120,7 @@ public class RNAStructExportImport
     assertNotNull("Couldn't load test data ('" + testseqs + "')", af);
 
     // remove any existing annotation
-    List<AlignmentAnnotation> aal = new ArrayList<AlignmentAnnotation>();
+    List<AlignmentAnnotation> aal = new ArrayList<>();
     for (AlignmentAnnotation rna : af.getViewport().getAlignment()
             .getAlignmentAnnotation())
     {
@@ -196,12 +204,14 @@ public class RNAStructExportImport
     } while (af.getViewport().getCalcManager().isWorking());
 
     AlignmentI orig_alig = af.getViewport().getAlignment();
-
-    testAnnotationFileIO("Testing RNAalifold Annotation IO", orig_alig);
+    // JBPNote: this assert fails (2.10.2) because the 'Reference Positions'
+    // annotation is mistakenly recognised as an RNA annotation row when read in
+    // as an annotation file.
+    verifyAnnotationFileIO("Testing RNAalifold Annotation IO", orig_alig);
 
   }
 
-  public static void testAnnotationFileIO(String testname, AlignmentI al)
+  static void verifyAnnotationFileIO(String testname, AlignmentI al)
   {
     try
     {
@@ -236,7 +246,8 @@ public class RNAStructExportImport
                       DataSourceType.PASTE));
 
       // test for consistency in io
-      StockholmFileTest.testAlignmentEquivalence(al, al_new, false);
+      StockholmFileTest.testAlignmentEquivalence(al, al_new, false, false,
+              false);
       return;
     } catch (Exception e)
     {
@@ -250,7 +261,7 @@ public class RNAStructExportImport
   @Test(groups = { "Network" })
   public void testRnaalifoldSettingsRecovery()
   {
-    List<Argument> opts = new ArrayList<Argument>();
+    List<Argument> opts = new ArrayList<>();
     for (Argument rg : (List<Argument>) rnaalifoldws.getRunnerConfig()
             .getArguments())
     {