diff --git a/public/java/test/org/broadinstitute/sting/WalkerTest.java b/public/java/test/org/broadinstitute/sting/WalkerTest.java index 24dc141ec..81ec322d7 100755 --- a/public/java/test/org/broadinstitute/sting/WalkerTest.java +++ b/public/java/test/org/broadinstitute/sting/WalkerTest.java @@ -67,6 +67,7 @@ public class WalkerTest extends BaseTest { logger.warn("Checking shadow BCF output file " + bcfFile + " against VCF file " + resultFile); try { VariantContextTestProvider.assertVCFandBCFFilesAreTheSame(resultFile, bcfFile); + logger.warn(" Shadow BCF PASSED!"); } catch ( Exception e ) { Assert.fail("Exception received reading shadow BCFFile " + bcfFile + " for test " + name, e); } @@ -103,9 +104,9 @@ public class WalkerTest extends BaseTest { for (int i = 0; i < resultFiles.size(); i++) { MD5DB.MD5Match result = assertMatchingMD5(name, resultFiles.get(i), expectedMD5s.get(i)); + validateOutputBCFIfPossible(name, resultFiles.get(i)); if ( ! result.failed ) { validateOutputIndex(name, resultFiles.get(i)); - validateOutputBCFIfPossible(name, resultFiles.get(i)); md5s.add(result.expectedMD5); } else { fails.add(result); @@ -337,8 +338,9 @@ public class WalkerTest extends BaseTest { boolean gotAnException = false; try { final String now = new SimpleDateFormat("HH:mm:ss").format(new Date()); - System.out.println(String.format("[%s] Executing test %s with GATK arguments: %s", - now, name, Utils.join(" ",command))); + final String cmdline = Utils.join(" ",command); + System.out.println(String.format("[%s] Executing test %s with GATK arguments: %s", now, name, cmdline)); + BaseTest.log(cmdline); // also write the command line to the HTML log for convenient follow-up CommandLineExecutable.start(instance, command); } catch (Exception e) { gotAnException = true; diff --git a/public/java/test/org/broadinstitute/sting/utils/variantcontext/VariantContextTestProvider.java b/public/java/test/org/broadinstitute/sting/utils/variantcontext/VariantContextTestProvider.java index 6ff6b5aa1..d6f4c1fa1 100644 --- a/public/java/test/org/broadinstitute/sting/utils/variantcontext/VariantContextTestProvider.java +++ b/public/java/test/org/broadinstitute/sting/utils/variantcontext/VariantContextTestProvider.java @@ -534,6 +534,13 @@ public class VariantContextTestProvider { public static void assertEquals(final VCFHeader actual, final VCFHeader expected) { Assert.assertEquals(actual.getMetaData().size(), expected.getMetaData().size()); - Assert.assertEquals(actual.getMetaData(), expected.getMetaData()); + + // for some reason set.equals() is returning false but all paired elements are .equals(). Perhaps compare to is busted? + //Assert.assertEquals(actual.getMetaData(), expected.getMetaData()); + final List actualLines = new ArrayList(actual.getMetaData()); + final List expectedLines = new ArrayList(expected.getMetaData()); + for ( int i = 0; i < actualLines.size(); i++ ) { + Assert.assertEquals(actualLines.get(i), expectedLines.get(i)); + } } } \ No newline at end of file