X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FJmolParserTest.java;h=b0e0718d9a29ce0e331f00b7d7991fc61b46a9a2;hb=4e3166c6b7348b10af5ee6526a83eaa78191b1b6;hp=0010321ddb7db61017baa2d112aa12367d2d4659;hpb=56d75bc01515a2709263a5b30de447f28c4fa5c1;p=jalview.git diff --git a/test/jalview/ext/jmol/JmolParserTest.java b/test/jalview/ext/jmol/JmolParserTest.java index 0010321..b0e0718 100644 --- a/test/jalview/ext/jmol/JmolParserTest.java +++ b/test/jalview/ext/jmol/JmolParserTest.java @@ -109,7 +109,6 @@ public class JmolParserTest @Test(groups = { "Functional" }) public void testFileParser() throws Exception { - StructureImportSettings.setProcessHETATMs(false); for (String pdbStr : testFile) { PDBfile mctest = new PDBfile(false, false, false, pdbStr, @@ -133,30 +132,7 @@ public class JmolParserTest validateSecStrRows(al); } } - StructureImportSettings.setProcessHETATMs(true); - for (String pdbStr : testFile) - { - PDBfile mctest = new PDBfile(false, false, false, pdbStr, - AppletFormatAdapter.FILE); - JmolParser jtest = new JmolParser(false, false, false, pdbStr, - jalview.io.AppletFormatAdapter.FILE); - Vector seqs = jtest.getSeqs(), mcseqs = mctest.getSeqs(); - assertTrue( - "No sequences extracted from testfile\n" - + (jtest.hasWarningMessage() ? jtest.getWarningMessage() - : "(No warnings raised)"), seqs != null - && seqs.size() > 0); - for (SequenceI sq : seqs) - { - assertEquals("JMol didn't process " + pdbStr - + " to the same sequence as MCView", - sq.getSequenceAsString(), mcseqs.remove(0) - .getSequenceAsString()); - AlignmentI al = new Alignment(new SequenceI[] { sq }); - validateSecStrRows(al); - } - } } private void validateSecStrRows(AlignmentI al)