X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FPDBFileWithJmolTest.java;h=fa3922b3c78c7d7be3bddc37a3a9dabd0d95e90b;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=301c70d35a3c6ca0fbc547c9d6330004fc71139f;hpb=fddf3084802b37e5cee17829e32692a4aac3e60d;p=jalview.git diff --git a/test/jalview/ext/jmol/PDBFileWithJmolTest.java b/test/jalview/ext/jmol/PDBFileWithJmolTest.java index 301c70d..fa3922b 100644 --- a/test/jalview/ext/jmol/PDBFileWithJmolTest.java +++ b/test/jalview/ext/jmol/PDBFileWithJmolTest.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -44,13 +44,13 @@ import MCview.PDBfile; */ public class PDBFileWithJmolTest { - String[] testFile = new String[] - { "./examples/1GAQ.txt", "./test/jalview/ext/jmol/1QCF.pdb" }; // , + String[] testFile = new String[] { "./examples/1GAQ.txt", + "./test/jalview/ext/jmol/1QCF.pdb" }; // , // "./examples/DNMT1_MOUSE.pdb" // }; - @BeforeMethod + @BeforeMethod(alwaysRun = true) public void setUp() { Cache.applicationProperties.setProperty("STRUCT_FROM_PDB", @@ -59,7 +59,7 @@ public class PDBFileWithJmolTest Boolean.TRUE.toString()); } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void testAlignmentLoader() throws Exception { for (String f : testFile) @@ -71,7 +71,7 @@ public class PDBFileWithJmolTest } } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void testFileParser() throws Exception { for (String pdbStr : testFile) @@ -93,14 +93,12 @@ public class PDBFileWithJmolTest + " to the same sequence as MCView", sq.getSequenceAsString(), mcseqs.remove(0) .getSequenceAsString()); - AlignmentI al = new Alignment(new SequenceI[] - { sq }); + AlignmentI al = new Alignment(new SequenceI[] { sq }); validateSecStrRows(al); } } } - private void validateSecStrRows(AlignmentI al) { if (!al.isNucleotide())