X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FStructureChooserTest.java;h=918b85789db55a5dcdc0797e89c5103d004fcb8e;hb=60b467249ff016c9376474933fc46598ddb027bf;hp=23b572f825865e139893825f8ebc173faa54d47f;hpb=876d4a91fbe3c15d7cc7cf54ee477a79ce16a706;p=jalview.git

diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java
index 23b572f..918b857 100644
--- a/test/jalview/gui/StructureChooserTest.java
+++ b/test/jalview/gui/StructureChooserTest.java
@@ -20,36 +20,31 @@
  */
 package jalview.gui;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertTrue;
 
+import java.util.Collection;
+import java.util.Vector;
+
+import org.junit.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 import jalview.datamodel.DBRefEntry;
-import jalview.datamodel.DBRefSource;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 import jalview.fts.api.FTSData;
 import jalview.fts.core.FTSRestClient;
-import jalview.fts.core.FTSRestRequest;
 import jalview.fts.service.pdb.PDBFTSRestClient;
+import jalview.fts.service.pdb.PDBFTSRestClientTest;
 import jalview.fts.service.threedbeacons.TDBeaconsFTSRestClient;
 import jalview.fts.threedbeacons.TDBeaconsFTSRestClientTest;
 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;
-import java.util.Vector;
-
-import org.junit.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
 import junit.extensions.PA;
 
 public class StructureChooserTest
@@ -131,14 +126,25 @@ public class StructureChooserTest
   public void populateFilterComboBoxTest() throws InterruptedException
   {
     TDBeaconsFTSRestClientTest.setMock();
-    PDBFTSRestClient.setMock();
+    PDBFTSRestClientTest.setMock();
 
     SequenceI[] selectedSeqs = new SequenceI[] { seq };
     StructureChooser sc = new StructureChooser(selectedSeqs, seq, null);
+    
+    // if structures are not discovered then don't
+    // populate filter options
     sc.populateFilterComboBox(false, false);
     int optionsSize = sc.getCmbFilterOption().getItemCount();
-    assertEquals(2, optionsSize); // if structures are not discovered then don't
-                                  // populate filter options
+    System.out.println("Items (no data, no cache): ");
+    StringBuilder items = new StringBuilder();
+    for (int p=0;p<optionsSize;p++)
+    {
+      items.append
+      ("- ").append(sc.getCmbFilterOption().getItemAt(p).getName()).append("\n");
+
+    }
+    // report items when this fails - seems to be a race condition
+    Assert.assertEquals(items.toString(),optionsSize,2); 
 
     sc.populateFilterComboBox(true, false);
     optionsSize = sc.getCmbFilterOption().getItemCount();
@@ -150,6 +156,9 @@ public class StructureChooserTest
     FilterOption filterOpt = (FilterOption) sc.getCmbFilterOption()
             .getSelectedItem();
     assertEquals("Cached Structures", filterOpt.getName());
+    FTSRestClient.unMock((FTSRestClient) TDBeaconsFTSRestClient.getInstance());
+    FTSRestClient.unMock((FTSRestClient) PDBFTSRestClient.getInstance());
+
   }
 
   @Test(groups = { "Network" })
@@ -170,7 +179,7 @@ public class StructureChooserTest
   public void fetchStructuresInfoMockedTest()
   {
     TDBeaconsFTSRestClientTest.setMock();
-    PDBFTSRestClient.setMock();
+    PDBFTSRestClientTest.setMock();
     SequenceI[] selectedSeqs = new SequenceI[] { upSeq };
     StructureChooser sc = new StructureChooser(selectedSeqs, seq, null);
     sc.fetchStructuresMetaData();