zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tests to use ScalaTest 3.0.1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/build.xml
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" />

4
core/java/test/scalatest/net/i2p/data/HashSpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class HashSpec extends FunSpec with ShouldMatchers {
class HashSpec extends FunSpec with Matchers {
val hash = new Hash
describe("A Hash") {

4
core/java/test/scalatest/net/i2p/data/PrivateKeySpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class PrivateKeySpec extends FunSpec with ShouldMatchers {
class PrivateKeySpec extends FunSpec with Matchers {
val privateKey = new PrivateKey
describe("A PrivateKey") {

4
core/java/test/scalatest/net/i2p/data/PublicKeySpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class PublicKeySpec extends FunSpec with ShouldMatchers {
class PublicKeySpec extends FunSpec with Matchers {
val publicKey = new PublicKey
describe("A PublicKey") {

4
core/java/test/scalatest/net/i2p/data/SessionKeySpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class SessionKeySpec extends FunSpec with ShouldMatchers {
class SessionKeySpec extends FunSpec with Matchers {
val sessionKey = new SessionKey
describe("A SessionKey") {

4
core/java/test/scalatest/net/i2p/data/SessionTagSpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class SessionTagSpec extends FunSpec with ShouldMatchers {
class SessionTagSpec extends FunSpec with Matchers {
val sessionTag = new SessionTag
describe("A SessionTag") {

4
core/java/test/scalatest/net/i2p/data/SignatureSpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class SignatureSpec extends FunSpec with ShouldMatchers {
class SignatureSpec extends FunSpec with Matchers {
val signature = new Signature
describe("A Signature") {

4
core/java/test/scalatest/net/i2p/data/SigningPrivateKeySpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class SigningPrivateKeySpec extends FunSpec with ShouldMatchers {
class SigningPrivateKeySpec extends FunSpec with Matchers {
val signingPrivateKey = new SigningPrivateKey
describe("A SigningPrivateKey") {

4
core/java/test/scalatest/net/i2p/data/SigningPublicKeySpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class SigningPublicKeySpec extends FunSpec with ShouldMatchers {
class SigningPublicKeySpec extends FunSpec with Matchers {
val signingPublicKey = new SigningPublicKey
describe("A SigningPublicKey") {

4
core/java/test/scalatest/net/i2p/data/TunnelIdSpec.scala
View File

@@ -1,12 +1,12 @@
package net.i2p.data
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
/**
* @author str4d
*/
class TunnelIdSpec extends FunSpec with ShouldMatchers {
class TunnelIdSpec extends FunSpec with Matchers {
describe("A TunnelId") {
it("should be a 4 byte integer") (pending)
}

4
core/java/test/scalatest/net/i2p/util/VersionComparatorSpec.scala
View File

@@ -1,10 +1,10 @@
package net.i2p.util
import org.scalatest.FunSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.Matchers
class VersionComparatorSpec extends FunSpec with ShouldMatchers {
class VersionComparatorSpec extends FunSpec with Matchers {
private val vc = new VersionComparator