X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraCommandsTest.java;h=156f2bd4bed29c007ad9f1e9881528d047df49d1;hb=52288466dd1e71946a06fd1e6ea15fa8e652c693;hp=7dfbba1775fa9229621e2d4ac50555e523d6772c;hpb=c7fc7690c14127c28c641ea3ff8a8193652fec17;p=jalview.git

diff --git a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
index 7dfbba1..156f2bd 100644
--- a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
@@ -1,7 +1,7 @@
 package jalview.ext.rbvi.chimera;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
 
 import java.awt.Color;
 import java.util.Arrays;
@@ -9,11 +9,11 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class ChimeraCommandsTest
 {
-  @Test
+  @Test(groups = { "Functional" })
   public void testAddColourRange()
   {
     Map<Color, Map<Integer, Map<String, List<int[]>>>> map = new LinkedHashMap<Color, Map<Integer, Map<String, List<int[]>>>>();
@@ -41,33 +41,27 @@ public class ChimeraCommandsTest
     // inspect positions
     List<int[]> posList = map.get(Color.pink).get(1).get("A");
     assertEquals(2, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 2, 4 }, posList.get(0)));
-    assertTrue(Arrays.equals(new int[]
-      { 8, 8 }, posList.get(1)));
+    assertTrue(Arrays.equals(new int[] { 2, 4 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 8, 8 }, posList.get(1)));
 
     posList = map.get(Color.pink).get(1).get("B");
     assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 5, 7 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 5, 7 }, posList.get(0)));
 
     posList = map.get(Color.red).get(0).get("B");
     assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 1, 4 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 1, 4 }, posList.get(0)));
 
     posList = map.get(Color.red).get(1).get("A");
     assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 3, 5 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 3, 5 }, posList.get(0)));
 
     posList = map.get(Color.orange).get(0).get("C");
     assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[]
-      { 5, 9 }, posList.get(0)));
+    assertTrue(Arrays.equals(new int[] { 5, 9 }, posList.get(0)));
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testBuildColourCommands()
   {