Skip to content

Commit dc9a093

Browse files
pjfanningpjfanning
committed
remove junit dependency
1 parent d8a81e9 commit dc9a093

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+9
-158
lines changed

‎build.sbt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ val jacksonVersion = "2.12.1-SNAPSHOT"
3333
val jacksonJsonSchemaVersion = "2.12.0"
3434

3535
libraryDependencies ++= Seq(
36-
"com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion,
37-
"com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion,
38-
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,
36+
"com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion,
37+
"com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion,
38+
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,
3939
) ++ {
4040
CrossVersion.partialVersion(scalaVersion.value) match {
4141
case Some((2, scalaMajor)) if scalaMajor <= 11 =>
@@ -44,14 +44,12 @@ libraryDependencies ++= Seq(
4444
}
4545
} ++ Seq(
4646
// test dependencies
47-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % jacksonVersion % Test,
48-
"com.fasterxml.jackson.datatype" % "jackson-datatype-guava" % jacksonVersion % Test,
49-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonVersion % Test,
50-
"com.fasterxml.jackson.module" % "jackson-module-jsonSchema" % jacksonJsonSchemaVersion % Test,
51-
"io.swagger" % "swagger-core" % "1.6.2" % Test,
52-
"org.scalatest" %% "scalatest" % "3.2.3" % Test,
53-
"org.scalatestplus" %% "junit-4-13" % "3.2.3.0" % Test,
54-
"junit" % "junit" % "4.13.1" % Test
47+
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % jacksonVersion % Test,
48+
"com.fasterxml.jackson.datatype" % "jackson-datatype-guava" % jacksonVersion % Test,
49+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonVersion % Test,
50+
"com.fasterxml.jackson.module" % "jackson-module-jsonSchema" % jacksonJsonSchemaVersion % Test,
51+
"io.swagger" % "swagger-core" % "1.6.2" % Test,
52+
"org.scalatest" %% "scalatest" % "3.2.3" % Test
5553
)
5654

5755
// build.properties

‎src/test/scala/UnpackagedTest.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import com.fasterxml.jackson.module.scala.DefaultScalaModule
22
import com.fasterxml.jackson.module.scala.ser.SerializerTest
3-
import org.junit.runner.RunWith
4-
import org.scalatestplus.junit.JUnitRunner
53

64
case class UnpackagedCaseClass(intValue: Int, stringValue: String)
75

8-
@RunWith(classOf[JUnitRunner])
96
class UnpackagedTest extends SerializerTest {
107

118
def module: DefaultScalaModule.type = DefaultScalaModule

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.fasterxml.jackson.module.external
22

33
import com.fasterxml.jackson.module.scala.BaseSpec
4-
import org.junit.runner.RunWith
5-
import org.scalatestplus.junit.JUnitRunner
64

7-
@RunWith(classOf[JUnitRunner])
85
class CustomScalaModuleTest extends BaseSpec {
96

107
"A custom scala module" should "be buildable outside of the module package" in {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.fasterxml.jackson.module.scala
22

3-
import org.junit.runner.RunWith
4-
import org.scalatestplus.junit.JUnitRunner
53

6-
@RunWith(classOf[JUnitRunner])
74
class DefaultScalaModuleTest extends BaseSpec {
85

96
"DefaultScalaModule" should "have a sensible version" in {

‎src/test/scala/com/fasterxml/jackson/module/scala/EnumMixinTest.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package com.fasterxml.jackson.module.scala
22

33
import com.fasterxml.jackson.core.`type`.TypeReference
44
import com.fasterxml.jackson.databind.ObjectMapper
5-
import org.junit.runner.RunWith
6-
import org.scalatestplus.junit.JUnitRunner
75

86
object TestEnum extends Enumeration {
97
type TestEnum = Value
@@ -20,7 +18,6 @@ abstract class TestObject2Mixin {
2018
@JsonScalaEnumeration(classOf[TestEnumClass]) var field: TestEnum.Value = TestEnum.Value1
2119
}
2220

23-
@RunWith(classOf[JUnitRunner])
2421
class EnumMixinTest extends BaseSpec {
2522
val mapper = new ObjectMapper() with ScalaObjectMapper
2623
mapper.registerModule(DefaultScalaModule)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import com.fasterxml.jackson.core.TreeNode
88
import com.fasterxml.jackson.databind.exc.InvalidFormatException
99
import com.fasterxml.jackson.databind.{JsonMappingException, Module, ObjectMapper}
1010
import com.fasterxml.jackson.module.scala.deser.OptionDeserializerTest.{Foo, Wrapper}
11-
import org.junit.runner.RunWith
12-
import org.scalatestplus.junit.JUnitRunner
1311

1412
import scala.collection.JavaConverters._
1513

@@ -44,7 +42,6 @@ private class Target {
4442
private class Mixin(val foo: String)
4543
private case class GenericTestClass[T](t: T)
4644

47-
@RunWith(classOf[JUnitRunner])
4845
class ScalaObjectMapperTest extends JacksonTest {
4946

5047
def module: Module = DefaultScalaModule

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package com.fasterxml.jackson.module.scala
22

33
import com.fasterxml.jackson.annotation.{JsonIgnore, JsonUnwrapped}
44
import com.fasterxml.jackson.databind.ObjectMapper
5-
import org.junit.runner.RunWith
6-
import org.scalatestplus.junit.JUnitRunner
75

86
case class Address(address1: Option[String], city: Option[String], state: Option[String])
97

@@ -38,7 +36,6 @@ case class Person(name: String, @JsonIgnore location: Address, alias: Option[Str
3836
}
3937
}
4038

41-
@RunWith(classOf[JUnitRunner])
4239
class UnwrappedTest extends BaseSpec {
4340

4441
"mapper" should "handle ignored fields correctly" in {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ package deser
55
import com.fasterxml.jackson.annotation.JsonProperty
66
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
77
import com.fasterxml.jackson.databind.{JsonMappingException, ObjectMapper, ObjectReader, PropertyNamingStrategy}
8-
import org.junit.runner.RunWith
9-
import org.scalatestplus.junit.JUnitRunner
108

119
object CaseClassDeserializerTest
1210
{
@@ -41,7 +39,6 @@ object CaseClassDeserializerTest
4139
case class ArrayHolder(value: Array[Byte])
4240
}
4341

44-
@RunWith(classOf[JUnitRunner])
4542
class CaseClassDeserializerTest extends DeserializerTest {
4643
import com.fasterxml.jackson.module.scala.deser.CaseClassDeserializerTest._
4744

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package com.fasterxml.jackson.module.scala.deser
22

33
import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.databind.ObjectMapper
5-
import org.junit.runner.RunWith
6-
import org.scalatestplus.junit.JUnitRunner
75

86
object CreatorTest
97
{
@@ -53,7 +51,6 @@ object CreatorTest
5351
}
5452

5553

56-
@RunWith(classOf[JUnitRunner])
5754
class CreatorTest extends DeserializationFixture {
5855
import CreatorTest._
5956

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ import com.fasterxml.jackson.core.`type`.TypeReference
55
import com.fasterxml.jackson.databind.JsonNode
66
import com.fasterxml.jackson.module.scala.DefaultScalaModule
77
import com.fasterxml.jackson.module.scala.deser.EitherJsonTest.{BaseHolder, EitherField, Impl, PlainPojoObject}
8-
import org.junit.runner.RunWith
9-
import org.scalatestplus.junit.JUnitRunner
108

119
import scala.annotation.meta.field
1210
import scala.util.Random
1311

14-
@RunWith(classOf[JUnitRunner])
1512
class EitherDeserializerTest extends DeserializerTest with EitherJsonTestSupport {
1613

1714
override val module = DefaultScalaModule

0 commit comments

Comments
 (0)