zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating TestNG to the latest version 

-- changed SkipException constructors that are now private in TestNG
-- Updated build.xml to use the latest testng
-- Added guice dependency to ivy
-- Fixed broken SampleDBUnitTest

The SampleDBUnitTest was only passing before because the map comparison in the old TestNG was broken. It was comparing two DIFFERENT samples and testing for "equals"

GSA-695 #resolve
This commit is contained in:
Mauricio Carneiro 2013-02-14 22:02:30 -05:00
parent c8a01e6569
commit 4ac50c89ad
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -1073,7 +1073,7 @@
<property name="report" value="${build.dir}/report"/> <property name="report" value="${build.dir}/report"/>
<property name="iwww.report.dir" value="${user.home}/private_html/report"/> <property name="iwww.report.dir" value="${user.home}/private_html/report"/>
<property name="test.output" value="${dist.dir}/test"/> <property name="test.output" value="${dist.dir}/test"/>
<property name="testng.jar" value="${lib.dir}/testng-5.14.1.jar"/> <property name="testng.jar" value="${lib.dir}/testng-6.8.jar"/>
<path id="java.test.source.path"> <path id="java.test.source.path">
<dirset dir="${basedir}"> <dirset dir="${basedir}">

3
ivy.xml
View File

@ -84,9 +84,10 @@
<dependency org="org.scala-lang" name="scala-library" rev="2.9.2"/> <dependency org="org.scala-lang" name="scala-library" rev="2.9.2"/>
<!-- testing and evaluation dependencies --> <!-- testing and evaluation dependencies -->
<dependency org="org.testng" name="testng" rev="5.14.1"/> <dependency org="org.testng" name="testng" rev="6.8"/>
<dependency org="org.uncommons" name="reportng" rev="1.1.2"/> <dependency org="org.uncommons" name="reportng" rev="1.1.2"/>
<dependency org="com.google.caliper" name="caliper" rev="0.5-rc1"/> <dependency org="com.google.caliper" name="caliper" rev="0.5-rc1"/>
<dependency org="com.google.inject" name="guice" rev="3.0"/>
<!-- Contracts for Java and dependencies --> <!-- Contracts for Java and dependencies -->
<dependency org="com.google.code.cofoja" name="cofoja" rev="1.0-r139"/> <dependency org="com.google.code.cofoja" name="cofoja" rev="1.0-r139"/>

2
public/java/test/org/broadinstitute/sting/gatk/samples/SampleDBUnitTest.java
View File

@ -60,7 +60,7 @@ public class SampleDBUnitTest extends BaseTest {
private static final Set<Sample> testPEDFamilyF3 = new HashSet<Sample>(Arrays.asList( private static final Set<Sample> testPEDFamilyF3 = new HashSet<Sample>(Arrays.asList(
new Sample("s1", "fam3", "d1", "m1", Gender.FEMALE, Affection.AFFECTED), new Sample("s1", "fam3", "d1", "m1", Gender.FEMALE, Affection.AFFECTED),
new Sample("d1", "fam3", null, null, Gender.FEMALE, Affection.UNKNOWN), new Sample("d1", "fam3", null, null, Gender.MALE, Affection.UNKNOWN),
new Sample("m1", "fam3", null, null, Gender.FEMALE, Affection.UNKNOWN) new Sample("m1", "fam3", null, null, Gender.FEMALE, Affection.UNKNOWN)
)); ));