test moved

softwaremill · Mar 24, 2021 · 63c9130 · 63c9130
1 parent 45e78a2
commit 63c9130
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 28 deletions.
diff --git a/...docs/src/test/resources/expected_auth.yml → ...test/resources/security/expected_auth.yml b/...docs/src/test/resources/expected_auth.yml → ...test/resources/security/expected_auth.yml
diff --git a/docs/openapi-docs/src/test/scala/sttp/tapir/docs/openapi/VerifyYamlSecurityTest.scala b/docs/openapi-docs/src/test/scala/sttp/tapir/docs/openapi/VerifyYamlSecurityTest.scala
@@ -11,6 +11,19 @@ import scala.collection.immutable.ListMap
 
 class VerifyYamlSecurityTest extends AnyFunSuite with Matchers {
 
+  test("should support authentication") {
+    val expectedYaml = load("security/expected_auth.yml")
+
+    val e1 = endpoint.in(auth.bearer[String]()).in("api1" / path[String]).out(stringBody)
+    val e2 = endpoint.in(auth.bearer[String]()).in("api2" / path[String]).out(stringBody)
+    val e3 = endpoint.in(auth.apiKey(header[String]("apikey"))).in("api3" / path[String]).out(stringBody)
+
+    val actualYaml = OpenAPIDocsInterpreter.toOpenAPI(List(e1, e2, e3), Info("Fruits", "1.0")).toYaml
+    val actualYamlNoIndent = noIndentation(actualYaml)
+
+    actualYamlNoIndent shouldBe expectedYaml
+  }
+
   test("should support optional authentication") {
     val expectedYaml = load("security/expected_optional_auth.yml")
 

diff --git a/docs/openapi-docs/src/test/scala/sttp/tapir/docs/openapi/VerifyYamlTest.scala b/docs/openapi-docs/src/test/scala/sttp/tapir/docs/openapi/VerifyYamlTest.scala
@@ -1,29 +1,24 @@
 package sttp.tapir.docs.openapi
 
-import java.time.ZoneOffset.UTC
-import java.time.{Instant, LocalDateTime, ZonedDateTime}
 import io.circe.Json
 import io.circe.generic.auto._
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.matchers.should.Matchers
+import sttp.capabilities.Streams
 import sttp.model.{Method, StatusCode}
-import sttp.tapir.{Endpoint, endpoint}
-import sttp.tapir.EndpointIO.Example
-import sttp.tapir._
-import sttp.tapir.generic.auto._
-import sttp.tapir.docs.openapi.dtos.{Author, Book, Country, Genre}
+import sttp.tapir.SchemaType.SObjectInfo
+import sttp.tapir.docs.openapi.dtos.Book
 import sttp.tapir.docs.openapi.dtos.a.{Pet => APet}
 import sttp.tapir.docs.openapi.dtos.b.{Pet => BPet}
-import sttp.tapir.generic.{Configuration, Derived}
+import sttp.tapir.generic.Derived
+import sttp.tapir.generic.auto._
 import sttp.tapir.json.circe._
 import sttp.tapir.openapi.circe.yaml._
-import sttp.tapir.openapi.{Contact, Info, License, Server, ServerVariable}
+import sttp.tapir.openapi._
 import sttp.tapir.tests.{Person, _}
+import sttp.tapir.{Endpoint, endpoint, _}
 
-import scala.collection.immutable.ListMap
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatest.matchers.should.Matchers
-import sttp.capabilities.Streams
-import sttp.tapir.SchemaType.SObjectInfo
-import sttp.tapir.model.UsernamePassword
+import java.time.{Instant, LocalDateTime}
 
 class VerifyYamlTest extends AnyFunSuite with Matchers {
   val all_the_way: Endpoint[(FruitAmount, String), Unit, (FruitAmount, Int), Any] = endpoint
@@ -137,19 +132,6 @@ class VerifyYamlTest extends AnyFunSuite with Matchers {
     actualYamlNoIndent shouldBe expectedYaml
   }
 
-  test("should support authentication") {
-    val expectedYaml = load("expected_auth.yml")
-
-    val e1 = endpoint.in(auth.bearer[String]()).in("api1" / path[String]).out(stringBody)
-    val e2 = endpoint.in(auth.bearer[String]()).in("api2" / path[String]).out(stringBody)
-    val e3 = endpoint.in(auth.apiKey(header[String]("apikey"))).in("api3" / path[String]).out(stringBody)
-
-    val actualYaml = OpenAPIDocsInterpreter.toOpenAPI(List(e1, e2, e3), Info("Fruits", "1.0")).toYaml
-    val actualYamlNoIndent = noIndentation(actualYaml)
-
-    actualYamlNoIndent shouldBe expectedYaml
-  }
-
   test("should support empty bodies") {
     val expectedYaml = load("expected_empty.yml")