X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FStructureChooserTest.java;h=f3c5ed8ba329e3783ba66df1949a55795c192cc7;hb=e58338b16e2eb64fd76cddffd6aae20be44f54e8;hp=66e606a33a98fcb707099db014ef78bf093c3587;hpb=cd8070808d46db2a7cdf130c84dbc04c59c20188;p=jalview.git

diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java
index 66e606a..f3c5ed8 100644
--- a/test/jalview/gui/StructureChooserTest.java
+++ b/test/jalview/gui/StructureChooserTest.java
@@ -30,7 +30,10 @@ import jalview.datamodel.PDBEntry;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 import jalview.fts.api.FTSData;
-import jalview.jbgui.GStructureChooser.FilterOption;
+import jalview.gui.structurechooser.PDBStructureChooserQuerySource;
+import jalview.gui.structurechooser.StructureChooserQuerySource;
+import jalview.gui.structurechooser.ThreeDBStructureChooserQuerySource;
+import jalview.jbgui.FilterOption;
 import jalview.ws.params.InvalidArgumentException;
 
 import java.util.Collection;
@@ -88,7 +91,9 @@ public class StructureChooserTest
   public void buildQueryTest()
   {
     System.out.println("seq >>>> " + seq);
-    StructureChooserQuerySource scquery = StructureChooserQuerySource.getPDBfts();
+    
+    StructureChooserQuerySource scquery = StructureChooserQuerySource.getQuerySourceFor(new SequenceI[] { seq});
+    assertTrue(scquery instanceof PDBStructureChooserQuerySource);
     String query = scquery.buildQuery(seq);
     assertEquals("pdb_id:1tim", query);
     seq.getAllPDBEntries().clear();
@@ -165,17 +170,17 @@ public class StructureChooserTest
   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";
-    assertEquals("abcde12fg", StructureChooserQuerySource.sanitizeSeqName(name));
+    assertEquals("abcde12fg", PDBStructureChooserQuerySource.sanitizeSeqName(name));
 
     // 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";
-    assertEquals("abcde12345afg", StructureChooserQuerySource.sanitizeSeqName(name));
+    assertEquals("abcde12345afg", PDBStructureChooserQuerySource.sanitizeSeqName(name));
   }
 }