JAL-1270 JUnit to TestNG refactoring

[jalview.git] / test / jalview / util / ComparisonTest.java

diff --git a/test/jalview/util/ComparisonTest.java b/test/jalview/util/ComparisonTest.java
index bfc2610..0a40784 100644 (file)
--- a/test/jalview/util/ComparisonTest.java
+++ b/test/jalview/util/ComparisonTest.java
@@ -1,13 +1,12 @@
 package jalview.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.Test;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 
-import org.junit.Test;
-
 public class ComparisonTest
 {
 
@@ -32,6 +31,9 @@ public class ComparisonTest
     SequenceI seq = new Sequence("eightypercent", "agctuAGCPV");
     assertFalse(Comparison.isNucleotide(new SequenceI[]
     { seq }));
+    assertFalse(Comparison.isNucleotide(new SequenceI[][]
+    { new SequenceI[]
+    { seq } }));
 
     seq = new Sequence("eightyfivepercent", "agctuAGCPVagctuAGCUV");
     assertFalse(Comparison.isNucleotide(new SequenceI[]
@@ -57,17 +59,34 @@ public class ComparisonTest
 
     seq = new Sequence("DNA", "ACTugGCCAG");
     SequenceI seq2 = new Sequence("Protein", "FLIMVSPTYW");
+    /*
+     * 90% DNA:
+     */
     assertTrue(Comparison.isNucleotide(new SequenceI[]
-    { seq, seq, seq, seq, seq, seq, seq, seq, seq, seq2 })); // 90% DNA
+    { seq, seq, seq, seq, seq, seq, seq, seq, seq, seq2 }));
+    assertTrue(Comparison.isNucleotide(new SequenceI[][]
+    { new SequenceI[]
+    { seq }, new SequenceI[]
+    { seq, seq, seq }, new SequenceI[]
+    { seq, seq, seq, seq, seq, seq2 } }));
+    /*
+     * 80% DNA:
+     */
     assertFalse(Comparison.isNucleotide(new SequenceI[]
-    { seq, seq, seq, seq, seq, seq, seq, seq, seq2, seq2 })); // 80% DNA
+    { seq, seq, seq, seq, seq, seq, seq, seq, seq2, seq2 }));
+    assertFalse(Comparison.isNucleotide(new SequenceI[][]
+    { new SequenceI[]
+    { seq }, new SequenceI[]
+    { seq, seq, seq }, new SequenceI[]
+    { seq, seq, seq, seq, seq2, seq2, null } }));
 
     seq = new Sequence("ProteinThatLooksLikeDNA", "WYATGCCTGAgtcgt");
     // 12/14 = 85.7%
     assertTrue(Comparison.isNucleotide(new SequenceI[]
     { seq }));
 
-    assertFalse(Comparison.isNucleotide(null));
+    assertFalse(Comparison.isNucleotide((SequenceI[]) null));
+    assertFalse(Comparison.isNucleotide((SequenceI[][]) null));
   }
 
   /**