Merge branch 'develop' into features/JAL-653_JAL-1766_htslib_refseqsupport

[jalview.git] / test / jalview / io / Gff3tests.java

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