X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FJalviewColourSchemeTest.java;h=e8a70e4138344e9c9724c485b898f07ed0055bb7;hb=refs%2Fheads%2Fpatch%2FJAL-3584_cherrypickto-JAL-3676_2.11.1.1;hp=b5246bac32ffd2fd167ef51b01deaddd9916a978;hpb=a09d6f5c16b0e222806e035cd38bfb4c4eb92c75;p=jalview.git

diff --git a/test/jalview/schemes/JalviewColourSchemeTest.java b/test/jalview/schemes/JalviewColourSchemeTest.java
index b5246ba..e8a70e4 100644
--- a/test/jalview/schemes/JalviewColourSchemeTest.java
+++ b/test/jalview/schemes/JalviewColourSchemeTest.java
@@ -1,82 +1,51 @@
 package jalview.schemes;
 
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import jalview.datamodel.Alignment;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.Sequence;
-import jalview.datamodel.SequenceI;
-
 import org.testng.annotations.Test;
 
 public class JalviewColourSchemeTest
 {
   @Test(groups = "Functional")
-  public void testForName()
+  public void testGetSchemeClass()
   {
-    assertSame(JalviewColourScheme.Clustal,
-            JalviewColourScheme.forName("Clustal"));
-    assertSame(JalviewColourScheme.Clustal,
-            JalviewColourScheme.forName("CLUSTAL"));
-    assertSame(JalviewColourScheme.Blosum62,
-            JalviewColourScheme.forName("Blosum62"));
-    assertSame(JalviewColourScheme.PID,
-            JalviewColourScheme.forName("% Identity"));
-    assertSame(JalviewColourScheme.Hydrophobic,
-            JalviewColourScheme.forName("Hydrophobic"));
-    assertSame(JalviewColourScheme.Zappo,
-            JalviewColourScheme.forName("Zappo"));
-    assertSame(JalviewColourScheme.Taylor,
-            JalviewColourScheme.forName("Taylor"));
-    assertSame(JalviewColourScheme.Helix,
-            JalviewColourScheme.forName("Helix Propensity"));
-    assertSame(JalviewColourScheme.Strand,
-            JalviewColourScheme.forName("Strand Propensity"));
-    assertSame(JalviewColourScheme.Turn,
-            JalviewColourScheme.forName("Turn Propensity"));
-    assertSame(JalviewColourScheme.Buried,
-            JalviewColourScheme.forName("Buried Index"));
-    assertSame(JalviewColourScheme.Nucleotide,
-            JalviewColourScheme.forName("Nucleotide"));
-    assertSame(JalviewColourScheme.PurinePyrimidine,
-            JalviewColourScheme.forName("Purine/Pyrimidine"));
-    assertSame(JalviewColourScheme.TCoffee,
-            JalviewColourScheme.forName("T-Coffee Scores"));
-    assertSame(JalviewColourScheme.RNAHelices,
-            JalviewColourScheme.forName("RNA Helices"));
-    // assertSame(JalviewColourScheme.RNAInteraction,
-    // JalviewColourScheme.forName("RNA Interaction type"));
-    assertSame(JalviewColourScheme.UserDefined,
-            JalviewColourScheme.forName("User Defined"));
-
-    assertNull(JalviewColourScheme.forName("PID"));
-    assertNull(JalviewColourScheme.forName(""));
-    assertNull(JalviewColourScheme.forName(null));
+    assertTrue(JalviewColourScheme.Clustal.getSchemeClass() == ClustalxColourScheme.class);
+    assertTrue(JalviewColourScheme.Blosum62.getSchemeClass() == Blosum62ColourScheme.class);
+    assertTrue(JalviewColourScheme.PID.getSchemeClass() == PIDColourScheme.class);
+    assertTrue(JalviewColourScheme.Hydrophobic.getSchemeClass() == HydrophobicColourScheme.class);
+    assertTrue(JalviewColourScheme.Zappo.getSchemeClass() == ZappoColourScheme.class);
+    assertTrue(JalviewColourScheme.Taylor.getSchemeClass() == TaylorColourScheme.class);
+    assertTrue(JalviewColourScheme.Helix.getSchemeClass() == HelixColourScheme.class);
+    assertTrue(JalviewColourScheme.Strand.getSchemeClass() == StrandColourScheme.class);
+    assertTrue(JalviewColourScheme.Turn.getSchemeClass() == TurnColourScheme.class);
+    assertTrue(JalviewColourScheme.Buried.getSchemeClass() == BuriedColourScheme.class);
+    assertTrue(JalviewColourScheme.Nucleotide.getSchemeClass() == NucleotideColourScheme.class);
+    assertTrue(JalviewColourScheme.PurinePyrimidine.getSchemeClass() == PurinePyrimidineColourScheme.class);
+    assertTrue(JalviewColourScheme.TCoffee.getSchemeClass() == TCoffeeColourScheme.class);
+    assertTrue(JalviewColourScheme.RNAHelices.getSchemeClass() == RNAHelicesColour.class);
+    assertTrue(JalviewColourScheme.IdColour
+            .getSchemeClass() == IdColourScheme.class);
   }
 
   @Test(groups = "Functional")
-  public void testGetColourScheme()
+  public void testToString()
   {
-    SequenceI seq = new Sequence("Seq1", "abcd");
-    AlignmentI al = new Alignment(new SequenceI[] { seq });
-    assertTrue(JalviewColourScheme.Clustal.getColourScheme(al) instanceof ClustalxColourScheme);
-    assertTrue(JalviewColourScheme.Blosum62.getColourScheme(al) instanceof Blosum62ColourScheme);
-    assertTrue(JalviewColourScheme.PID.getColourScheme(al) instanceof PIDColourScheme);
-    assertTrue(JalviewColourScheme.Hydrophobic.getColourScheme(al) instanceof HydrophobicColourScheme);
-    assertTrue(JalviewColourScheme.Zappo.getColourScheme(al) instanceof ZappoColourScheme);
-    assertTrue(JalviewColourScheme.Taylor.getColourScheme(al) instanceof TaylorColourScheme);
-    assertTrue(JalviewColourScheme.Helix.getColourScheme(al) instanceof HelixColourScheme);
-    assertTrue(JalviewColourScheme.Strand.getColourScheme(al) instanceof StrandColourScheme);
-    assertTrue(JalviewColourScheme.Turn.getColourScheme(al) instanceof TurnColourScheme);
-    assertTrue(JalviewColourScheme.Buried.getColourScheme(al) instanceof BuriedColourScheme);
-    assertTrue(JalviewColourScheme.Nucleotide.getColourScheme(al) instanceof NucleotideColourScheme);
-    assertTrue(JalviewColourScheme.PurinePyrimidine.getColourScheme(al) instanceof PurinePyrimidineColourScheme);
-    assertTrue(JalviewColourScheme.TCoffee.getColourScheme(al) instanceof TCoffeeColourScheme);
-    assertTrue(JalviewColourScheme.RNAHelices.getColourScheme(al) instanceof RNAHelicesColour);
-    // assertTrue(JalviewColourScheme.RNAInteraction.getColourScheme(al)
-    // instanceof RNAInteractionColourScheme);
-    assertTrue(JalviewColourScheme.UserDefined.getColourScheme(al) instanceof UserColourScheme);
+    assertEquals(JalviewColourScheme.Clustal.toString(), "Clustal");
+    assertEquals(JalviewColourScheme.Blosum62.toString(), "Blosum62");
+    assertEquals(JalviewColourScheme.PID.toString(), "% Identity");
+    assertEquals(JalviewColourScheme.Zappo.toString(), "Zappo");
+    assertEquals(JalviewColourScheme.Taylor.toString(), "Taylor");
+    assertEquals(JalviewColourScheme.Hydrophobic.toString(), "Hydrophobic");
+    assertEquals(JalviewColourScheme.Helix.toString(), "Helix Propensity");
+    assertEquals(JalviewColourScheme.Strand.toString(), "Strand Propensity");
+    assertEquals(JalviewColourScheme.Turn.toString(), "Turn Propensity");
+    assertEquals(JalviewColourScheme.Buried.toString(), "Buried Index");
+    assertEquals(JalviewColourScheme.Nucleotide.toString(), "Nucleotide");
+    assertEquals(JalviewColourScheme.PurinePyrimidine.toString(),
+            "Purine/Pyrimidine");
+    assertEquals(JalviewColourScheme.TCoffee.toString(), "T-Coffee Scores");
+    assertEquals(JalviewColourScheme.RNAHelices.toString(), "RNA Helices");
+    assertEquals(JalviewColourScheme.IdColour.toString(), "Sequence ID");
   }
 }