JAL-653 JAL-1766 merge 290b1 - fix erroneous conflicts on test asserts

diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java
index 7cf4d5b..c472576 100644 (file)
--- a/test/jalview/io/AnnotatedPDBFileInputTest.java
+++ b/test/jalview/io/AnnotatedPDBFileInputTest.java
@@ -34,7 +34,6 @@ import jalview.gui.AlignFrame;
 
 import java.io.File;
 
-import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -81,8 +80,8 @@ public class AnnotatedPDBFileInputTest
     {
       for (int q = p + 1; q < avec.length; q++)
       {
-        Assert.assertNotEquals("Found a duplicate annotation row "
-                + avec[p].label, avec[p], avec[q]);
+        assertTrue("Found a duplicate annotation row "
+                + avec[p].label, avec[p] != avec[q]);
       }
     }
   }

diff --git a/test/jalview/io/Gff3tests.java b/test/jalview/io/Gff3tests.java
index e4a6119..3403f10 100644 (file)
--- a/test/jalview/io/Gff3tests.java
+++ b/test/jalview/io/Gff3tests.java
@@ -59,9 +59,9 @@ public class Gff3tests
 
     af.loadJalviewDataFile(exonerateOutput, FormatAdapter.FILE, null, null);
 
-    assertNotEquals("Expected at least one DNA protein association",
-            0, af.getViewport().getAlignment().getDataset()
-            .getCodonFrames().size(),
+    assertTrue("Expected at least one DNA protein association", 0 != af
+            .getViewport().getAlignment().getDataset().getCodonFrames()
+            .size()
             );
 
   }
@@ -135,8 +135,7 @@ public class Gff3tests
     assertFalse(
             "Failed to replace dummy seq2 with real sequence",
             seq2 instanceof SequenceDummy
-            && ((SequenceDummy) seq2).isDummy(),
-            "Failed to replace dummy seq2 with real sequence");
+                    && ((SequenceDummy) seq2).isDummy());
     String placeholderseq = new SequenceDummy("foo").getSequenceAsString();
     assertFalse("dummy replacement buggy for seq1",
             placeholderseq.equals(seq1.getSequenceAsString()));
@@ -154,8 +153,7 @@ public class Gff3tests
     assertTrue(
             "Expected at least one CDNA/Protein mapping for seq1",
             dataset.getCodonFrame(seq1) != null
-            && dataset.getCodonFrame(seq1).size() > 0,
-            "Expected at least one CDNA/Protein mapping for seq1");
+                    && dataset.getCodonFrame(seq1).size() > 0);
 
   }
   // @Test(groups ={ "Functional" })