I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 91007735 authored by str4d's avatar str4d
Browse files

Update tests to use ScalaTest 3.0.1

parent 14ca4634
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 23 deletions
apps/routerconsole/java/build.xml
+ 10
− 1
View file @ 91007735
......@@ -455,10 +455,14 @@
<!-- 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" />
<property name="mockito.home" value="${ant.home}/lib" />
<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>
......@@ -475,8 +479,11 @@
<scalac srcdir="./test/scalatest" destdir="./build/obj_scala" deprecation="on" >
<classpath>
<pathelement location="${scala-library.jar}" />
<pathelement location="${scalactic.jar}" />
<pathelement location="${scalatest.jar}" />
<pathelement location="${scalatest.libs}/mockito-all.jar" />
<pathelement location="${mockito.home}/byte-buddy.jar" />
<pathelement location="${mockito.home}/objenesis.jar" />
<pathelement location="${mockito.home}/mockito-core.jar" />
<pathelement location="../../../core/java/build/i2pscalatest.jar" />
<pathelement location="../../../router/java/build/routerscalatest.jar" />
<pathelement location="./build/obj" />
......@@ -513,6 +520,8 @@
<classpath>
<pathelement location="${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" />
......
apps/routerconsole/java/test/scalatest/net/i2p/router/update/ConsoleUpdateManagerSpec.scala
+ 3
− 1
View file @ 91007735
......@@ -3,6 +3,7 @@ package net.i2p.router.update
import org.scalatest.FunSpec
import org.scalatest.mock.MockitoSugar
import net.i2p.app.ClientAppManager;
import net.i2p.router.RouterContext
/**
......@@ -11,7 +12,8 @@ import net.i2p.router.RouterContext
class ConsoleUpdateManagerSpec extends FunSpec with UpdateManagerBehaviors with MockitoSugar {
def consoleUpdateManager = {
val mockCtx = mock[RouterContext]
val cum = new ConsoleUpdateManager(mockCtx)
val mockMgr = mock[ClientAppManager]
val cum = new ConsoleUpdateManager(mockCtx, mockMgr, null)
cum
}
......
build.properties
+ 6
− 1
View file @ 91007735
......@@ -90,10 +90,13 @@ javac.version=1.7
# Location of the libraries required for the ScalaTest tests.
# Define this in override.properties or pass in on the command line.
# The directory must contain the following library names:
# mockito-all.jar
# scala-compiler.jar
# scala-library.jar
# scala-reflect.jar
# scala-xml.jar
# scalactic.jar
# scalatest.jar
# Tested using Scala 2.12.1, scala-xml 1.0.6, and ScalaTest 3.0.1
#scalatest.libs=/PATH/TO/SCALATEST/lib
# Location of the junit libraries
......@@ -105,12 +108,14 @@ javac.version=1.7
# Defaults to the ant library path if not set
# If set, this must point to a directory containing the files
# hamcrest-core.jar, hamcrest-library.jar, and hamcrest-integration.jar
# Tested using Hamcrest 1.3
#hamcrest.home=
# Location of the mockito libraries
# Defaults to the ant library path if not set
# If set, this must point to a directory containing the files
# mockito-core.jar, byte-buddy.jar, objenesis.jar
# Tested using Mockito 2.5.0 which requires byte-buddy 1.5.12 and objenesis 2.4
#mockito.home=
# Optional properties used in tests to enable additional tools.
......
core/java/build.xml
+ 6
− 0
View file @ 91007735
......@@ -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" />
......
core/java/test/scalatest/net/i2p/data/HashSpec.scala
+ 2
− 2
View file @ 91007735
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") {
......
core/java/test/scalatest/net/i2p/data/PrivateKeySpec.scala
+ 2
− 2
View file @ 91007735
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") {
......
core/java/test/scalatest/net/i2p/data/PublicKeySpec.scala
+ 2
− 2
View file @ 91007735
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") {
......
core/java/test/scalatest/net/i2p/data/SessionKeySpec.scala
+ 2
− 2
View file @ 91007735
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") {
......
core/java/test/scalatest/net/i2p/data/SessionTagSpec.scala
+ 2
− 2
View file @ 91007735
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") {
......
core/java/test/scalatest/net/i2p/data/SignatureSpec.scala
+ 2
− 2
View file @ 91007735
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") {
......
core/java/test/scalatest/net/i2p/data/SigningPrivateKeySpec.scala
+ 2
− 2
View file @ 91007735
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") {
......
core/java/test/scalatest/net/i2p/data/SigningPublicKeySpec.scala
+ 2
− 2
View file @ 91007735
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") {
......
core/java/test/scalatest/net/i2p/data/TunnelIdSpec.scala
+ 2
− 2
View file @ 91007735
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)
}
......
core/java/test/scalatest/net/i2p/util/VersionComparatorSpec.scala
+ 2
− 2
View file @ 91007735
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
......
router/java/build.xml
+ 6
− 0
View file @ 91007735
......@@ -116,10 +116,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>
......@@ -140,6 +143,7 @@
<classpath>
<pathelement location="${javac.classpath}" />
<pathelement location="${scala-library.jar}" />
<pathelement location="${scalactic.jar}" />
<pathelement location="${scalatest.jar}" />
<pathelement location="../../core/java/build/i2pscalatest.jar" />
<pathelement location="./build/obj" />
......@@ -222,6 +226,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" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]