X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotatedPDBFileInputTest.java;h=ef88ca5700abfbfefd055a9b9795e68458a3e457;hb=bd0830d40949c8a701ef82f467e7c0e0b68aba31;hp=29d5549c3e7641569c5de6c1ca269d35f2a67271;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java index 29d5549..ef88ca5 100644 --- a/test/jalview/io/AnnotatedPDBFileInputTest.java +++ b/test/jalview/io/AnnotatedPDBFileInputTest.java @@ -4,6 +4,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; + +import java.io.File; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import jalview.bin.Cache; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.PDBEntry; @@ -14,14 +23,6 @@ import jalview.gui.Desktop; import jalview.structure.StructureMapping; import jalview.structure.StructureSelectionManager; -import java.io.File; -import java.util.Vector; - -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - public class AnnotatedPDBFileInputTest { @@ -34,12 +35,16 @@ public class AnnotatedPDBFileInputTest @Before public void setup() throws Exception { + Cache.applicationProperties.setProperty("STRUCT_FROM_PDB", + Boolean.TRUE.toString()); + Cache.applicationProperties.setProperty("ADD_SS_ANN", + Boolean.TRUE.toString()); FileLoader loader = new FileLoader(false); AlignFrame af = loader.LoadFileWaitTillLoaded(pdbStr, FormatAdapter.FILE); al = af.getViewport().getAlignment(); - pdbId = ((PDBEntry) al.getSequenceAt(0).getDatasetSequence().getPDBId() - .get(0)).getId(); + pdbId = al.getSequenceAt(0).getDatasetSequence().getPDBId() + .get(0).getId(); } @Test @@ -194,7 +199,7 @@ public class AnnotatedPDBFileInputTest } assertNotNull(sq.getPDBId()); assertEquals("Expected only one PDB ID", sq.getPDBId().size(), 1); - for (PDBEntry pdbentry : (Vector) sq.getPDBId()) + for (PDBEntry pdbentry : sq.getPDBId()) { System.err.println("PDB Entry " + pdbentry.getId() + " " + pdbentry.getFile());