update dependencies
diff --git a/build.sbt b/build.sbt
index a89cbfe..de6aba4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -144,6 +144,8 @@
log4jApiTests,
junit,
scalatest,
+ scalatestFunsuit,
+ scalatestMatcher,
scalatestJunit,
scalatestMockito,
mockito
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 9d9f588..9656d47 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -19,8 +19,8 @@
object Dependencies {
val scala210 = "2.10.7"
val scala211 = "2.11.12"
- val scala212 = "2.12.9"
- val scala213 = "2.13.0"
+ val scala212 = "2.12.10"
+ val scala213 = "2.13.1"
def scalaReflect(version: String): ModuleID =
"org.scala-lang" % "scala-reflect" % version
@@ -31,9 +31,11 @@
val log4jApiTests = "org.apache.logging.log4j" % "log4j-api" % log4jV % Test classifier "tests"
val log4jCore = "org.apache.logging.log4j" % "log4j-core" % log4jV % Runtime
val junit = "junit" % "junit" % "4.12" % Test
- val scalactic = "org.scalactic" %% "scalactic" % "3.0.8" % Compile
- val scalatest = "org.scalatest" %% "scalatest" % "3.1.0-SNAP13" % Test
- val scalatestJunit = "org.scalatestplus" %% "scalatestplus-junit" % "1.0.0-M1" % Test
- val scalatestMockito = "org.scalatestplus" %% "scalatestplus-mockito" % "1.0.0-M1" % Test
- val mockito = "org.mockito" % "mockito-core" % "1.10.19" % Test
+ val scalactic = "org.scalactic" %% "scalactic" % "3.2.0-M1" % Compile
+ val scalatest = "org.scalatest" %% "scalatest" % "3.2.0-M1" % Test
+ val scalatestFunsuit = "org.scalatest" %% "scalatest-funsuite" % "3.2.0-M1" % Test
+ val scalatestMatcher = "org.scalatest" %% "scalatest-matchers-core" % "3.2.0-M1" % Test
+ val scalatestJunit = "org.scalatestplus" %% "scalatestplus-junit" % "1.0.0-M2" % Test
+ val scalatestMockito = "org.scalatestplus" %% "scalatestplus-mockito" % "1.0.0-M2" % Test
+ val mockito = "org.mockito" % "mockito-core" % "3.1.0" % Test
}
diff --git a/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala b/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
index f079765..4041a89 100644
--- a/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
+++ b/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
@@ -16,13 +16,13 @@
*/
package org.apache.logging.log4j.scala
-import org.apache.logging.log4j.message.{DefaultFlowMessageFactory, Message, ParameterizedMessage, ParameterizedMessageFactory}
+import org.apache.logging.log4j.message.{DefaultFlowMessageFactory, EntryMessage, Message, ParameterizedMessage, ParameterizedMessageFactory}
import org.apache.logging.log4j.spi.{AbstractLogger, ExtendedLogger}
import org.apache.logging.log4j.{Level, Marker, MarkerManager}
import org.junit.runner.RunWith
-import org.mockito.Matchers.{any, anyString, eq => eqv}
+import org.mockito.ArgumentMatchers.{any, anyString, eq => eqv}
import org.mockito.Mockito._
-import org.scalatest.{FunSuite, Matchers}
+import org.scalatest.funsuite.AnyFunSuite
import org.scalatestplus.junit.JUnitRunner
import org.scalatestplus.mockito.MockitoSugar
@@ -35,15 +35,15 @@
}
@RunWith(classOf[JUnitRunner])
-class LoggerTest extends FunSuite with Matchers with MockitoSugar {
+class LoggerTest extends AnyFunSuite with MockitoSugar {
- val msg = new ParameterizedMessage("msg {}", 17)
- val entryMsg = new DefaultFlowMessageFactory().newEntryMessage(msg)
- val cseqMsg: CharSequence = new StringBuilder().append("cseq msg")
- val objectMsg = Custom(17)
- val cause = new RuntimeException("cause")
- val marker = MarkerManager.getMarker("marker")
- val result = "foo"
+ val msg = new ParameterizedMessage("msg {}", 17)
+ val entryMsg: EntryMessage = new DefaultFlowMessageFactory().newEntryMessage(msg)
+ val cseqMsg : CharSequence = new StringBuilder().append("cseq msg")
+ val objectMsg = Custom(17)
+ val cause = new RuntimeException("cause")
+ val marker : Marker = MarkerManager.getMarker("marker")
+ val result = "foo"
def fixture =
new {
diff --git a/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala b/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
index 26f0e8f..b37124c 100644
--- a/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
+++ b/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.scala
import org.junit.runner.RunWith
-import org.scalatest.Matchers
+import org.scalatest.matchers.should.Matchers
import org.scalatest.funsuite.AnyFunSuite
import org.scalatestplus.junit.JUnitRunner
@@ -66,7 +66,7 @@
LoggingContext += ("key2" -> "value2")
LoggingContext += ("key3" -> "value3")
- LoggingContext -= ("key1", "key2")
+ LoggingContext --= Set("key1", "key2")
LoggingContext.get("key1") shouldBe None
LoggingContext.get("key2") shouldBe None
