From 60b467249ff016c9376474933fc46598ddb027bf Mon Sep 17 00:00:00 2001
From: Jim Procter <j.procter@dundee.ac.uk>
Date: Tue, 14 Sep 2021 18:59:44 +0100
Subject: [PATCH] JAL-3829 test flakiness and human flakiness

---
 test/jalview/gui/StructureChooserTest.java |   30 ++++++++++------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java
index 57aa23c..918b857 100644
--- a/test/jalview/gui/StructureChooserTest.java
+++ b/test/jalview/gui/StructureChooserTest.java
@@ -21,40 +21,30 @@
 package jalview.gui;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.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 javax.swing.JComboBox;
-
-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
@@ -154,7 +144,7 @@ public class StructureChooserTest
 
     }
     // report items when this fails - seems to be a race condition
-    assertEquals(optionsSize,2,items.toString()); 
+    Assert.assertEquals(items.toString(),optionsSize,2); 
 
     sc.populateFilterComboBox(true, false);
     optionsSize = sc.getCmbFilterOption().getItemCount();
-- 
1.7.10.2