X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FRNAStructExportImport.java;h=ee07335b84b7eec22aa40a505410fbae1cd65034;hb=7692386ccfe778075dd83a753d30a7a27fe507be;hp=5ea97ff3e35f8d54ecd40c28ad852f34896bcfa7;hpb=49ae0c9823bb1c450e03460c5714a7db3cdf440b;p=jalview.git diff --git a/test/jalview/ws/jabaws/RNAStructExportImport.java b/test/jalview/ws/jabaws/RNAStructExportImport.java index 5ea97ff..ee07335 100644 --- a/test/jalview/ws/jabaws/RNAStructExportImport.java +++ b/test/jalview/ws/jabaws/RNAStructExportImport.java @@ -98,7 +98,7 @@ public class RNAStructExportImport for (Jws2Instance svc : disc.getServices()) { - if (svc.getServiceTypeURI().toLowerCase().contains("rnaalifoldws")) + if (svc.getNameURI().toLowerCase().contains("rnaalifoldws")) { rnaalifoldws = svc; } @@ -118,7 +118,7 @@ public class RNAStructExportImport assertNotNull("Couldn't load test data ('" + testseqs + "')", af); // remove any existing annotation - List aal = new ArrayList(); + List aal = new ArrayList<>(); for (AlignmentAnnotation rna : af.getViewport().getAlignment() .getAlignmentAnnotation()) { @@ -202,7 +202,9 @@ public class RNAStructExportImport } while (af.getViewport().getCalcManager().isWorking()); AlignmentI orig_alig = af.getViewport().getAlignment(); - + // 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); } @@ -257,7 +259,7 @@ public class RNAStructExportImport @Test(groups = { "Network" }) public void testRnaalifoldSettingsRecovery() { - List opts = new ArrayList(); + List opts = new ArrayList<>(); for (Argument rg : (List) rnaalifoldws.getRunnerConfig() .getArguments()) {