From 719e685759270924023f3752a31868baf64f942b Mon Sep 17 00:00:00 2001 From: David Roazen Date: Wed, 9 Jul 2014 12:09:27 -0400 Subject: [PATCH] Remove junit imports in the test suite --- .../genotyper/StandardCallerArgumentCollectionUnitTest.java | 2 +- .../variantrecalibration/ApplyRecalibrationUnitTest.java | 2 +- .../variantrecalibration/VariantDataManagerUnitTest.java | 5 +++-- .../reference/ReferenceDataSourceIntegrationTest.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/genotyper/StandardCallerArgumentCollectionUnitTest.java b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/genotyper/StandardCallerArgumentCollectionUnitTest.java index 67c7ae889..ab34d9e67 100644 --- a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/genotyper/StandardCallerArgumentCollectionUnitTest.java +++ b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/genotyper/StandardCallerArgumentCollectionUnitTest.java @@ -45,13 +45,13 @@ */ package org.broadinstitute.gatk.tools.walkers.genotyper; -import junit.framework.Assert; import org.broadinstitute.gatk.engine.GenomeAnalysisEngine; import org.broadinstitute.gatk.engine.arguments.StandardCallerArgumentCollection; import org.broadinstitute.gatk.tools.walkers.haplotypecaller.HaplotypeCallerArgumentCollection; import org.testng.SkipException; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import org.testng.Assert; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantrecalibration/ApplyRecalibrationUnitTest.java b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantrecalibration/ApplyRecalibrationUnitTest.java index f64ecb348..78d29df36 100644 --- a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantrecalibration/ApplyRecalibrationUnitTest.java +++ b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantrecalibration/ApplyRecalibrationUnitTest.java @@ -46,10 +46,10 @@ package org.broadinstitute.gatk.tools.walkers.variantrecalibration; -import junit.framework.Assert; import org.broadinstitute.gatk.utils.BaseTest; import htsjdk.variant.vcf.VCFConstants; import org.testng.annotations.Test; +import org.testng.Assert; /** * Created with IntelliJ IDEA. diff --git a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantrecalibration/VariantDataManagerUnitTest.java b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantrecalibration/VariantDataManagerUnitTest.java index f07961265..36c75a03b 100644 --- a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantrecalibration/VariantDataManagerUnitTest.java +++ b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantrecalibration/VariantDataManagerUnitTest.java @@ -48,11 +48,12 @@ package org.broadinstitute.gatk.tools.walkers.variantrecalibration; import org.apache.commons.lang.ArrayUtils; import org.broadinstitute.gatk.utils.BaseTest; -import org.junit.Assert; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.ArrayList; import java.util.List; +import java.util.Arrays; /** * Created with IntelliJ IDEA. @@ -109,7 +110,7 @@ public class VariantDataManagerUnitTest extends BaseTest { meanVector[iii] = vdm.mean(iii, true); } final List 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 diff --git a/public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/engine/datasources/reference/ReferenceDataSourceIntegrationTest.java b/public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/engine/datasources/reference/ReferenceDataSourceIntegrationTest.java index 8ffbb7d39..46a4cb5f1 100644 --- a/public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/engine/datasources/reference/ReferenceDataSourceIntegrationTest.java +++ b/public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/engine/datasources/reference/ReferenceDataSourceIntegrationTest.java @@ -25,10 +25,10 @@ package org.broadinstitute.gatk.engine.datasources.reference; -import junit.framework.Assert; import org.broadinstitute.gatk.engine.walkers.WalkerTest; import org.broadinstitute.gatk.utils.exceptions.UserException; import org.testng.annotations.Test; +import org.testng.Assert; import java.io.File; import java.io.IOException;