updated scalatest

src/test/scala/BasicCSharpGeneratorTest.scala

@@ -22,12 +22,12 @@ import com.wordnik.swagger.codegen.language._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
-class BasicCSharpGeneratorTest extends FlatSpec with ShouldMatchers {
+class BasicCSharpGeneratorTest extends FlatSpec with Matchers {
   val config = new BasicCSharpGenerator
 
   behavior of "BasicCSharpGenerator"

src/test/scala/BasicGeneratorTest.scala

@@ -21,12 +21,12 @@ import com.wordnik.swagger.codegen.model._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.collection.mutable.{LinkedHashMap, HashMap}
 
 @RunWith(classOf[JUnitRunner])
-class BasicGeneratorTest extends FlatSpec with ShouldMatchers {
+class BasicGeneratorTest extends FlatSpec with Matchers {
   class SampleGenerator extends BasicGenerator {
   	modelTemplateFiles += "model.mustache" -> ".test"
   	override def typeMapping = Map(

src/test/scala/BasicJavaGeneratorTest.scala

@@ -22,12 +22,12 @@ import com.wordnik.swagger.codegen.language._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
-class BasicJavaGeneratorTest extends FlatSpec with ShouldMatchers {
+class BasicJavaGeneratorTest extends FlatSpec with Matchers {
   val config = new BasicJavaGenerator
 
   behavior of "BasicJavaGenerator"

src/test/scala/BasicScalaGeneratorTest.scala

@@ -22,12 +22,12 @@ import com.wordnik.swagger.codegen.language._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.collection.mutable.HashMap
 
 @RunWith(classOf[JUnitRunner])
-class BasicScalaGeneratorTest extends FlatSpec with ShouldMatchers {
+class BasicScalaGeneratorTest extends FlatSpec with Matchers {
   val config = new BasicScalaGenerator
 
   behavior of "BasicScalaGenerator"

src/test/scala/CodegenConfigTest.scala

@@ -21,12 +21,12 @@ import com.wordnik.swagger.codegen.PathUtil
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
-class CodegenConfigTest extends FlatSpec with ShouldMatchers {
+class CodegenConfigTest extends FlatSpec with Matchers {
   class SampleCodegenConfig extends CodegenConfig with PathUtil {
     override def packageName = "com.test"
     override def templateDir = "src/test/resources/sampleConfigTemplates"

src/test/scala/CodegenTest.scala

@@ -21,12 +21,12 @@ import com.wordnik.swagger.codegen.model._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
-class CodegenTest extends FlatSpec with ShouldMatchers {
+class CodegenTest extends FlatSpec with Matchers {
 
   val subject = new Codegen(new BasicJavaGenerator)
   

src/test/scala/PathUtilTest.scala

@@ -20,10 +20,10 @@ import com.wordnik.swagger.codegen.PathUtil
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 @RunWith(classOf[JUnitRunner])
-class PathUtilTest extends FlatSpec with ShouldMatchers {
+class PathUtilTest extends FlatSpec with Matchers {
   val config = new BasicScalaGenerator
 
   behavior of "PathUtil"

src/test/scala/swaggerSpec1_1/CoreUtilsTest.scala

@@ -8,7 +8,7 @@ import com.wordnik.swagger.codegen.util._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import org.json4s.jackson.JsonMethods._
 import org.json4s.jackson.Serialization.read
@@ -16,7 +16,7 @@ import org.json4s.jackson.Serialization.read
 import scala.collection.mutable.LinkedHashMap
 
 @RunWith(classOf[JUnitRunner])
-class CoreUtilsTest extends FlatSpec with ShouldMatchers {
+class CoreUtilsTest extends FlatSpec with Matchers {
   sys.props += "fileMap" -> "src/test/resources/petstore-1.1"
 
   behavior of "CoreUtils"

src/test/scala/swaggerSpec1_1/ModelSerializerValidations.scala

@@ -10,12 +10,12 @@ import org.json4s.jackson.Serialization.{read, write}
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.collection.mutable.{ LinkedHashMap, ListBuffer }
 
 @RunWith(classOf[JUnitRunner])
-class ResourceListingValidationTest extends FlatSpec with ShouldMatchers {
+class ResourceListingValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "fail resource listing without base path" in {
@@ -70,7 +70,7 @@ class ResourceListingValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiListingReferenceValidationTest extends FlatSpec with ShouldMatchers {
+class ApiListingReferenceValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize an ApiListingReference" in {
@@ -97,7 +97,7 @@ class ApiListingReferenceValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiDescriptionValidationTest extends FlatSpec with ShouldMatchers {
+class ApiDescriptionValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "fail to deserialize an ApiDescription with path, method, return type" in {
@@ -140,7 +140,7 @@ class ApiDescriptionValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class OperationValidationTest extends FlatSpec with ShouldMatchers {
+class OperationValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "fail to deserialize an Operation with missing param type" in {
@@ -197,7 +197,7 @@ class OperationValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ResponseMessageValidationTest extends FlatSpec with ShouldMatchers {
+class ResponseMessageValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize an ResponseMessage" in {
@@ -224,7 +224,7 @@ class ResponseMessageValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ParameterValidationTest extends FlatSpec with ShouldMatchers {
+class ParameterValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize another param" in {
@@ -295,7 +295,7 @@ class ParameterValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelValidationTest extends FlatSpec with ShouldMatchers {
+class ModelValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize a model" in {
@@ -372,7 +372,7 @@ class ModelValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelRefValidationTest extends FlatSpec with ShouldMatchers {
+class ModelRefValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize a model ref" in {
@@ -399,7 +399,7 @@ class ModelRefValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelPropertyValidationTest extends FlatSpec with ShouldMatchers {
+class ModelPropertyValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize a model property with allowable values and ref" in {
@@ -503,7 +503,7 @@ class ModelPropertyValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class AllowableValuesValidationTest extends FlatSpec with ShouldMatchers {
+class AllowableValuesValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize allowable value list" in {

src/test/scala/swaggerSpec1_1/ModelSerializersTest.scala

@@ -10,12 +10,12 @@ import org.json4s.jackson.Serialization.{read, write}
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.collection.mutable.LinkedHashMap
 
 @RunWith(classOf[JUnitRunner])
-class ResourceListingSerializersTest extends FlatSpec with ShouldMatchers {
+class ResourceListingSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize an ResourceListing with no apis" in {
@@ -79,7 +79,7 @@ class ResourceListingSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiListingReferenceSerializersTest extends FlatSpec with ShouldMatchers {
+class ApiListingReferenceSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize an ApiListingReference" in {
@@ -106,7 +106,7 @@ class ApiListingReferenceSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiDescriptionSerializersTest extends FlatSpec with ShouldMatchers {
+class ApiDescriptionSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize an ApiDescription with no ops" in {
@@ -215,7 +215,7 @@ class ApiDescriptionSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class OperationSerializersTest extends FlatSpec with ShouldMatchers {
+class OperationSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize an Operation" in {
@@ -286,7 +286,7 @@ class OperationSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ErrorResponseSerializersTest extends FlatSpec with ShouldMatchers {
+class ErrorResponseSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize an ResponseResponse" in {
@@ -313,7 +313,7 @@ class ErrorResponseSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ParameterSerializersTest extends FlatSpec with ShouldMatchers {
+class ParameterSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize another param" in {
@@ -384,7 +384,7 @@ class ParameterSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelSerializationTest extends FlatSpec with ShouldMatchers {
+class ModelSerializationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize a model" in {
@@ -461,7 +461,7 @@ class ModelSerializationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelRefSerializationTest extends FlatSpec with ShouldMatchers {
+class ModelRefSerializationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize a model ref" in {
@@ -488,7 +488,7 @@ class ModelRefSerializationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelPropertySerializationTest extends FlatSpec with ShouldMatchers {
+class ModelPropertySerializationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize a model property with allowable values and ref" in {
@@ -592,7 +592,7 @@ class ModelPropertySerializationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class AllowableValuesSerializersTest extends FlatSpec with ShouldMatchers {
+class AllowableValuesSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
   it should "deserialize allowable value list" in {

src/test/scala/swaggerSpec1_1/SwaggerModelTest.scala

@@ -23,12 +23,12 @@ import org.json4s.jackson.Serialization.read
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.io._
 
 @RunWith(classOf[JUnitRunner])
-class SwaggerModelTest extends FlatSpec with ShouldMatchers {
+class SwaggerModelTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.1")
 
 	behavior of "Swagger Model"

src/test/scala/swaggerSpec1_1/UtilsTest.scala

@@ -21,13 +21,13 @@ import com.wordnik.swagger.codegen.util.{ResourceExtractor, ApiExtractor, CoreUt
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.collection.JavaConverters._
 import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
-class ResourceExtractorTest extends FlatSpec with ShouldMatchers {
+class ResourceExtractorTest extends FlatSpec with Matchers {
   behavior of "ResourceExtractor"
   it should "get 3 apis from a resource listing" in {
     val resourceListing = ResourceExtractor.fetchListing("src/test/resources/petstore-1.1/resources.json")
@@ -37,7 +37,7 @@ class ResourceExtractorTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiExtractorTest extends FlatSpec with ShouldMatchers {
+class ApiExtractorTest extends FlatSpec with Matchers {
   behavior of "ApiExtractor"
   it should "verify the deserialization of the store api" in {
     val resourceListing = ResourceExtractor.fetchListing("src/test/resources/petstore-1.1/resources.json")

src/test/scala/swaggerSpec1_2/CoreUtilsTest.scala

@@ -8,7 +8,7 @@ import com.wordnik.swagger.codegen.util._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import org.json4s.jackson.JsonMethods._
 import org.json4s.jackson.Serialization.read
@@ -16,7 +16,7 @@ import org.json4s.jackson.Serialization.read
 import scala.collection.mutable.LinkedHashMap
 
 @RunWith(classOf[JUnitRunner])
-class CoreUtilsTest extends FlatSpec with ShouldMatchers {
+class CoreUtilsTest extends FlatSpec with Matchers {
   sys.props += "fileMap" -> "src/test/resources/petstore-1.2"
 
   behavior of "CoreUtils"

src/test/scala/swaggerSpec1_2/ModelSerializerValidations.scala

@@ -10,12 +10,12 @@ import org.json4s.jackson.Serialization.{read, write}
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.collection.mutable.{ LinkedHashMap, ListBuffer }
 
 @RunWith(classOf[JUnitRunner])
-class ResourceListingValidationTest extends FlatSpec with ShouldMatchers {
+class ResourceListingValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "not have base path" in {
@@ -72,7 +72,7 @@ class ResourceListingValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiListingReferenceValidationTest extends FlatSpec with ShouldMatchers {
+class ApiListingReferenceValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize an ApiListingReference" in {
@@ -100,7 +100,7 @@ class ApiListingReferenceValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiDescriptionValidationTest extends FlatSpec with ShouldMatchers {
+class ApiDescriptionValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "fail to deserialize an ApiDescription with path, method, return type" in {
@@ -141,7 +141,7 @@ class ApiDescriptionValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class OperationValidationTest extends FlatSpec with ShouldMatchers {
+class OperationValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "fail to deserialize an Operation with missing param type" in {
@@ -196,7 +196,7 @@ class OperationValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ResponseMessageValidationTest extends FlatSpec with ShouldMatchers {
+class ResponseMessageValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize an ResponseMessage" in {
@@ -223,7 +223,7 @@ class ResponseMessageValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ParameterValidationTest extends FlatSpec with ShouldMatchers {
+class ParameterValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize another param" in {
@@ -291,7 +291,7 @@ class ParameterValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelValidationTest extends FlatSpec with ShouldMatchers {
+class ModelValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize a model" in {
@@ -368,7 +368,7 @@ class ModelValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelRefValidationTest extends FlatSpec with ShouldMatchers {
+class ModelRefValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize a model ref" in {
@@ -395,7 +395,7 @@ class ModelRefValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelPropertyValidationTest extends FlatSpec with ShouldMatchers {
+class ModelPropertyValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize a model property with allowable values and ref" in {
@@ -493,7 +493,7 @@ class ModelPropertyValidationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class AllowableValuesValidationTest extends FlatSpec with ShouldMatchers {
+class AllowableValuesValidationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize allowable value list" in {

src/test/scala/swaggerSpec1_2/ModelSerializersTest.scala

@@ -10,12 +10,12 @@ import org.json4s.jackson.Serialization.{read, write}
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.collection.mutable.LinkedHashMap
 
 @RunWith(classOf[JUnitRunner])
-class ResourceListingSerializersTest extends FlatSpec with ShouldMatchers {
+class ResourceListingSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize an ResourceListing with no apis" in {
@@ -69,7 +69,7 @@ class ResourceListingSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiListingReferenceSerializersTest extends FlatSpec with ShouldMatchers {
+class ApiListingReferenceSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize an ApiListingReference" in {
@@ -96,7 +96,7 @@ class ApiListingReferenceSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiListingSerializersTest extends FlatSpec with ShouldMatchers {
+class ApiListingSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize an ApiListing" in {
@@ -140,7 +140,7 @@ class ApiListingSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiDescriptionSerializersTest extends FlatSpec with ShouldMatchers {
+class ApiDescriptionSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
   it should "deserialize an ApiDescription with no ops" in {
     val jsonString = """
@@ -247,7 +247,7 @@ class ApiDescriptionSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class OperationSerializersTest extends FlatSpec with ShouldMatchers {
+class OperationSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize an Operation" in {
@@ -412,7 +412,7 @@ class OperationSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ErrorResponseSerializersTest extends FlatSpec with ShouldMatchers {
+class ErrorResponseSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize an Response" in {
@@ -439,7 +439,7 @@ class ErrorResponseSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ParameterSerializersTest extends FlatSpec with ShouldMatchers {
+class ParameterSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize another param" in {
@@ -507,7 +507,7 @@ class ParameterSerializersTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelSerializationTest extends FlatSpec with ShouldMatchers {
+class ModelSerializationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize a model" in {
@@ -650,7 +650,7 @@ class ModelSerializationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelRefSerializationTest extends FlatSpec with ShouldMatchers {
+class ModelRefSerializationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize a model ref" in {
@@ -677,7 +677,7 @@ class ModelRefSerializationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ModelPropertySerializationTest extends FlatSpec with ShouldMatchers {
+class ModelPropertySerializationTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize a model property with allowable values and ref" in {
@@ -828,7 +828,7 @@ class ModelPropertySerializationTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class AllowableValuesSerializersTest extends FlatSpec with ShouldMatchers {
+class AllowableValuesSerializersTest extends FlatSpec with Matchers {
   implicit val formats = SwaggerSerializers.formats("1.2")
 
   it should "deserialize allowable value list" in {

src/test/scala/swaggerSpec1_2/UtilsTest.scala

@@ -21,13 +21,13 @@ import com.wordnik.swagger.codegen.util.{ResourceExtractor, ApiExtractor, CoreUt
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers 
 
 import scala.collection.JavaConverters._
 import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
-class ResourceExtractorTest extends FlatSpec with ShouldMatchers {
+class ResourceExtractorTest extends FlatSpec with Matchers {
   behavior of "ResourceExtractor"
   it should "get 3 apis from a resource listing" in {
     val resourceListing = ResourceExtractor.fetchListing("src/test/resources/petstore-1.2/api-docs")
@@ -37,7 +37,7 @@ class ResourceExtractorTest extends FlatSpec with ShouldMatchers {
 }
 
 @RunWith(classOf[JUnitRunner])
-class ApiExtractorTest extends FlatSpec with ShouldMatchers {
+class ApiExtractorTest extends FlatSpec with Matchers {
   behavior of "ApiExtractor"
   it should "verify the deserialization of the store api" in {
     val resourceListing = ResourceExtractor.fetchListing("src/test/resources/petstore-1.2/api-docs")