Merge branch 'bug/JAL-1707_retrieve-pdb-structure-for-rna' into Release_2_8_3_Branch

[jalview.git] / test / jalview / gui / StructureChooserTest.java

diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java
index 24e8bc9..1e73d3e 100644 (file)
--- a/test/jalview/gui/StructureChooserTest.java
+++ b/test/jalview/gui/StructureChooserTest.java
@@ -20,7 +20,8 @@ public class StructureChooserTest
   @Before
   public void setUp() throws Exception
   {
-    seq = new Sequence("Test_Seq", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1, 26);
+    seq = new Sequence("PDB|4kqy|4KQY|A", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1,
+            26);
     seq.setDatasetSequence(seq);
     for (int x = 1; x < 5; x++)
     {
@@ -49,9 +50,11 @@ public class StructureChooserTest
   @Test
   public void buildQueryTest()
   {
+    String query = StructureChooser.buildQuery(seq);
+    System.out.println(">>>>>>>>>> query : " + query);
     assertEquals(
-            "1tim OR text:XYZ_1 OR text:XYZ_2 OR text:XYZ_3 OR text:XYZ_4",
-            StructureChooser.buildQuery(seq));
+            "4kqy OR text:1tim OR text:XYZ_1 OR text:XYZ_2 OR text:XYZ_3 OR text:XYZ_4",
+            query);
   }
 
   @Test
@@ -63,13 +66,13 @@ public class StructureChooserTest
             null);
     sc.populateFilterComboBox();
     int optionsSize = sc.getCmbFilterOption().getItemCount();
-    assertEquals(2, optionsSize); // if structures are not discovered then don't
+    assertEquals(3, optionsSize); // if structures are not discovered then don't
                                   // populate filter options
 
     sc.setStructuresDiscovered(true);
     sc.populateFilterComboBox();
     optionsSize = sc.getCmbFilterOption().getItemCount();
-    assertTrue(optionsSize > 2); // if structures are found, filter options
+    assertTrue(optionsSize > 3); // if structures are found, filter options
                                  // should be populated
   }