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-3829 3d-beacons structure chooser logic (not yet finished)
[jalview.git]
/
test
/
jalview
/
gui
/
StructureChooserTest.java
diff --git
a/test/jalview/gui/StructureChooserTest.java
b/test/jalview/gui/StructureChooserTest.java
index
66e606a
..
31f5f8b
100644
(file)
--- a/
test/jalview/gui/StructureChooserTest.java
+++ b/
test/jalview/gui/StructureChooserTest.java
@@
-30,6
+30,8
@@
import jalview.datamodel.PDBEntry;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
import jalview.fts.api.FTSData;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceI;
import jalview.fts.api.FTSData;
+import jalview.gui.structurechooser.PDBStructureChooserQuerySource;
+import jalview.gui.structurechooser.StructureChooserQuerySource;
import jalview.jbgui.GStructureChooser.FilterOption;
import jalview.ws.params.InvalidArgumentException;
import jalview.jbgui.GStructureChooser.FilterOption;
import jalview.ws.params.InvalidArgumentException;
@@
-165,17
+167,17
@@
public class StructureChooserTest
public void sanitizeSeqNameTest()
{
String name = "ab_cdEF|fwxyz012349";
public void sanitizeSeqNameTest()
{
String name = "ab_cdEF|fwxyz012349";
- assertEquals(name, StructureChooserQuerySource.sanitizeSeqName(name));
+ assertEquals(name, PDBStructureChooserQuerySource.sanitizeSeqName(name));
// remove a [nn] substring
name = "abcde12[345]fg";
// remove a [nn] substring
name = "abcde12[345]fg";
- assertEquals("abcde12fg", StructureChooserQuerySource.sanitizeSeqName(name));
+ assertEquals("abcde12fg", PDBStructureChooserQuerySource.sanitizeSeqName(name));
// remove characters other than a-zA-Z0-9 | or _
name = "ab[cd],.\t£$*!- \\\"@:e";
// remove characters other than a-zA-Z0-9 | or _
name = "ab[cd],.\t£$*!- \\\"@:e";
- assertEquals("abcde", StructureChooserQuerySource.sanitizeSeqName(name));
+ assertEquals("abcde", PDBStructureChooserQuerySource.sanitizeSeqName(name));
name = "abcde12[345a]fg";
name = "abcde12[345a]fg";
- assertEquals("abcde12345afg", StructureChooserQuerySource.sanitizeSeqName(name));
+ assertEquals("abcde12345afg", PDBStructureChooserQuerySource.sanitizeSeqName(name));
}
}
}
}