Merge pull request #678 from broadinstitute/dr_remove_junit_imports

Remove junit imports in the test suite
This commit is contained in:
droazen 2014-07-09 14:40:38 -04:00
commit a85bc0b577
4 changed files with 6 additions and 5 deletions

View File

@ -45,13 +45,13 @@
*/ */
package org.broadinstitute.gatk.tools.walkers.genotyper; package org.broadinstitute.gatk.tools.walkers.genotyper;
import junit.framework.Assert;
import org.broadinstitute.gatk.engine.GenomeAnalysisEngine; import org.broadinstitute.gatk.engine.GenomeAnalysisEngine;
import org.broadinstitute.gatk.engine.arguments.StandardCallerArgumentCollection; import org.broadinstitute.gatk.engine.arguments.StandardCallerArgumentCollection;
import org.broadinstitute.gatk.tools.walkers.haplotypecaller.HaplotypeCallerArgumentCollection; import org.broadinstitute.gatk.tools.walkers.haplotypecaller.HaplotypeCallerArgumentCollection;
import org.testng.SkipException; import org.testng.SkipException;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import org.testng.Assert;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;

View File

@ -46,10 +46,10 @@
package org.broadinstitute.gatk.tools.walkers.variantrecalibration; package org.broadinstitute.gatk.tools.walkers.variantrecalibration;
import junit.framework.Assert;
import org.broadinstitute.gatk.utils.BaseTest; import org.broadinstitute.gatk.utils.BaseTest;
import htsjdk.variant.vcf.VCFConstants; import htsjdk.variant.vcf.VCFConstants;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import org.testng.Assert;
/** /**
* Created with IntelliJ IDEA. * Created with IntelliJ IDEA.

View File

@ -48,11 +48,12 @@ package org.broadinstitute.gatk.tools.walkers.variantrecalibration;
import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ArrayUtils;
import org.broadinstitute.gatk.utils.BaseTest; import org.broadinstitute.gatk.utils.BaseTest;
import org.junit.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Arrays;
/** /**
* Created with IntelliJ IDEA. * Created with IntelliJ IDEA.
@ -109,7 +110,7 @@ public class VariantDataManagerUnitTest extends BaseTest {
meanVector[iii] = vdm.mean(iii, true); meanVector[iii] = vdm.mean(iii, true);
} }
final List<Integer> order = vdm.calculateSortOrder(meanVector); final List<Integer> order = vdm.calculateSortOrder(meanVector);
Assert.assertArrayEquals(new int[]{2,1,0}, ArrayUtils.toPrimitive(order.toArray(new Integer[order.size()]))); Assert.assertTrue(Arrays.equals(new int[]{2,1,0}, ArrayUtils.toPrimitive(order.toArray(new Integer[order.size()]))));
} }
@Test @Test

View File

@ -25,10 +25,10 @@
package org.broadinstitute.gatk.engine.datasources.reference; package org.broadinstitute.gatk.engine.datasources.reference;
import junit.framework.Assert;
import org.broadinstitute.gatk.engine.walkers.WalkerTest; import org.broadinstitute.gatk.engine.walkers.WalkerTest;
import org.broadinstitute.gatk.utils.exceptions.UserException; import org.broadinstitute.gatk.utils.exceptions.UserException;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import org.testng.Assert;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;