From: Jim Procter <jprocter@issues.jalview.org>
Date: Sat, 5 Sep 2015 11:17:53 +0000 (+0100)
Subject: JAL-1805 move misassigned test from Functional to Network
X-Git-Tag: Release_2_10_0~492^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=93c35921f03bd89e0e2a3d3eeb5c4898cb317166;p=jalview.git

JAL-1805 move misassigned test from Functional to Network
---

diff --git a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
index 35110a4..7b998c6 100644
--- a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
+++ b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java
@@ -40,6 +40,7 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+@Test(groups = { "Network" })
 public class DisorderAnnotExportImport
 {
   public static String testseqs = "examples/uniref50.fa";
@@ -52,7 +53,7 @@ public class DisorderAnnotExportImport
 
   public static jalview.gui.AlignFrame af = null;
 
-  @BeforeClass(alwaysRun = true)
+  @BeforeClass(inheritGroups = true)
   public static void setUpBeforeClass() throws Exception
   {
 
@@ -73,20 +74,21 @@ public class DisorderAnnotExportImport
     assertNotNull("Couldn't load test data ('" + testseqs + "')", af);
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun = true)
   public static void tearDownAfterClass() throws Exception
   {
     if (af != null)
     {
       af.setVisible(false);
       af.dispose();
+      af=null;
     }
   }
 
   /**
    * test for patches to JAL-1294
    */
-  @Test(groups ={ "Functional" })
+  @Test
   public void testDisorderAnnotExport()
   {
     disorderClient = new AADisorderClient(iupreds.get(0), af, null, null);