X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPDBSearchPanelTest.java;h=31766bb6b2f76e57abec7194bffcfe7bd45779da;hb=dc1ad37588e94cbc9ebbfaab2e9e49407f464310;hp=e06a870cd8365ad86de87c9dede84efd21aa3649;hpb=3412b273e964fb1a9d22564b04a5f0c827ec2461;p=jalview.git

diff --git a/test/jalview/gui/PDBSearchPanelTest.java b/test/jalview/gui/PDBSearchPanelTest.java
index e06a870..31766bb 100644
--- a/test/jalview/gui/PDBSearchPanelTest.java
+++ b/test/jalview/gui/PDBSearchPanelTest.java
@@ -1,17 +1,39 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
+
 import javax.swing.JInternalFrame;
 import javax.swing.JTextField;
 
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
 public class PDBSearchPanelTest
 {
 
-  @BeforeMethod
+  @BeforeMethod(alwaysRun = true)
   public void setUp() throws Exception
   {
   }
@@ -21,7 +43,7 @@ public class PDBSearchPanelTest
   {
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void populateCmbSearchTargetOptionsTest()
   {
     PDBSearchPanel searchPanel = new PDBSearchPanel(null);
@@ -29,7 +51,7 @@ public class PDBSearchPanelTest
     searchPanel.populateCmbSearchTargetOptions();
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testDecodeSearchTerm()
   {
     String expectedString = "1xyz OR text:2xyz OR text:3xyz";
@@ -44,7 +66,7 @@ public class PDBSearchPanelTest
     assertEquals(expectedString, outcome);
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testgetPDBIdwithSpecifiedChain()
   {
 
@@ -66,7 +88,7 @@ public class PDBSearchPanelTest
     assertEquals(expectedString, outcome);
   }
 
-  @Test
+  @Test(groups = { "Network", "External" }, timeOut = 5000)
   public void txt_search_ActionPerformedTest()
   {
     PDBSearchPanel searchPanel = new PDBSearchPanel(null);