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-4313 Clamp start and end ranges to array size
[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
bcad464
..
4047660
100644
(file)
--- a/
test/jalview/ext/jmol/JmolParserTest.java
+++ b/
test/jalview/ext/jmol/JmolParserTest.java
@@
-42,7
+42,7
@@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import MCview.PDBfile;
+import mc_view.PDBfile;
/**
* @author jimp
/**
* @author jimp
@@
-98,11
+98,11
@@
public class JmolParserTest
public void setUp()
{
Cache.loadProperties("test/jalview/io/testProps.jvprops");
public void setUp()
{
Cache.loadProperties("test/jalview/io/testProps.jvprops");
- Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
+ Cache.setPropertyNoSave("STRUCT_FROM_PDB",
Boolean.TRUE.toString());
Boolean.TRUE.toString());
- Cache.applicationProperties.setProperty("ADD_TEMPFACT_ANN",
+ Cache.setPropertyNoSave("ADD_TEMPFACT_ANN",
Boolean.FALSE.toString());
Boolean.FALSE.toString());
- Cache.applicationProperties.setProperty("ADD_SS_ANN",
+ Cache.setPropertyNoSave("ADD_SS_ANN",
Boolean.TRUE.toString());
StructureImportSettings.setDefaultStructureFileFormat("PDB");
StructureImportSettings
Boolean.TRUE.toString());
StructureImportSettings.setDefaultStructureFileFormat("PDB");
StructureImportSettings
@@
-277,6
+277,11
@@
public class JmolParserTest
assertEquals(structureData.getId(), "localstruct");
assertNotNull(structureData.getSeqs());
/*
assertEquals(structureData.getId(), "localstruct");
assertNotNull(structureData.getSeqs());
/*
+ * local structures have a fake ID
+ */
+ assertTrue(structureData.getSeqs().get(0).getAllPDBEntries().get(0)
+ .fakedPDBId());
+ /*
* the ID is also the group for features derived from structure data
*/
String featureGroup = structureData.getSeqs().get(0)
* the ID is also the group for features derived from structure data
*/
String featureGroup = structureData.getSeqs().get(0)