- Reintroduce test dependency so that the tests passing / failing is not

dependent on the contents of the integrationtest directory.  Will figure
  out how to better manage the integrationtest directory at some point in
  the future.
- Up the max heap size for tests.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4691 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
hanna 2010-11-16 19:55:20 +00:00
parent 62f02bf30a
commit 24ec35deaf
2 changed files with 4 additions and 3 deletions

View File

@ -493,7 +493,8 @@
workingDir="${basedir}" workingDir="${basedir}"
useDefaultListeners="false" useDefaultListeners="false"
listeners="org.testng.reporters.FailedReporter,org.testng.reporters.JUnitXMLReporter,org.broadinstitute.sting.StingTextReporter"> listeners="org.testng.reporters.FailedReporter,org.testng.reporters.JUnitXMLReporter,org.broadinstitute.sting.StingTextReporter">
<jvmarg value="-Djava.awt.headless=true"/> <jvmarg value="-Xmx${test.maxmemory}" />
<jvmarg value="-Djava.awt.headless=true" />
<!-- <!--
<jvmarg value="-Xdebug"/> <jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>

View File

@ -64,7 +64,7 @@ public class VariantRecalibrationWalkersIntegrationTest extends WalkerTest {
executeTest("testGenerateVariantClusters-"+params.inVCF, spec).getFirst(); executeTest("testGenerateVariantClusters-"+params.inVCF, spec).getFirst();
} }
@Test(dataProvider = "VRTest", enabled = true) @Test(dataProvider = "VRTest",dependsOnMethods="testGenerateVariantClusters")
public void testVariantRecalibrator(VRTest params) { public void testVariantRecalibrator(VRTest params) {
//System.out.printf("PARAMS FOR %s is %s%n", vcf, clusterFile); //System.out.printf("PARAMS FOR %s is %s%n", vcf, clusterFile);
WalkerTest.WalkerTestSpec spec = new WalkerTest.WalkerTestSpec( WalkerTest.WalkerTestSpec spec = new WalkerTest.WalkerTestSpec(
@ -85,7 +85,7 @@ public class VariantRecalibrationWalkersIntegrationTest extends WalkerTest {
executeTest("testVariantRecalibrator-"+params.inVCF, spec).getFirst(); executeTest("testVariantRecalibrator-"+params.inVCF, spec).getFirst();
} }
@Test(dataProvider = "VRTest", enabled = true) @Test(dataProvider = "VRTest",dependsOnMethods="testVariantRecalibrator")
public void testApplyVariantCuts(VRTest params) { public void testApplyVariantCuts(VRTest params) {
WalkerTest.WalkerTestSpec spec = new WalkerTest.WalkerTestSpec( WalkerTest.WalkerTestSpec spec = new WalkerTest.WalkerTestSpec(
"-R " + b36KGReference + "-R " + b36KGReference +