Merge pull request #421 from pjfanning/scalatest-deprecations

Scalatest deprecations

Author: cowtowncoder

src/test/scala/UnpackagedTest.scala

@@ -1,7 +1,7 @@
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.fasterxml.jackson.module.scala.ser.SerializerTest
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 case class UnpackagedCaseClass(intValue: Int, stringValue: String)
 

src/test/scala/com/fasterxml/jackson/module/external/CustomScalaModuleTest.scala

@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.external
 
 import com.fasterxml.jackson.module.scala.BaseSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class CustomScalaModuleTest extends BaseSpec {

src/test/scala/com/fasterxml/jackson/module/scala/DefaultScalaModuleTest.scala

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.module.scala
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class DefaultScalaModuleTest extends BaseSpec {

src/test/scala/com/fasterxml/jackson/module/scala/UnwrappedTest.scala

@@ -3,7 +3,7 @@ package com.fasterxml.jackson.module.scala
 import com.fasterxml.jackson.annotation.{JsonIgnore, JsonUnwrapped}
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 case class Address(address1: Option[String], city: Option[String], state: Option[String])
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/CaseClassDeserializerTest.scala

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.{JsonMappingException, ObjectMapper, ObjectReader, PropertyNamingStrategy}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 object CaseClassDeserializerTest
 {

src/test/scala/com/fasterxml/jackson/module/scala/deser/CreatorTest.scala

@@ -3,7 +3,7 @@ package com.fasterxml.jackson.module.scala.deser
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 object CreatorTest
 {

src/test/scala/com/fasterxml/jackson/module/scala/deser/EitherDeserializerTest.scala

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.fasterxml.jackson.module.scala.deser.EitherJsonTest.{BaseHolder, EitherField, Impl, PlainPojoObject}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.annotation.meta.field
 import scala.util.Random

src/test/scala/com/fasterxml/jackson/module/scala/deser/EnumerationDeserializerTest.scala

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.`type`.TypeReference
 import com.fasterxml.jackson.module.scala.OuterWeekday.InnerWeekday
 import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JsonScalaEnumeration, Weekday}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.beans.BeanProperty
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/InteropTest.scala

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.{DeserializationContext, JsonDeserializer,
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import org.junit.runner.RunWith
 import org.scalatest.{FlatSpec, Matchers}
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 abstract class A
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/MiscTypesTest.scala

@@ -4,7 +4,7 @@ import java.util.UUID
 
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class MiscTypesTest extends DeserializerTest {

src/test/scala/com/fasterxml/jackson/module/scala/deser/OptionDeserializerTest.scala

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.annotation.meta.field
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/OptionWithJodaTimeDeserializerTest.scala

@@ -3,7 +3,7 @@ package com.fasterxml.jackson.module.scala.deser
 import com.fasterxml.jackson.datatype.joda.JodaModule
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 private case class OptionalInt(x: Option[Int])
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/PrimitiveContainerTest.scala

@@ -3,7 +3,7 @@ package com.fasterxml.jackson.module.scala.deser
 import com.fasterxml.jackson.databind.JsonMappingException
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 object PrimitiveContainerTest {
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/SeqDeserializerTest.scala

@@ -5,7 +5,7 @@ import java.util.UUID
 import com.fasterxml.jackson.databind.exc.InvalidFormatException
 import com.fasterxml.jackson.module.scala.JacksonModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.{immutable, mutable}
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/SortedMapDeserializerTest.scala

@@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.fasterxml.jackson.module.scala.JacksonModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
-import scala.collection.{immutable, mutable}
+import scala.collection.immutable
 
 @RunWith(classOf[JUnitRunner])
 class SortedMapDeserializerTest extends DeserializerTest {

src/test/scala/com/fasterxml/jackson/module/scala/deser/SortedSetDeserializerTest.scala

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.`type`.TypeReference
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.exc.InvalidFormatException
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection._
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/StdDeserializersTest.scala

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.module.scala.deser
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class StdDeserializersTest extends DeserializationFixture {

src/test/scala/com/fasterxml/jackson/module/scala/deser/TestInnerClass.scala

@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.scala.deser
 
 import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 object Dog {
   def apply(n: String, thinking: Boolean): Dog = {

src/test/scala/com/fasterxml/jackson/module/scala/deser/TupleDeserializerTest.scala

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.{As, Id}
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo}
 import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @JsonTypeInfo(use = Id.NAME, include = As.EXTERNAL_PROPERTY, property = "type")
 @JsonSubTypes(Array(

src/test/scala/com/fasterxml/jackson/module/scala/deser/UnsortedMapDeserializerTest.scala

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
 import com.fasterxml.jackson.module.scala.JacksonModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection._
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/UnsortedSetDeserializerTest.scala

@@ -5,7 +5,7 @@ import java.util.UUID
 import com.fasterxml.jackson.databind.exc.InvalidFormatException
 import com.fasterxml.jackson.module.scala.JacksonModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.{immutable, mutable}
 

src/test/scala/com/fasterxml/jackson/module/scala/deser/UntypedObjectDeserializerTest.scala

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.{AbstractTypeResolver, DeserializationConf
 import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper
 import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class UntypedObjectDeserializerTest extends DeserializerTest {

src/test/scala/com/fasterxml/jackson/module/scala/experimental/ScalaObjectMapperTest.scala

@@ -8,8 +8,8 @@ import com.fasterxml.jackson.databind.exc.InvalidFormatException
 import com.fasterxml.jackson.databind.{JsonMappingException, ObjectMapper}
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
 import org.scalatest.{FlatSpec, Matchers}
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.JavaConverters._
 

src/test/scala/com/fasterxml/jackson/module/scala/introspect/BeanIntrospectorTest.scala

@@ -5,9 +5,9 @@ import java.lang.reflect.Member
 import com.fasterxml.jackson.module.scala.BaseSpec
 import com.fasterxml.jackson.module.scala.introspect.BeanIntrospectorTest.DecodedNameMatcher
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
 import org.scalatest.matchers.{HavePropertyMatchResult, HavePropertyMatcher}
 import org.scalatest.{Inside, LoneElement, OptionValues}
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.reflect.NameTransformer
 

src/test/scala/com/fasterxml/jackson/module/scala/introspect/ScalaAnnotationIntrospectorTest.scala

@@ -10,8 +10,8 @@ import com.fasterxml.jackson.databind.{BeanDescription, JsonSerializer, ObjectMa
 import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper
 import org.junit.runner.RunWith
 import org.scalatest.LoneElement._
-import org.scalatest.junit.JUnitRunner
 import org.scalatest.{Matchers, Outcome, fixture}
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.beans.BeanProperty
 import scala.collection.JavaConverters._

src/test/scala/com/fasterxml/jackson/module/scala/ser/CaseClassSerializerTest.scala

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation._
 import com.fasterxml.jackson.databind.{ObjectMapper, PropertyNamingStrategy}
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.beans.BeanProperty
 

src/test/scala/com/fasterxml/jackson/module/scala/ser/EitherSerializerTest.scala

@@ -1,11 +1,11 @@
 package com.fasterxml.jackson.module.scala.ser
 
 import com.fasterxml.jackson.databind.JsonNode
-import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import com.fasterxml.jackson.module.scala.deser.EitherJsonTest.{BaseHolder, Impl}
 import com.fasterxml.jackson.module.scala.deser.EitherJsonTestSupport
+import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class EitherSerializerTest extends SerializerTest with EitherJsonTestSupport {

src/test/scala/com/fasterxml/jackson/module/scala/ser/EnumerationSerializerTest.scala

@@ -4,10 +4,8 @@ package ser
 
 import com.fasterxml.jackson.core.`type`.TypeReference
 import com.fasterxml.jackson.module.scala.OuterWeekday.InnerWeekday
-import com.fasterxml.jackson.module.scala.Weekday.Value
-import com.fasterxml.jackson.module.scala.ser.EnumerationSerializerTest.OptionType
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.beans.BeanProperty
 

src/test/scala/com/fasterxml/jackson/module/scala/ser/IterableSerializerTest.scala

@@ -3,8 +3,8 @@ package com.fasterxml.jackson.module.scala.ser
 import com.fasterxml.jackson.annotation.{JsonInclude, JsonProperty, JsonTypeInfo}
 import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
 import org.scalatest.matchers.Matcher
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.{Iterator, immutable, mutable}
 

src/test/scala/com/fasterxml/jackson/module/scala/ser/MapSerializerTest.scala

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.fasterxml.jackson.databind.{JsonSerializer, SerializationFeature, SerializerProvider}
 import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.annotation.meta.getter
 import scala.beans.BeanProperty

src/test/scala/com/fasterxml/jackson/module/scala/ser/NamingStrategyTest.scala

@@ -7,8 +7,8 @@ import java.io.ByteArrayOutputStream
 import com.fasterxml.jackson.databind.{ObjectMapper, PropertyNamingStrategy}
 import com.google.common.base.Optional
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
 import org.scalatest.{Matchers, Outcome, fixture}
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.beans.BeanProperty
 

src/test/scala/com/fasterxml/jackson/module/scala/ser/OptionSerializerTest.scala

@@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.node.JsonNodeType
 import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper}
 import com.fasterxml.jackson.module.jsonSchema.JsonSchema
 import com.fasterxml.jackson.module.jsonSchema.factories.SchemaFactoryWrapper
-import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import com.fasterxml.jackson.module.scala.experimental.{RequiredPropertiesSchemaModule, ScalaObjectMapper}
+import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.annotation.meta.{field, getter}
 import scala.collection.JavaConverters._

src/test/scala/com/fasterxml/jackson/module/scala/ser/TestJsonValue.scala

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.annotation.meta.getter
 

src/test/scala/com/fasterxml/jackson/module/scala/ser/TransientFieldTest.scala

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder
 import com.fasterxml.jackson.databind.MapperFeature
 import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 object TransientFieldTest {
   @JsonPropertyOrder(Array("x"))

src/test/scala/com/fasterxml/jackson/module/scala/ser/TupleSerializerTest.scala

@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.scala.ser
 
 import com.fasterxml.jackson.module.scala.JacksonModule
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class TupleSerializerTest extends SerializerTest {