From eacf205f4079e55ed03dd248cbb8c1a41491c01e Mon Sep 17 00:00:00 2001
From: Mark DePristo <depristo@broadinstitute.org>
Date: Sat, 16 Jul 2011 09:22:34 -0400
Subject: [PATCH] Tests needed to be updated to reflect the code reorg of
 tribble.

---
 .../org/broadinstitute/sting/WalkerTest.java  | 21 +++++++++++--------
 .../codecs/vcf/IndexFactoryUnitTest.java      |  3 ++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/public/java/test/org/broadinstitute/sting/WalkerTest.java b/public/java/test/org/broadinstitute/sting/WalkerTest.java
index d65f4ec34..a39fa37fe 100755
--- a/public/java/test/org/broadinstitute/sting/WalkerTest.java
+++ b/public/java/test/org/broadinstitute/sting/WalkerTest.java
@@ -65,19 +65,22 @@ public class WalkerTest extends BaseTest {
                 throw new StingException("Found an index created for file " + resultFile + " but we can only validate VCF files.  Extend this code!");
             }
 
-            System.out.println("Verifying on-the-fly index " + indexFile + " for test " + name + " using file " + resultFile);
-            Index indexFromOutputFile = IndexFactory.createIndex(resultFile, new VCFCodec());
-            Index dynamicIndex = IndexFactory.loadIndex(indexFile.getAbsolutePath());
-
-            if ( ! indexFromOutputFile.equals(dynamicIndex) ) {
-                Assert.fail(String.format("Index on disk from indexing on the fly not equal to the index created after the run completed.  FileIndex %s vs. on-the-fly %s%n",
-                        indexFromOutputFile.getProperties(),
-                        dynamicIndex.getProperties()));
-            }
+            assertOnDiskIndexEqualToNewlyCreatedIndex(indexFile, name, resultFile);
         }
     }
 
 
+    public static void assertOnDiskIndexEqualToNewlyCreatedIndex(final File indexFile, final String name, final File resultFile) {
+        System.out.println("Verifying on-the-fly index " + indexFile + " for test " + name + " using file " + resultFile);
+        Index indexFromOutputFile = IndexFactory.createIndex(resultFile, new VCFCodec());
+        Index dynamicIndex = IndexFactory.loadIndex(indexFile.getAbsolutePath());
+
+        if ( ! indexFromOutputFile.equals(dynamicIndex) ) {
+            Assert.fail(String.format("Index on disk from indexing on the fly not equal to the index created after the run completed.  FileIndex %s vs. on-the-fly %s%n",
+                    indexFromOutputFile.getProperties(),
+                    dynamicIndex.getProperties()));
+        }
+    }
 
     public List<String> assertMatchingMD5s(final String name, List<File> resultFiles, List<String> expectedMD5s) {
         List<String> md5s = new ArrayList<String>();
diff --git a/public/java/test/org/broadinstitute/sting/utils/codecs/vcf/IndexFactoryUnitTest.java b/public/java/test/org/broadinstitute/sting/utils/codecs/vcf/IndexFactoryUnitTest.java
index 2f6b589f4..68a2ecf8d 100755
--- a/public/java/test/org/broadinstitute/sting/utils/codecs/vcf/IndexFactoryUnitTest.java
+++ b/public/java/test/org/broadinstitute/sting/utils/codecs/vcf/IndexFactoryUnitTest.java
@@ -4,6 +4,7 @@ import org.broad.tribble.Tribble;
 import org.broad.tribble.index.*;
 import org.broad.tribble.iterators.CloseableTribbleIterator;
 import org.broad.tribble.source.BasicFeatureSource;
+import org.broadinstitute.sting.WalkerTest;
 import org.broadinstitute.sting.utils.variantcontext.VariantContext;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -75,7 +76,7 @@ public class IndexFactoryUnitTest {
 
             // test that the input index is the same as the one created from the identical input file
             // test that the dynamic index is the same as the output index, which is equal to the input index
-            Assert.assertTrue(IndexFactory.onDiskIndexEqualToNewlyCreatedIndex(outputFile, outputFileIndex, new VCFCodec()));
+            WalkerTest.assertOnDiskIndexEqualToNewlyCreatedIndex(outputFileIndex, "unittest", outputFile);
         }
     }
 }