JAL-2089 patch broken merge to master for Release 2.10.0b1

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

diff --git a/test/jalview/gui/SequenceRendererTest.java b/test/jalview/gui/SequenceRendererTest.java
index 3f8b96a..aa3b756 100644 (file)
--- a/test/jalview/gui/SequenceRendererTest.java
+++ b/test/jalview/gui/SequenceRendererTest.java
@@ -1,6 +1,27 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
+
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Sequence;
@@ -9,17 +30,16 @@ import jalview.schemes.ZappoColourScheme;
 
 import java.awt.Color;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class SequenceRendererTest
 {
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testGetResidueBoxColour_zappo()
   {
     SequenceI seq = new Sequence("name", "MATVLGSPRAPAFF"); // FER1_MAIZE...
-    AlignmentI al = new Alignment(new SequenceI[]
-      { seq });
+    AlignmentI al = new Alignment(new SequenceI[] { seq });
     final AlignViewport av = new AlignViewport(al);
     SequenceRenderer sr = new SequenceRenderer(av);
     av.setGlobalColourScheme(new ZappoColourScheme());