JAL-1805 modified test setup's so the are ran for groups which requires them

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

diff --git a/test/jalview/gui/PDBSearchPanelTest.java b/test/jalview/gui/PDBSearchPanelTest.java
index 17ba85a..7697bda 100644 (file)
--- a/test/jalview/gui/PDBSearchPanelTest.java
+++ b/test/jalview/gui/PDBSearchPanelTest.java
@@ -1,28 +1,29 @@
 package jalview.gui;
 
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
 
 import javax.swing.JInternalFrame;
 import javax.swing.JTextField;
 
-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 PDBSearchPanelTest
 {
 
-  @Before
+ @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
   }
 
-  @After
+  @AfterMethod
   public void tearDown() throws Exception
   {
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void populateCmbSearchTargetOptionsTest()
   {
     PDBSearchPanel searchPanel = new PDBSearchPanel(null);
@@ -30,7 +31,45 @@ public class PDBSearchPanelTest
     searchPanel.populateCmbSearchTargetOptions();
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
+  public void testDecodeSearchTerm()
+  {
+    String expectedString = "1xyz OR text:2xyz OR text:3xyz";
+    String outcome = PDBSearchPanel.decodeSearchTerm("1xyz:A;2xyz;3xyz",
+            "text");
+    // System.out.println("1 >>>>>>>>>>> " + outcome);
+    assertEquals(expectedString, outcome);
+
+    expectedString = "1xyz";
+    outcome = PDBSearchPanel.decodeSearchTerm("1xyz", "text");
+    // System.out.println("2 >>>>>>>>>>> " + outcome);
+    assertEquals(expectedString, outcome);
+  }
+
+  @Test(groups ={ "Functional" })
+  public void testgetPDBIdwithSpecifiedChain()
+  {
+
+    String expectedString = "1xyz:A";
+    String outcome = PDBSearchPanel.getPDBIdwithSpecifiedChain("1xyz",
+            "2xyz;3xyz;1xyz:A");
+    System.out.println("1 >>>>>>>>>>> " + outcome);
+    assertEquals(expectedString, outcome);
+
+    expectedString = "2xyz";
+    outcome = PDBSearchPanel.getPDBIdwithSpecifiedChain("2xyz",
+            "1xyz:A;2xyz;3xyz");
+    System.out.println("2 >>>>>>>>>>> " + outcome);
+    assertEquals(expectedString, outcome);
+
+    expectedString = "2xyz:A";
+    outcome = PDBSearchPanel.getPDBIdwithSpecifiedChain("2xyz", "2xyz:A");
+    System.out.println("3 >>>>>>>>>>> " + outcome);
+    assertEquals(expectedString, outcome);
+  }
+
+  @Test(groups =
+  { "Network", "External" }, timeOut = 5000)
   public void txt_search_ActionPerformedTest()
   {
     PDBSearchPanel searchPanel = new PDBSearchPanel(null);
@@ -47,4 +86,5 @@ public class PDBSearchPanelTest
     assertTrue(!mainFrame.getTitle().equalsIgnoreCase(
             "PDB Sequence Fetcher"));
   }
+
 }