11package filter
22
3+ import com .wordnik .swagger .models .Swagger
34import com .wordnik .swagger .util ._
45import com .wordnik .swagger .core .filter ._
56
6- import io .swagger .parser .SwaggerParser ;
7-
87import org .junit .runner .RunWith
98import org .scalatest .junit .JUnitRunner
109import org .scalatest .FlatSpec
1110import org .scalatest .Matchers
1211
12+ import scala .io .Source
13+
1314import scala .collection .JavaConverters ._
1415
1516@ RunWith (classOf [JUnitRunner ])
1617class SpecFilterTest extends FlatSpec with Matchers {
1718 it should " clone everything" in {
18- val swagger = new SwaggerParser ().read(" src/test/scala/specFiles/petstore.json" )
19+ val json = Source .fromFile(" src/test/scala/specFiles/petstore.json" ).mkString
20+ val swagger = Json .mapper().readValue(json, classOf [Swagger ])
1921 val filtered = new SpecFilter ().filter(swagger, new NoOpOperationsFilter (), null , null , null )
2022
2123 Json .pretty(swagger) should equal(Json .pretty(filtered))
2224 }
2325
2426 it should " filter away get operations in a resource" in {
25- val swagger = new SwaggerParser ().read(" src/test/scala/specFiles/petstore.json" )
27+ val json = Source .fromFile(" src/test/scala/specFiles/petstore.json" ).mkString
28+ val swagger = Json .mapper().readValue(json, classOf [Swagger ])
2629 val filter = new NoGetOperationsFilter ()
2730
2831 val filtered = new SpecFilter ().filter(swagger, filter, null , null , null )
@@ -37,7 +40,8 @@ class SpecFilterTest extends FlatSpec with Matchers {
3740 }
3841
3942 it should " filter away the store resource" in {
40- val swagger = new SwaggerParser ().read(" src/test/scala/specFiles/petstore.json" )
43+ val json = Source .fromFile(" src/test/scala/specFiles/petstore.json" ).mkString
44+ val swagger = Json .mapper().readValue(json, classOf [Swagger ])
4145 val filter = new NoUserOperationsFilter ()
4246
4347 val filtered = new SpecFilter ().filter(swagger, filter, null , null , null )
@@ -52,7 +56,8 @@ class SpecFilterTest extends FlatSpec with Matchers {
5256 }
5357
5458 it should " filter away secret parameters" in {
55- val swagger = new SwaggerParser ().read(" src/test/scala/specFiles/sampleSpec.json" )
59+ val json = Source .fromFile(" src/test/scala/specFiles/sampleSpec.json" ).mkString
60+ val swagger = Json .mapper().readValue(json, classOf [Swagger ])
5661 val filter = new RemoveInternalParamsFilter ()
5762
5863 val filtered = new SpecFilter ().filter(swagger, filter, null , null , null )
@@ -71,7 +76,8 @@ class SpecFilterTest extends FlatSpec with Matchers {
7176 }
7277
7378 it should " filter away internal model properties" in {
74- val swagger = new SwaggerParser ().read(" src/test/scala/specFiles/sampleSpec.json" )
79+ val json = Source .fromFile(" src/test/scala/specFiles/sampleSpec.json" ).mkString
80+ val swagger = Json .mapper().readValue(json, classOf [Swagger ])
7581 val filter = new InternalModelPropertiesRemoverFilter ()
7682
7783 val filtered = new SpecFilter ().filter(swagger, filter, null , null , null )
0 commit comments