Merge branch 'develop' into Release_2_9_Branch

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

diff --git a/test/jalview/gui/JAL1353bugdemo.java b/test/jalview/gui/JAL1353bugdemo.java
index 438a208..be4df37 100644 (file)
--- a/test/jalview/gui/JAL1353bugdemo.java
+++ b/test/jalview/gui/JAL1353bugdemo.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,10 +20,8 @@
  */
 package jalview.gui;
 
-import static org.junit.Assert.*;
 import jalview.bin.Cache;
 
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -35,17 +33,16 @@ import javax.swing.JFrame;
 import javax.swing.JInternalFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
-import javax.swing.JPanel;
 import javax.swing.JTextArea;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 public class JAL1353bugdemo
 {
 
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
   }
@@ -57,7 +54,7 @@ public class JAL1353bugdemo
 
   volatile boolean finish = false;
 
-  @Test
+  @Test(groups = { "Functional" }, enabled = false)
   public void test()
   {
     Cache.initLogger();