JAL-2269 JAL-2195 review and revised test

[jalview.git] / test / jalview / ext / jmol / JmolParserTest.java

diff --git a/test/jalview/ext/jmol/JmolParserTest.java b/test/jalview/ext/jmol/JmolParserTest.java
index fb71f01..b2d3253 100644 (file)
--- a/test/jalview/ext/jmol/JmolParserTest.java
+++ b/test/jalview/ext/jmol/JmolParserTest.java
@@ -34,7 +34,6 @@ import jalview.io.FileLoader;
 import jalview.structure.StructureImportSettings;
 import jalview.structure.StructureImportSettings.StructureParser;
 
-import java.io.IOException;
 import java.util.Vector;
 
 import org.jmol.c.STR;
@@ -252,24 +251,28 @@ public class JmolParserTest
   }
 
   @Test(groups = "Functional")
-  public void testLocalPDBId()
+  public void testLocalPDBId() throws Exception
   {
     JmolParser structureData;
-    try
-    {
-      structureData = new JmolParser("examples/DNMT1_MOUSE.pdb",
-              AppletFormatAdapter.FILE);
-      assertNotNull(structureData);
-      assertNotNull(structureData.getId());
-      assertEquals(structureData.getId(), "DNMT1_MOUSE.pdb");
-      assertNotNull(structureData.getSeqs());
-      assertNotNull(structureData.getSeqs().get(0).getSequenceFeatures()[0].featureGroup);
-      assertEquals(
-              structureData.getSeqs().get(0).getSequenceFeatures()[0].featureGroup,
-              "dnmt1_mouse.pdb");
-    } catch (IOException e)
-    {
-      e.printStackTrace();
-    }
+    /*
+     * reads a local structure
+     */
+    structureData = new JmolParser("examples/testdata/localstruct.pdb",
+            AppletFormatAdapter.FILE);
+    assertNotNull(structureData);
+    /*
+     * local structure files should yield a false ID based on the filename
+     */
+    assertNotNull(structureData.getId());
+    assertEquals(structureData.getId(), "localstruct.pdb");
+    assertNotNull(structureData.getSeqs());
+    /*
+     * the ID is also the group for features derived from structure data 
+     */
+    assertNotNull(structureData.getSeqs().get(0).getSequenceFeatures()[0].featureGroup);
+    assertEquals(
+            structureData.getSeqs().get(0).getSequenceFeatures()[0].featureGroup,
+            "localstruct.pdb");
+
   }
 }