From b95aa2c5c4b78241d21aafc18ef806b8171c36d1 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Thu, 15 Oct 2015 19:35:13 +0100 Subject: [PATCH] JAL-653 JAL-1766 merge 290b1 - fix erroneous conflicts on test asserts --- test/jalview/io/AnnotatedPDBFileInputTest.java | 5 ++--- test/jalview/io/Gff3tests.java | 12 +++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java index 7cf4d5b..c472576 100644 --- 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 --- 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" }) -- 1.7.10.2