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-1919 initial support for mmCIF using JMol API. Created an Abstract class - Struct...
[jalview.git]
/
test
/
jalview
/
ext
/
jmol
/
JmolParserTest.java
diff --git
a/test/jalview/ext/jmol/JmolParserTest.java
b/test/jalview/ext/jmol/JmolParserTest.java
index
2a501a7
..
09b309d
100644
(file)
--- a/
test/jalview/ext/jmol/JmolParserTest.java
+++ b/
test/jalview/ext/jmol/JmolParserTest.java
@@
-49,9
+49,9
@@
public class JmolParserTest
* 1GAQ has been reduced to alpha carbons only
* 1QCF is the full PDB file including headers, HETATM etc
*/
* 1GAQ has been reduced to alpha carbons only
* 1QCF is the full PDB file including headers, HETATM etc
*/
- // String[] testFile = new String[] { "./examples/1GAQ.txt",
- // "./test/jalview/ext/jmol/1QCF.pdb" }; // ,
- String[] testFile = new String[] { "./examples/testdata/1qcf.cif" }; // ,
+ String[] testFile = new String[] { "./examples/1GAQ.txt",
+ "./test/jalview/ext/jmol/1QCF.pdb" }; // ,
+ // String[] testFile = new String[] { "./examples/testdata/1qcf.cif" }; // ,
//@formatter:off
// a modified and very cut-down extract of 4UJ4
//@formatter:off
// a modified and very cut-down extract of 4UJ4
@@
-105,11
+105,15
@@
public class JmolParserTest
@Test(groups = { "Functional" })
public void testFileParser() throws Exception
{
@Test(groups = { "Functional" })
public void testFileParser() throws Exception
{
+ boolean annotFromStructure = false;
+ boolean localSecondaryStruct = false;
+ boolean serviceSecondaryStruct = false;
for (String pdbStr : testFile)
{
PDBfile mctest = new PDBfile(false, false, false, pdbStr,
AppletFormatAdapter.FILE);
for (String pdbStr : testFile)
{
PDBfile mctest = new PDBfile(false, false, false, pdbStr,
AppletFormatAdapter.FILE);
- JmolParser jtest = new JmolParser(pdbStr,
+ JmolParser jtest = new JmolParser(annotFromStructure,
+ localSecondaryStruct, serviceSecondaryStruct, pdbStr,
jalview.io.AppletFormatAdapter.FILE);
Vector<SequenceI> seqs = jtest.getSeqs(), mcseqs = mctest.getSeqs();
jalview.io.AppletFormatAdapter.FILE);
Vector<SequenceI> seqs = jtest.getSeqs(), mcseqs = mctest.getSeqs();
@@
-175,7
+179,12
@@
public class JmolParserTest
{
PDBfile mctest = new PDBfile(false, false, false, pdbWithChainBreak,
AppletFormatAdapter.PASTE);
{
PDBfile mctest = new PDBfile(false, false, false, pdbWithChainBreak,
AppletFormatAdapter.PASTE);
- JmolParser jtest = new JmolParser(pdbWithChainBreak,
+ boolean annotFromStructure = false;
+ boolean localSecondaryStruct = false;
+ boolean serviceSecondaryStruct = false;
+ JmolParser jtest = new JmolParser(annotFromStructure,
+ localSecondaryStruct, serviceSecondaryStruct,
+ pdbWithChainBreak,
jalview.io.AppletFormatAdapter.PASTE);
Vector<SequenceI> seqs = jtest.getSeqs();
Vector<SequenceI> mcseqs = mctest.getSeqs();
jalview.io.AppletFormatAdapter.PASTE);
Vector<SequenceI> seqs = jtest.getSeqs();
Vector<SequenceI> mcseqs = mctest.getSeqs();
@@
-198,7
+207,11
@@
public class JmolParserTest
{
PDBfile mctest = new PDBfile(false, false, false, pdbWithAltLoc,
AppletFormatAdapter.PASTE);
{
PDBfile mctest = new PDBfile(false, false, false, pdbWithAltLoc,
AppletFormatAdapter.PASTE);
- JmolParser jtest = new JmolParser(pdbWithAltLoc,
+ boolean annotFromStructure = false;
+ boolean localSecondaryStruct = false;
+ boolean serviceSecondaryStruct = false;
+ JmolParser jtest = new JmolParser(annotFromStructure,
+ localSecondaryStruct, serviceSecondaryStruct, pdbWithAltLoc,
jalview.io.AppletFormatAdapter.PASTE);
Vector<SequenceI> seqs = jtest.getSeqs();
Vector<SequenceI> mcseqs = mctest.getSeqs();
jalview.io.AppletFormatAdapter.PASTE);
Vector<SequenceI> seqs = jtest.getSeqs();
Vector<SequenceI> mcseqs = mctest.getSeqs();