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
JAL-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob
[jalview.git]
/
test
/
jalview
/
ext
/
jmol
/
PDBFileWithJmolTest.java
diff --git
a/test/jalview/ext/jmol/PDBFileWithJmolTest.java
b/test/jalview/ext/jmol/PDBFileWithJmolTest.java
index
87078a9
..
fa3922b
100644
(file)
--- 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.
*
*
* This file is part of Jalview.
*
@@
-22,11
+22,6
@@
package jalview.ext.jmol;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
-import java.util.Vector;
-
-import MCview.PDBfile;
import jalview.bin.Cache;
import jalview.datamodel.Alignment;
import jalview.bin.Cache;
import jalview.datamodel.Alignment;
@@
-36,19
+31,26
@@
import jalview.gui.AlignFrame;
import jalview.io.AppletFormatAdapter;
import jalview.io.FileLoader;
import jalview.io.AppletFormatAdapter;
import jalview.io.FileLoader;
+import java.util.Vector;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import MCview.PDBfile;
+
/**
* @author jimp
*
*/
public class PDBFileWithJmolTest
{
/**
* @author jimp
*
*/
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"
// };
// "./examples/DNMT1_MOUSE.pdb"
// };
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp()
{
Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
public void setUp()
{
Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
@@
-57,7
+59,7
@@
public class PDBFileWithJmolTest
Boolean.TRUE.toString());
}
Boolean.TRUE.toString());
}
- @Test
+ @Test(groups = { "Functional" })
public void testAlignmentLoader() throws Exception
{
for (String f : testFile)
public void testAlignmentLoader() throws Exception
{
for (String f : testFile)
@@
-69,7
+71,7
@@
public class PDBFileWithJmolTest
}
}
}
}
- @Test
+ @Test(groups = { "Functional" })
public void testFileParser() throws Exception
{
for (String pdbStr : testFile)
public void testFileParser() throws Exception
{
for (String pdbStr : testFile)
@@
-91,14
+93,12
@@
public class PDBFileWithJmolTest
+ " to the same sequence as MCView",
sq.getSequenceAsString(), mcseqs.remove(0)
.getSequenceAsString());
+ " 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);
}
}
}
validateSecStrRows(al);
}
}
}
-
private void validateSecStrRows(AlignmentI al)
{
if (!al.isNucleotide())
private void validateSecStrRows(AlignmentI al)
{
if (!al.isNucleotide())