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
/
ws
/
PDBSequenceFetcherTest.java
diff --git
a/test/jalview/ws/PDBSequenceFetcherTest.java
b/test/jalview/ws/PDBSequenceFetcherTest.java
index
27d2643
..
fda0198
100644
(file)
--- a/
test/jalview/ws/PDBSequenceFetcherTest.java
+++ b/
test/jalview/ws/PDBSequenceFetcherTest.java
@@
-25,7
+25,8
@@
import static org.testng.AssertJUnit.assertTrue;
import jalview.bin.Cache;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SequenceI;
import jalview.bin.Cache;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SequenceI;
-import jalview.structure.StructureViewSettings;
+import jalview.structure.StructureImportSettings;
+import jalview.structure.StructureImportSettings.StructureParser;
import jalview.ws.seqfetcher.DbSourceProxy;
import java.util.List;
import jalview.ws.seqfetcher.DbSourceProxy;
import java.util.List;
@@
-86,7
+87,9
@@
public class PDBSequenceFetcherTest
{
Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
Boolean.TRUE.toString());
{
Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
Boolean.TRUE.toString());
- StructureViewSettings.setCurrentDefaultFormat("PDB");
+ StructureImportSettings.setDefaultStructureFileFormat("PDB");
+ StructureImportSettings
+ .setDefaultPDBFileParser(StructureParser.JALVIEW_PARSER);
testRetrieveProteinSeqFromPDB();
}
testRetrieveProteinSeqFromPDB();
}
@@
-96,7
+99,7
@@
public class PDBSequenceFetcherTest
{
Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
Boolean.TRUE.toString());
{
Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
Boolean.TRUE.toString());
- StructureViewSettings.setCurrentDefaultFormat("mmCIF");
+ StructureImportSettings.setDefaultStructureFileFormat("mmCIF");
testRetrieveProteinSeqFromPDB();
}
testRetrieveProteinSeqFromPDB();
}