Changeset 91007735 for core


Ignore:
Timestamp:
Dec 29, 2016 6:54:23 PM (4 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
134cbd4
Parents:
14ca463
Message:

Update tests to use ScalaTest? 3.0.1

Location:
core/java
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • core/java/build.xml

    r14ca463 r91007735  
    142142    <target name="scala.init">
    143143        <property name="scala-library.jar" value="${scalatest.libs}/scala-library.jar" />
     144        <property name="scala-xml.jar" value="${scalatest.libs}/scala-xml.jar" />
     145        <property name="scalactic.jar" value="${scalatest.libs}/scalactic.jar" />
    144146        <property name="scalatest.jar" value="${scalatest.libs}/scalatest.jar" />
    145147        <taskdef resource="scala/tools/ant/antlib.xml">
    146148            <classpath>
    147149                <pathelement location="${scalatest.libs}/scala-compiler.jar" />
     150                <pathelement location="${scalatest.libs}/scala-reflect.jar" />
    148151                <pathelement location="${scala-library.jar}" />
    149152            </classpath>
     
    159162                <pathelement location="${javac.classpath.mod}" />
    160163                <pathelement location="${scala-library.jar}" />
     164                <pathelement location="${scalactic.jar}" />
    161165                <pathelement location="${scalatest.jar}" />
    162166                <pathelement location="./build/obj" />
     
    265269            <classpath>
    266270                <pathelement location="${scala-library.jar}" />
     271                <pathelement location="${scala-xml.jar}" />
     272                <pathelement location="${scalactic.jar}" />
    267273                <pathelement location="${scalatest.jar}" />
    268274                <pathelement location="./build/obj_cobertura" />
  • core/java/test/scalatest/net/i2p/data/HashSpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class HashSpec extends FunSpec with ShouldMatchers {
     9class HashSpec extends FunSpec with Matchers {
    1010    val hash = new Hash
    1111
  • core/java/test/scalatest/net/i2p/data/PrivateKeySpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class PrivateKeySpec extends FunSpec with ShouldMatchers {
     9class PrivateKeySpec extends FunSpec with Matchers {
    1010    val privateKey = new PrivateKey
    1111
  • core/java/test/scalatest/net/i2p/data/PublicKeySpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class PublicKeySpec extends FunSpec with ShouldMatchers {
     9class PublicKeySpec extends FunSpec with Matchers {
    1010    val publicKey = new PublicKey
    1111
  • core/java/test/scalatest/net/i2p/data/SessionKeySpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class SessionKeySpec extends FunSpec with ShouldMatchers {
     9class SessionKeySpec extends FunSpec with Matchers {
    1010    val sessionKey = new SessionKey
    1111
  • core/java/test/scalatest/net/i2p/data/SessionTagSpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class SessionTagSpec extends FunSpec with ShouldMatchers {
     9class SessionTagSpec extends FunSpec with Matchers {
    1010    val sessionTag = new SessionTag
    1111
  • core/java/test/scalatest/net/i2p/data/SignatureSpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class SignatureSpec extends FunSpec with ShouldMatchers {
     9class SignatureSpec extends FunSpec with Matchers {
    1010    val signature = new Signature
    1111
  • core/java/test/scalatest/net/i2p/data/SigningPrivateKeySpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class SigningPrivateKeySpec extends FunSpec with ShouldMatchers {
     9class SigningPrivateKeySpec extends FunSpec with Matchers {
    1010    val signingPrivateKey = new SigningPrivateKey
    1111
  • core/java/test/scalatest/net/i2p/data/SigningPublicKeySpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class SigningPublicKeySpec extends FunSpec with ShouldMatchers {
     9class SigningPublicKeySpec extends FunSpec with Matchers {
    1010    val signingPublicKey = new SigningPublicKey
    1111
  • core/java/test/scalatest/net/i2p/data/TunnelIdSpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66/**
    77 * @author str4d
    88 */
    9 class TunnelIdSpec extends FunSpec with ShouldMatchers {
     9class TunnelIdSpec extends FunSpec with Matchers {
    1010    describe("A TunnelId") {
    1111        it("should be a 4 byte integer") (pending)
  • core/java/test/scalatest/net/i2p/util/VersionComparatorSpec.scala

    r14ca463 r91007735  
    22
    33import org.scalatest.FunSpec
    4 import org.scalatest.matchers.ShouldMatchers
     4import org.scalatest.Matchers
    55
    66
    7 class VersionComparatorSpec extends FunSpec with ShouldMatchers {
     7class VersionComparatorSpec extends FunSpec with Matchers {
    88 
    99    private val vc = new VersionComparator
Note: See TracChangeset for help on using the changeset viewer.