git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into efficiency/JAL-2034_JAL-1421
[jalview.git]
/
test
/
jalview
/
io
/
AnnotatedPDBFileInputTest.java
diff --git
a/test/jalview/io/AnnotatedPDBFileInputTest.java
b/test/jalview/io/AnnotatedPDBFileInputTest.java
index
c472576
..
e6019aa
100644
(file)
--- a/
test/jalview/io/AnnotatedPDBFileInputTest.java
+++ b/
test/jalview/io/AnnotatedPDBFileInputTest.java
@@
-31,6
+31,8
@@
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
+import jalview.structure.StructureImportSettings;
+import jalview.structure.StructureImportSettings.StructureParser;
import java.io.File;
import java.io.File;
@@
-65,6
+67,9
@@
public class AnnotatedPDBFileInputTest
al = af.getViewport().getAlignment();
pdbId = al.getSequenceAt(0).getDatasetSequence().getAllPDBEntries()
.get(0).getId();
al = af.getViewport().getAlignment();
pdbId = al.getSequenceAt(0).getDatasetSequence().getAllPDBEntries()
.get(0).getId();
+ StructureImportSettings.setDefaultStructureFileFormat("PDB");
+ StructureImportSettings
+ .setDefaultPDBFileParser(StructureParser.JALVIEW_PARSER);
}
@Test(groups = { "Functional" })
}
@Test(groups = { "Functional" })
@@
-180,7
+185,7
@@
public class AnnotatedPDBFileInputTest
/**
* @throws java.lang.Exception
*/
/**
* @throws java.lang.Exception
*/
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception
{
jalview.gui.Desktop.instance.closeAll_actionPerformed(null);
public static void tearDownAfterClass() throws Exception
{
jalview.gui.Desktop.instance.closeAll_actionPerformed(null);