X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotatedPDBFileInputTest.java;h=689bd59b014b1fbe2bc49cbcce985ac53b5675f0;hb=bb5d9c75833e2d0b9ef8f66b8fcd7d5649a3271f;hp=e14a4782a8ba51f04dc6fffc698a52f292fc5986;hpb=df2bf54c7050c42db156e96e73bbabce63e718d7;p=jalview.git

diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java
index e14a478..689bd59 100644
--- a/test/jalview/io/AnnotatedPDBFileInputTest.java
+++ b/test/jalview/io/AnnotatedPDBFileInputTest.java
@@ -39,6 +39,7 @@ import jalview.structure.StructureImportSettings.StructureParser;
 import java.io.File;
 import java.util.List;
 
+import org.junit.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -101,20 +102,21 @@ public class AnnotatedPDBFileInputTest
     }
   }
 
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Functional" }, enabled = false)
   public void checkPDBannotationSource()
   {
-
+    Assert.fail(
+            "This test is incorrect - does not verify that JmolParser's annotation rows can be recognised as generated by the Jmol parser.");
     for (SequenceI asq : al.getSequences())
     {
       for (AlignmentAnnotation aa : asq.getAnnotation())
       {
 
         System.out.println("CalcId: " + aa.getCalcId());
-        if (StructureImportSettings.getDefaultPDBFileParser().equals(
-                StructureParser.JALVIEW_PARSER))
+        if (StructureImportSettings.getDefaultPDBFileParser()
+                .equals(StructureParser.JALVIEW_PARSER))
         {
-          assertTrue(MCview.PDBfile.isCalcIdForFile(aa, pdbId));
+          assertTrue(mc_view.PDBfile.isCalcIdForFile(aa, pdbId));
         }
       }
     }
@@ -180,10 +182,9 @@ public class AnnotatedPDBFileInputTest
             break;
           }
         }
-        assertTrue(
-                "Couldn't find sequence associated annotation "
-                        + aa.label
-                        + " on the sequence it is associated with.\nSequence associated editing will fail.",
+        assertTrue("Couldn't find sequence associated annotation "
+                + aa.label
+                + " on the sequence it is associated with.\nSequence associated editing will fail.",
                 found);
       }
     }
@@ -195,8 +196,9 @@ public class AnnotatedPDBFileInputTest
   @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
-    jalview.bin.Jalview.main(new String[] { "-props",
-        "test/jalview/io/testProps.jvprops" });
+    jalview.bin.Jalview
+            .main(new String[]
+            { "-props", "test/jalview/io/testProps.jvprops" });
   }
 
   /**
@@ -216,11 +218,12 @@ public class AnnotatedPDBFileInputTest
     String inFile = "examples/1gaq.txt";
     String tfile = File.createTempFile("JalviewTest", ".jvp")
             .getAbsolutePath();
-    AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded(
-            inFile, DataSourceType.FILE);
+    AlignFrame af = new jalview.io.FileLoader()
+            .LoadFileWaitTillLoaded(inFile, DataSourceType.FILE);
     assertTrue("Didn't read input file " + inFile, af != null);
+    af.saveAlignment(tfile, FileFormat.Jalview);
     assertTrue("Failed to store as a project.",
-            af.saveAlignment(tfile, FileFormat.Jalview));
+            af.isSaveAlignmentSuccessful());
     af.closeMenuItem_actionPerformed(true);
     af = null;
     af = new jalview.io.FileLoader().LoadFileWaitTillLoaded(tfile,
@@ -234,21 +237,21 @@ public class AnnotatedPDBFileInputTest
         sq = sq.getDatasetSequence();
       }
       assertNotNull(sq.getAllPDBEntries());
-      assertEquals("Expected only one PDB ID", 1, sq.getAllPDBEntries()
-              .size());
+      assertEquals("Expected only one PDB ID", 1,
+              sq.getAllPDBEntries().size());
       for (PDBEntry pdbentry : sq.getAllPDBEntries())
       {
-        System.err.println("PDB Entry " + pdbentry.getId() + " "
-                + pdbentry.getFile());
+        System.err.println(
+                "PDB Entry " + pdbentry.getId() + " " + pdbentry.getFile());
         boolean exists = false, found = false;
         for (AlignmentAnnotation ana : sq.getAnnotation())
         {
           System.err.println("CalcId " + ana.getCalcId());
           if (ana.getCalcId() != null
-                  && MCview.PDBfile.isCalcIdHandled(ana.getCalcId()))
+                  && mc_view.PDBfile.isCalcIdHandled(ana.getCalcId()))
           {
             exists = true;
-            if (MCview.PDBfile.isCalcIdForFile(ana, pdbentry.getId()))
+            if (mc_view.PDBfile.isCalcIdForFile(ana, pdbentry.getId()))
             {
               found = true;
             }
@@ -256,8 +259,10 @@ public class AnnotatedPDBFileInputTest
         }
         if (exists)
         {
-          assertTrue("Couldn't find any annotation for " + pdbentry.getId()
-                  + " (file handle " + pdbentry.getFile() + ")", found);
+          assertTrue(
+                  "Couldn't find any annotation for " + pdbentry.getId()
+                          + " (file handle " + pdbentry.getFile() + ")",
+                  found);
         }
       }
     }