updated tests to 1.3.10 core

Author: fehguy

modules/swagger-play2/app/play/modules/swagger/PlayApiReader.scala

@@ -252,11 +252,14 @@ class PlayApiReader(val routes: Option[Routes]) extends JaxrsApiReader {
         case e: String if e.trim != "" => e.split(",").map(_.trim).toList
         case _ => List()
       }
-      val authorizations:List[com.wordnik.swagger.model.Authorization] = Option(apiOperation.authorizations) match {
+      val authorizations: List[com.wordnik.swagger.model.Authorization] = Option(apiOperation.authorizations) match {
         case Some(e) => (for(a <- e) yield {
           val scopes = (for(s <- a.scopes) yield com.wordnik.swagger.model.AuthorizationScope(s.scope, s.description)).toArray
-          new com.wordnik.swagger.model.Authorization(a.value, scopes)
-        }).toList
+          if(a.value != null && !"".equals(a.value))
+            Some(new com.wordnik.swagger.model.Authorization(a.value, scopes))
+          else
+            None
+        }).flatten.toList
         case _ => List()
       }
       val responseClass = apiOperation.responseContainer match {

modules/swagger-play2/test/PlayApiReaderSpec.scala

@@ -15,7 +15,6 @@ import org.mockito.Mockito._
 
 
 class PlayApiReaderSpec extends Specification with Mockito {
-
   "PlayApiReader.SwaggerUtils" should {
     "convert a simple play route comment" in {
       val path = "/pet.json/$id<[^/]+>/test/$nothing<[^/]+>"
@@ -84,7 +83,6 @@ class PlayApiReaderSpec extends Specification with Mockito {
 
 
   "with Object as Controller" should {
-
     "get full name for method" in {
       reader.getFullMethodName(dogControllerClass, dogMethod("add1").get) must beEqualTo("test.testdata.DogController$.add1")
     }
@@ -119,7 +117,6 @@ class PlayApiReaderSpec extends Specification with Mockito {
     "get request path for a method that has path params" in {
       reader.getPath(catControllerClass, catControllerClass.getMethod("get1", classOf[Long])).getOrElse("") must beEqualTo("/api/cat/:id")
     }
-
   }
 
 
@@ -157,7 +154,6 @@ class PlayApiReaderSpec extends Specification with Mockito {
   }
 
   "readMethod with Object as controller" should {
-
     "create Operation for annotated method" in {
       val maybeOperation: Option[Operation] = reader.readMethod(dogMethod("list").get)
       maybeOperation.nonEmpty must beTrue
@@ -188,20 +184,22 @@ class PlayApiReaderSpec extends Specification with Mockito {
 
     "adds empty 'authorizations' when not defined" in {
       val operation: Operation = reader.readMethod(dogMethod("add1").get).get
+      println(operation.authorizations)
       operation.authorizations must beEqualTo(List.empty)
     }
 
     "adds 'authorizations' when defined" in {
       val operation: Operation = reader.readMethod(dogMethod("add2").get).get
       operation.authorizations.length must beEqualTo(1)
-      operation.authorizations.head must beEqualTo("vet")
+      operation.authorizations.head.`type` must beEqualTo("oauth2")
     }
 
-    "adds mulitple 'authorizations' when defined" in {
+    "adds multiple 'authorizations' when defined" in {
       val operation: Operation = reader.readMethod(dogMethod("add3").get).get
       operation.authorizations.length must beEqualTo(2)
-      operation.authorizations.contains("vet") must beTrue
-      operation.authorizations.contains("owner") must beTrue
+      val authNames = (for(auth <- operation.authorizations) yield auth.`type`).toSet
+      authNames.contains("oauth2") must beTrue
+      authNames.contains("api_key") must beTrue
     }
 
     "adds empty 'produces' when not defined" in {

modules/swagger-play2/test/testdata/CatController.scala

@@ -17,7 +17,6 @@ class CatController extends Controller {
 
   @ApiOperation(value = "addCat1",
       httpMethod = "PUT",
-      authorizations = "",
       consumes = "",
       protocols = "")
     @ApiImplicitParams(Array(
@@ -60,13 +59,9 @@ class CatController extends Controller {
       request => Ok("test case")
     }
 
-
     def no_route = Action {
       request => Ok("test case")
     }
-
-
-
 }
 
 case class Cat(id: Long, name: String)

modules/swagger-play2/test/testdata/DogController.scala

@@ -22,15 +22,16 @@ import scala.concurrent.Future
   produces = "application/json, application/xml",
   consumes = "application/json, application/xml",
   protocols = "http, https",
-  authorizations = "vet, owner"
+  authorizations = Array(new Authorization(value="oauth2",
+    scopes = Array(
+      new AuthorizationScope(scope = "vet", description = "vet access"),
+      new AuthorizationScope(scope = "owner", description = "owner access")
+    ))
+  )
 )
 object DogController extends Controller {
-
   @ApiOperation(value = "addDog1",
-    httpMethod = "PUT",
-    authorizations = "",
-    consumes = "",
-    protocols = "")
+    httpMethod = "PUT")
   @ApiImplicitParams(Array(
     new ApiImplicitParam(name = "dog", value = "Dog object to add", required = true, dataType = "Dog", paramType = "body")))
   def add1 = Action {
@@ -41,7 +42,12 @@ object DogController extends Controller {
     notes = "Adds a dogs better",
     httpMethod = "PUT",
     nickname = "addDog2_nickname",
-    authorizations = "vet",
+    authorizations = Array(new Authorization(value="oauth2",
+      scopes = Array(
+        new AuthorizationScope(scope = "vet", description = "vet access"),
+        new AuthorizationScope(scope = "owner", description = "owner access")
+      ))
+    ),
     consumes = " application/json ",
     protocols = "http",
     position = 2)
@@ -55,7 +61,13 @@ object DogController extends Controller {
   @ApiOperation(value = "Add a new Dog",
     notes = "Adds a dogs nicely",
     httpMethod = "PUT",
-    authorizations = "vet, owner",
+    authorizations = Array(new Authorization(value="oauth2",
+      scopes = Array(
+        new AuthorizationScope(scope = "vet", description = "vet access"),
+        new AuthorizationScope(scope = "owner", description = "owner access")
+      )),
+      new Authorization(value="api_key")
+    ),
     consumes = " application/json, text/yaml ",
     protocols = "http, https"
   )
@@ -177,7 +189,6 @@ object DogController extends Controller {
   def undefined_method() = Action {
     request => Ok("test case")
   }
-
 }
 
 case class Dog(id: Long, name: String)