Update tests to use ScalaTest 3.0.1

This commit is contained in:
str4d
2016-12-29 18:54:23 +00:00
parent 14ca463499
commit 91007735a1
15 changed files with 51 additions and 23 deletions

View File

@@ -141,10 +141,13 @@
<!-- scala paths -->
<target name="scala.init">
<property name="scala-library.jar" value="${scalatest.libs}/scala-library.jar" />
<property name="scala-xml.jar" value="${scalatest.libs}/scala-xml.jar" />
<property name="scalactic.jar" value="${scalatest.libs}/scalactic.jar" />
<property name="scalatest.jar" value="${scalatest.libs}/scalatest.jar" />
<taskdef resource="scala/tools/ant/antlib.xml">
<classpath>
<pathelement location="${scalatest.libs}/scala-compiler.jar" />
<pathelement location="${scalatest.libs}/scala-reflect.jar" />
<pathelement location="${scala-library.jar}" />
</classpath>
</taskdef>
@@ -158,6 +161,7 @@
<classpath>
<pathelement location="${javac.classpath.mod}" />
<pathelement location="${scala-library.jar}" />
<pathelement location="${scalactic.jar}" />
<pathelement location="${scalatest.jar}" />
<pathelement location="./build/obj" />
</classpath>
@@ -264,6 +268,8 @@
<taskdef name="scalatest" classname="org.scalatest.tools.ScalaTestAntTask">
<classpath>
<pathelement location="${scala-library.jar}" />
<pathelement location="${scala-xml.jar}" />
<pathelement location="${scalactic.jar}" />
<pathelement location="${scalatest.jar}" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />