X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FAnnotatedPDBFileInputTest.java;h=150ee5925f5694b3b0195eee369c146ec6f912c9;hb=06e3a52df5af8243cdb67c023c8ddd834711ad36;hp=feba9cb9d5c0f2b11d29bf1e68f0ab15a5e0ad60;hpb=fddf3084802b37e5cee17829e32692a4aac3e60d;p=jalview.git diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java index feba9cb..150ee59 100644 --- 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());