X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2FPDBSequenceFetcherTest.java;h=adf53f53ac2a13da00ab3531b8110622f372b1aa;hb=refs%2Fheads%2Ffeatures%2FJAL-857_dynamic-example-files;hp=9ecf5248a0e1c7fd3a317fa2d09cc611f163bc37;hpb=3412b273e964fb1a9d22564b04a5f0c827ec2461;p=jalview.git

diff --git a/test/jalview/ws/PDBSequenceFetcherTest.java b/test/jalview/ws/PDBSequenceFetcherTest.java
index 9ecf524..adf53f5 100644
--- a/test/jalview/ws/PDBSequenceFetcherTest.java
+++ b/test/jalview/ws/PDBSequenceFetcherTest.java
@@ -22,22 +22,22 @@ package jalview.ws;
 
 import static org.testng.AssertJUnit.assertTrue;
 
-import java.util.List;
-
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
 import jalview.ws.seqfetcher.DbSourceProxy;
 
+import java.util.List;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 public class PDBSequenceFetcherTest
 {
 
   SequenceFetcher sf;
 
-  @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
     // ensure 'add annotation from structure' is selected
@@ -49,7 +49,16 @@ public class PDBSequenceFetcherTest
     sf = new SequenceFetcher(false);
   }
 
-  @Test(enabled = false)
+  /**
+   * Test that RNA structure can be added by a call to the RNAML service.
+   * 
+   * Note this test depends on http://arn-ibmc.in2p3.fr/api/compute/2d which is
+   * not always reliable.
+   * 
+   * @throws Exception
+   */
+  @Test(groups =
+  { "Network" }, enabled = true)
   public void testRnaSeqRetrieve() throws Exception
   {
     List<DbSourceProxy> sps = sf.getSourceProxy("PDB");
@@ -60,8 +69,10 @@ public class PDBSequenceFetcherTest
     {
       assertTrue("No annotation transfered to sequence.",
               sq.getAnnotation().length > 0);
-      assertTrue("No PDBEntry on sequence.", sq.getPDBId().size() > 0);
-      assertTrue("No RNA annotation on sequence.", sq.getRNA() != null);
+      assertTrue("No PDBEntry on sequence.", sq.getAllPDBEntries().size() > 0);
+      assertTrue(
+              "No RNA annotation on sequence, possibly http://arn-ibmc.in2p3.fr/api/compute/2d not available?",
+              sq.getRNA() != null);
     }
   }