X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fgui%2FStructureChooserTest.java;h=71d062c242f4d58d62fbcb5947c6bbbb997e1052;hb=8bbcfb93404decd6d660ca32b69a29f8a1f34e82;hp=1e73d3e95a915ef4ac92383af3133e87b279d7df;hpb=43a44d10c88ef1ebb6e149b0a48f890c0f803247;p=jalview.git

diff --git a/test/jalview/gui/StructureChooserTest.java b/test/jalview/gui/StructureChooserTest.java
index 1e73d3e..71d062c 100644
--- a/test/jalview/gui/StructureChooserTest.java
+++ b/test/jalview/gui/StructureChooserTest.java
@@ -1,7 +1,8 @@
 package jalview.gui;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
 import jalview.datamodel.DBRefEntry;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.Sequence;
@@ -9,15 +10,15 @@ import jalview.datamodel.SequenceI;
 
 import java.util.Vector;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class StructureChooserTest
 {
   Sequence seq;
 
-  @Before
+ @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
     seq = new Sequence("PDB|4kqy|4KQY|A", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1,
@@ -39,7 +40,7 @@ public class StructureChooserTest
     seq.setPDBId(pdbIds);
   }
 
-  @After
+  @AfterMethod
   public void tearDown() throws Exception
   {
     seq = null;
@@ -47,7 +48,7 @@ public class StructureChooserTest
 
 
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void buildQueryTest()
   {
     String query = StructureChooser.buildQuery(seq);
@@ -57,7 +58,7 @@ public class StructureChooserTest
             query);
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void populateFilterComboBoxTest()
   {
     SequenceI[] selectedSeqs = new SequenceI[]
@@ -76,7 +77,7 @@ public class StructureChooserTest
                                  // should be populated
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void fetchStructuresInfoTest()
   {
     SequenceI[] selectedSeqs = new SequenceI[]