JAL-1925 update source version in license

[jalview.git] / test / jalview / ws / PDBSequenceFetcherTest.java

diff --git a/test/jalview/ws/PDBSequenceFetcherTest.java b/test/jalview/ws/PDBSequenceFetcherTest.java
index 9ecf524..715b15d 100644 (file)
--- a/test/jalview/ws/PDBSequenceFetcherTest.java
+++ b/test/jalview/ws/PDBSequenceFetcherTest.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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,15 @@ 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 +68,11 @@ 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);
     }
   }