JAL-1665 patch for regression: failing jalview.ws.jabaws.DisorderAnnotExportImport...

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

diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java
index 29d5549..ef88ca5 100644 (file)
--- 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<PDBEntry>) sq.getPDBId())
+      for (PDBEntry pdbentry : sq.getPDBId())
       {
         System.err.println("PDB Entry " + pdbentry.getId() + " "
                 + pdbentry.getFile());