X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2FPDBSequenceFetcherTest.java;h=86439fcecb0d6f52c5eee6dff14a8cf53df6745e;hb=4e4cd7954b978bfe1ba652e44be2510626efa177;hp=5a9e954f26fa89628c86429c346892f9dccfe9b2;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git

diff --git a/test/jalview/ws/PDBSequenceFetcherTest.java b/test/jalview/ws/PDBSequenceFetcherTest.java
index 5a9e954..86439fc 100644
--- a/test/jalview/ws/PDBSequenceFetcherTest.java
+++ b/test/jalview/ws/PDBSequenceFetcherTest.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,37 +20,37 @@
  */
 package jalview.ws;
 
-import static org.junit.Assert.*;
+import static org.testng.AssertJUnit.assertTrue;
+
+import jalview.bin.Cache;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
 import jalview.ws.seqfetcher.DbSourceProxy;
 
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class PDBSequenceFetcherTest
 {
 
   SequenceFetcher sf;
 
-  @Before
+ @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
-    sf = new SequenceFetcher(false);
-  }
+    // ensure 'add annotation from structure' is selected
+    Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
+            Boolean.TRUE.toString());
+    Cache.applicationProperties.setProperty("ADD_SS_ANN",
+            Boolean.TRUE.toString());
 
-  @Test
-  public void testPdbPerChainRetrieve() throws Exception
-  {
-    List<DbSourceProxy> sps = sf.getSourceProxy("PDB");
-    AlignmentI response = sps.get(0).getSequenceRecords("1QIPA");
-    assertTrue(response != null);
-    assertTrue(response.getHeight() == 1);
+    sf = new SequenceFetcher(false);
   }
 
-  @Test
+  @Test(groups =
+  { "Network" }, enabled = true)
   public void testRnaSeqRetrieve() throws Exception
   {
     List<DbSourceProxy> sps = sf.getSourceProxy("PDB");
@@ -61,7 +61,7 @@ public class PDBSequenceFetcherTest
     {
       assertTrue("No annotation transfered to sequence.",
               sq.getAnnotation().length > 0);
-      assertTrue("No PDBEntry on sequence.", sq.getPDBId().size() > 0);
+      assertTrue("No PDBEntry on sequence.", sq.getAllPDBEntries().size() > 0);
       assertTrue("No RNA annotation on sequence.", sq.getRNA() != null);
     }
   }