JAL-1824 updated caching procedure for pdb entries. Also refactored getPDBEntry metho...

[jalview.git] / test / jalview / io / AnnotatedPDBFileInputTest.java

diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java
index feba9cb..150ee59 100644 (file)
--- a/test/jalview/io/AnnotatedPDBFileInputTest.java
+++ b/test/jalview/io/AnnotatedPDBFileInputTest.java
@@ -32,7 +32,7 @@ public class AnnotatedPDBFileInputTest
 
   String pdbId;
 
-  @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
   public void setup() throws Exception
   {
     Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
@@ -43,7 +43,7 @@ public class AnnotatedPDBFileInputTest
     AlignFrame af = loader.LoadFileWaitTillLoaded(pdbStr,
             FormatAdapter.FILE);
     al = af.getViewport().getAlignment();
-    pdbId = al.getSequenceAt(0).getDatasetSequence().getPDBId()
+    pdbId = al.getSequenceAt(0).getDatasetSequence().getAllPDBEntries()
             .get(0).getId();
   }
 
@@ -156,7 +156,7 @@ public class AnnotatedPDBFileInputTest
   /**
    * @throws java.lang.Exception
    */
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
     jalview.bin.Jalview.main(new String[]
@@ -197,9 +197,9 @@ public class AnnotatedPDBFileInputTest
       {
         sq = sq.getDatasetSequence();
       }
-      assertNotNull(sq.getPDBId());
-      assertEquals("Expected only one PDB ID", sq.getPDBId().size(), 1);
-      for (PDBEntry pdbentry : sq.getPDBId())
+      assertNotNull(sq.getAllPDBEntries());
+      assertEquals("Expected only one PDB ID", sq.getAllPDBEntries().size(), 1);
+      for (PDBEntry pdbentry : sq.getAllPDBEntries())
       {
         System.err.println("PDB Entry " + pdbentry.getId() + " "
                 + pdbentry.getFile());