Cleanup Convert unit tests to avoid impacting other test cases.

Author: Shu Zhang

modules/swagger-core/src/main/scala/com/wordnik/swagger/converter/ModelConverters.scala

@@ -27,6 +27,10 @@ object ModelConverters {
     else converters += c
   }
 
+  def removeConverter(c: ModelConverter) = {
+    converters -= c
+  }
+
   def read(cls: Class[_], t: Map[String, String] = Map.empty): Option[Model] = {
     val types = {
       if(t.isEmpty)typeMap

modules/swagger-core/src/test/scala/converter/CustomConverterTest.scala

@@ -25,13 +25,15 @@ import org.scalatest.matchers.ShouldMatchers
 class CustomConverterTest extends FlatSpec with ShouldMatchers {
   it should "ignore properties with type Bar" in {
     // add the custom converter
-    ModelConverters.addConverter(new CustomConverter, true)
+    val customConverter = new CustomConverter
+    ModelConverters.addConverter(customConverter, true)
 
     // make sure the field bar: converter.Bar is not present
     ModelConverters.read(classOf[Foo]) match {
       case Some(model) => model.properties.get("bar") should be (None)
       case _ => fail("didn't read anything")
     }
+    ModelConverters.removeConverter(customConverter)
   }
 }
 

modules/swagger-core/src/test/scala/converter/JaveDateTimeOverride.scala

@@ -17,9 +17,12 @@ import scala.reflect.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class JaveDateTimeOverride extends FlatSpec with ShouldMatchers {
-  ModelConverters.addConverter(new JavaDateTimeConverter, true)
+  val javaDateTimeConverter = new JavaDateTimeConverter
+  ModelConverters.addConverter(javaDateTimeConverter, true)
   val models = ModelConverters.readAll(classOf[ModelWithDate])
   JsonSerializer.asJson(models) should be ("""[{"id":"ModelWithDate","properties":{"dateValue":{"type":"integer","format":"int64"}}}]""")
+  // cleanup to avoid impacting other test cases with Date model members
+  ModelConverters.removeConverter(javaDateTimeConverter)
 }
 
 class JavaDateTimeConverter extends SwaggerSchemaConverter {

modules/swagger-core/src/test/scala/converter/SnakeCaseConverterTest.scala

@@ -24,7 +24,8 @@ import javax.xml.bind.annotation._
 class SnakeCaseConverterTest extends FlatSpec with ShouldMatchers {
   it should "ignore properties with type Bar" in {
     // add the custom converter
-    ModelConverters.addConverter(new SnakeCaseConverter, true)
+    val snakeCaseConverter = new SnakeCaseConverter
+    ModelConverters.addConverter(snakeCaseConverter, true)
 
     // make sure the field bar: converter.Bar is not present
     ModelConverters.read(classOf[SnakeCaseModel]) match {
@@ -34,6 +35,9 @@ class SnakeCaseConverterTest extends FlatSpec with ShouldMatchers {
       }
       case _ => fail("didn't read anything")
     }
+    
+    // cleanup to avoid impacting other test cases with Date model members
+    ModelConverters.removeConverter(snakeCaseConverter)
   }
 }