X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FFeatureColourTest.java;h=6be66d26dc0645effa5b7a04901187ddc8a710db;hb=ff471e9978e2c6ca49f4395184fb8156488de460;hp=db4fe4096a42e70a3b06a095c9f5b1c8df433ad9;hpb=3560e7483e384409a8760a81dac9a424a66f7a17;p=jalview.git diff --git a/test/jalview/schemes/FeatureColourTest.java b/test/jalview/schemes/FeatureColourTest.java index db4fe40..6be66d2 100644 --- a/test/jalview/schemes/FeatureColourTest.java +++ b/test/jalview/schemes/FeatureColourTest.java @@ -25,6 +25,7 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertTrue; import static org.testng.AssertJUnit.fail; +import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals; import jalview.datamodel.SequenceFeature; import jalview.gui.JvOptionPane; @@ -33,11 +34,11 @@ import jalview.util.Format; import java.awt.Color; -import junit.extensions.PA; - import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import junit.extensions.PA; + public class FeatureColourTest { @@ -121,7 +122,7 @@ public class FeatureColourTest assertTrue(fc1.isColourByLabel()); assertFalse(fc1.isGraduatedColour()); assertTrue(fc1.isColourByAttribute()); - assertEquals("AF", fc1.getAttributeName()); + assertArrayEquals(new String[] { "AF" }, fc1.getAttributeName()); /* * colour by attribute (value) @@ -134,7 +135,7 @@ public class FeatureColourTest assertTrue(fc1.isGraduatedColour()); assertFalse(fc1.isColourByLabel()); assertTrue(fc1.isColourByAttribute()); - assertEquals("AF", fc1.getAttributeName()); + assertArrayEquals(new String[] { "AF" }, fc1.getAttributeName()); assertTrue(fc1.isAboveThreshold()); assertEquals(12f, fc1.getThreshold()); assertEquals(Color.gray, fc1.getMinColour()); @@ -190,7 +191,7 @@ public class FeatureColourTest assertTrue(fc1.isGraduatedColour()); assertFalse(fc1.isColourByLabel()); assertTrue(fc1.isColourByAttribute()); - assertEquals("AF", fc1.getAttributeName()); + assertEquals(new String[] { "AF" }, fc1.getAttributeName()); assertEquals(13f, fc1.getMin()); assertEquals(36f, fc1.getMax()); assertFalse((boolean) PA.getValue(fc1, "isHighToLow"));