X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2FMCview%2FPDBfileTest.java;h=c07c62e0f19550d2ee53ece8870bd9fd9d4ef015;hb=038cb9c86641c3de91d8f330c5e3267507c46643;hp=59c7475215b8b6b560c5fc693bb9948654832f13;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git

diff --git a/test/MCview/PDBfileTest.java b/test/MCview/PDBfileTest.java
index 59c7475..c07c62e 100644
--- a/test/MCview/PDBfileTest.java
+++ b/test/MCview/PDBfileTest.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 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.
  * 
@@ -26,21 +26,34 @@ import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertSame;
 import static org.testng.AssertJUnit.assertTrue;
 
+import jalview.bin.Cache;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
-import jalview.io.AppletFormatAdapter;
+import jalview.gui.JvOptionPane;
+import jalview.io.DataSourceType;
+import jalview.structure.StructureImportSettings;
 
 import java.io.IOException;
 import java.util.List;
 
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class PDBfileTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @Test(groups = { "Functional" })
   public void testIsRna()
   {
@@ -70,19 +83,21 @@ public class PDBfileTest
      * Constructor with file path performs parse()
      */
     PDBfile pf = new PDBfile(false, false, false, "examples/3W5V.pdb",
-            AppletFormatAdapter.FILE);
+            DataSourceType.FILE);
 
-    assertEquals("3W5V", pf.id);
+    assertEquals("3W5V", pf.getId());
     // verify no alignment annotations created
     assertNull(getAlignmentAnnotations(pf));
 
-    assertEquals(4, pf.chains.size());
-    assertEquals("A", pf.chains.get(0).id);
-    assertEquals("B", pf.chains.get(1).id);
-    assertEquals("C", pf.chains.get(2).id);
-    assertEquals("D", pf.chains.get(3).id);
+    assertEquals(4, pf.getChains().size());
+    assertEquals("A", pf.getChains().get(0).id);
+    assertEquals("B", pf.getChains().get(1).id);
+    assertEquals("C", pf.getChains().get(2).id);
+    assertEquals("D", pf.getChains().get(3).id);
+
+    PDBChain chainA = pf.getChains().get(0);
+    SequenceI seqA = pf.getSeqs().get(0);
 
-    PDBChain chainA = pf.chains.get(0);
     assertEquals(0, chainA.seqstart); // not set
     assertEquals(0, chainA.seqend); // not set
     assertEquals(18, chainA.sequence.getStart());
@@ -91,27 +106,27 @@ public class PDBfileTest
     assertTrue(chainA.sequence.getSequenceAsString().endsWith("WNVEVY"));
     assertEquals("3W5V|A", chainA.sequence.getName());
     assertNull(chainA.sequence.getAnnotation());
-    assertEquals(1, chainA.sequence.getAllPDBEntries().size());
-    PDBEntry pdb = chainA.sequence.getAllPDBEntries().get(0);
+    assertEquals(1, seqA.getAllPDBEntries().size());
+    PDBEntry pdb = seqA.getAllPDBEntries().get(0);
     assertEquals("A", pdb.getChainCode());
     assertEquals("PDB", pdb.getType());
     assertEquals("3W5V", pdb.getId());
 
-    PDBChain chainB = pf.chains.get(1);
+    PDBChain chainB = pf.getChains().get(1);
     assertEquals(1, chainB.sequence.getStart());
     assertEquals(96, chainB.sequence.getEnd());
     assertTrue(chainB.sequence.getSequenceAsString().startsWith("ATYNVK"));
     assertTrue(chainB.sequence.getSequenceAsString().endsWith("KEEELT"));
     assertEquals("3W5V|B", chainB.sequence.getName());
 
-    PDBChain chainC = pf.chains.get(2);
+    PDBChain chainC = pf.getChains().get(2);
     assertEquals(18, chainC.sequence.getStart());
     assertEquals(314, chainC.sequence.getEnd());
     assertTrue(chainC.sequence.getSequenceAsString().startsWith("KCSKKQEE"));
     assertTrue(chainC.sequence.getSequenceAsString().endsWith("WNVEVY"));
     assertEquals("3W5V|C", chainC.sequence.getName());
 
-    PDBChain chainD = pf.chains.get(3);
+    PDBChain chainD = pf.getChains().get(3);
     assertEquals(1, chainD.sequence.getStart());
     assertEquals(96, chainD.sequence.getEnd());
     assertTrue(chainD.sequence.getSequenceAsString().startsWith("ATYNVK"));
@@ -144,7 +159,7 @@ public class PDBfileTest
   public void testParse_withAnnotations_noSS() throws IOException
   {
     PDBfile pf = new PDBfile(true, false, false, "examples/3W5V.pdb",
-            AppletFormatAdapter.FILE);
+            DataSourceType.FILE);
 
     AlignmentAnnotation[] anns = getAlignmentAnnotations(pf);
     assertEquals(4, anns.length);
@@ -202,7 +217,7 @@ public class PDBfileTest
   public void testParse_withJmol_noAnnotations() throws IOException
   {
     PDBfile pf = new PDBfile(false, true, false, "examples/3W5V.pdb",
-            AppletFormatAdapter.FILE);
+            DataSourceType.FILE);
 
     /*
      * alignment annotations _are_ created anyway (in
@@ -215,7 +230,7 @@ public class PDBfileTest
      * no sequence annotations created - tempFactor annotation is not added
      * unless the flag to 'addAlignmentAnnotations' is set true
      */
-    for (PDBChain c : pf.chains)
+    for (PDBChain c : pf.getChains())
     {
       assertNull(c.sequence.getAnnotation());
     }
@@ -232,7 +247,7 @@ public class PDBfileTest
           throws IOException
   {
     PDBfile pf = new PDBfile(true, true, false, "examples/3W5V.pdb",
-            AppletFormatAdapter.FILE);
+            DataSourceType.FILE);
 
     /*
      * Alignment annotations for TempFactor, SecStruct, per sequence (chain)
@@ -251,10 +266,10 @@ public class PDBfileTest
     /*
      * PDBFileWithJmol (unlike PDBChain!) leaves PDB id upper case
      */
-    assertEquals("Secondary Structure for 3W5VA", anns[0].description);
-    assertEquals("Secondary Structure for 3W5VB", anns[2].description);
-    assertEquals("Secondary Structure for 3W5VC", anns[4].description);
-    assertEquals("Secondary Structure for 3W5VD", anns[6].description);
+    assertEquals("Secondary Structure for 3w5vA", anns[0].description);
+    assertEquals("Secondary Structure for 3w5vB", anns[2].description);
+    assertEquals("Secondary Structure for 3w5vC", anns[4].description);
+    assertEquals("Secondary Structure for 3w5vD", anns[6].description);
 
     /*
      * Verify SS annotations are linked to respective sequences (chains)
@@ -290,7 +305,7 @@ public class PDBfileTest
     // TODO requires a mock for Annotate3D processing
     // and/or run as an integration test
     PDBfile pf = new PDBfile(true, true, true, "examples/2GIS.pdb",
-            AppletFormatAdapter.FILE);
+            DataSourceType.FILE);
   }
 
   /**
@@ -305,4 +320,17 @@ public class PDBfileTest
     pf.addAnnotations(al);
     return al.getAlignmentAnnotation();
   }
+
+  @BeforeMethod(alwaysRun = true)
+  public void setUp()
+  {
+    Cache.loadProperties("test/jalview/io/testProps.jvprops");
+    Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
+            Boolean.TRUE.toString());
+    Cache.applicationProperties.setProperty("ADD_TEMPFACT_ANN",
+            Boolean.TRUE.toString());
+    Cache.applicationProperties.setProperty("ADD_SS_ANN",
+            Boolean.TRUE.toString());
+    StructureImportSettings.setDefaultStructureFileFormat("PDB");
+  }
 }