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

diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java
index 9529d9f..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,15 +91,18 @@ public class StructureChooserTest
   public void buildQueryTest()
   {
     System.out.println("seq >>>> " + seq);
-    String query = StructureChooser.buildQuery(seq);
+    
+    StructureChooserQuerySource scquery = StructureChooserQuerySource.getQuerySourceFor(new SequenceI[] { seq});
+    assertTrue(scquery instanceof PDBStructureChooserQuerySource);
+    String query = scquery.buildQuery(seq);
     assertEquals("pdb_id:1tim", query);
     seq.getAllPDBEntries().clear();
-    query = StructureChooser.buildQuery(seq);
+    query = scquery.buildQuery(seq);
     assertEquals(
             "text:XYZ_1 OR text:XYZ_2 OR text:XYZ_3 OR text:XYZ_4 OR text:4kqy",
             query);
     seq.setDBRefs(null);
-    query = StructureChooser.buildQuery(seq);
+    query = scquery.buildQuery(seq);
     System.out.println(query);
     assertEquals("text:4kqy", query);
 
@@ -119,7 +125,7 @@ public class StructureChooserTest
     System.out.println("");
     System.out.println(seq.getDBRefs());
     System.out.println(query);
-    query = StructureChooser.buildQuery(seq);
+    query = scquery.buildQuery(seq);
     assertEquals(
             "uniprot_accession:P12345 OR uniprot_id:P12345 OR pdb_id:1xyz",
             query);
@@ -164,17 +170,17 @@ public class StructureChooserTest
   public void sanitizeSeqNameTest()
   {
     String name = "ab_cdEF|fwxyz012349";
-    assertEquals(name, StructureChooser.sanitizeSeqName(name));
+    assertEquals(name, PDBStructureChooserQuerySource.sanitizeSeqName(name));
 
     // remove a [nn] substring
     name = "abcde12[345]fg";
-    assertEquals("abcde12fg", StructureChooser.sanitizeSeqName(name));
+    assertEquals("abcde12fg", PDBStructureChooserQuerySource.sanitizeSeqName(name));
 
     // remove characters other than a-zA-Z0-9 | or _
     name = "ab[cd],.\t£$*!- \\\"@:e";
-    assertEquals("abcde", StructureChooser.sanitizeSeqName(name));
+    assertEquals("abcde", PDBStructureChooserQuerySource.sanitizeSeqName(name));
 
     name = "abcde12[345a]fg";
-    assertEquals("abcde12345afg", StructureChooser.sanitizeSeqName(name));
+    assertEquals("abcde12345afg", PDBStructureChooserQuerySource.sanitizeSeqName(name));
   }
 }