X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraCommandsTest.java;h=29c7d1603aad120405de34cdc9d0e16d5e1414f7;hb=6971cef43ca33a794aef8e8493ba7301d921444e;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..29c7d16 100644
--- a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
@@ -1,7 +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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
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 +29,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>>> map = new LinkedHashMap>>>();
@@ -41,33 +61,27 @@ public class ChimeraCommandsTest
// inspect positions
List 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()
{