From: Jim Procter <j.procter@dundee.ac.uk>
Date: Wed, 15 Sep 2021 06:34:28 +0000 (+0100)
Subject: Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
X-Git-Tag: Release_2_11_2_0~35^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2f8e3fb6186c69af8559ac0ca151a338044c320d;hp=58c95c9a09a81cdb59a65ed3e45b9c091fd491f0;p=jalview.git

Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
---

diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java
index ad3cfc1..4685e4c 100644
--- a/test/jalview/gui/StructureChooserTest.java
+++ b/test/jalview/gui/StructureChooserTest.java
@@ -20,40 +20,34 @@
  */
 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.api.FTSRestClientI;
 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;
 
+@Test(singleThreaded = true)
 public class StructureChooserTest
 {
 
@@ -137,10 +131,21 @@ public class StructureChooserTest
 
     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();