From 8d78d1f0a7665c33f6dd2048b593e8012c0f9787 Mon Sep 17 00:00:00 2001 From: Override-6 Date: Wed, 1 Mar 2023 15:38:17 +0100 Subject: [PATCH] some modification in tests --- .../test/{pages => endpoint}/TBasketPageSpec.scala | 7 +++++-- .../auth/LoginHandlerTests.scala} | 5 +++-- .../auth/RegisterHandlerTests.scala} | 9 +++++---- 3 files changed, 13 insertions(+), 8 deletions(-) rename tests/src/org/tbasket/test/{pages => endpoint}/TBasketPageSpec.scala (83%) rename tests/src/org/tbasket/test/{pages/LoginPageHandlerTests.scala => endpoint/auth/LoginHandlerTests.scala} (95%) rename tests/src/org/tbasket/test/{pages/RegisterPageHandlerTests.scala => endpoint/auth/RegisterHandlerTests.scala} (94%) diff --git a/tests/src/org/tbasket/test/pages/TBasketPageSpec.scala b/tests/src/org/tbasket/test/endpoint/TBasketPageSpec.scala similarity index 83% rename from tests/src/org/tbasket/test/pages/TBasketPageSpec.scala rename to tests/src/org/tbasket/test/endpoint/TBasketPageSpec.scala index 7be53f2..fa1ba07 100644 --- a/tests/src/org/tbasket/test/pages/TBasketPageSpec.scala +++ b/tests/src/org/tbasket/test/endpoint/TBasketPageSpec.scala @@ -1,4 +1,4 @@ -package org.tbasket.test.pages +package org.tbasket.test.endpoint import io.getquill.NamingStrategy import io.getquill.context.qzio.ZioJdbcContext @@ -21,7 +21,10 @@ abstract class TBasketPageSpec(location: String) extends ZIOSpecDefault { case Left(exception) => throw exception case Right(url) => url - protected def tspec: Spec[DataSource & ClientConfig & Authenticator & ConnectionPool & Scope & DatabaseContext & Client & StaticWebService, Any] + protected def tspec: Spec[ + DataSource & ClientConfig & Authenticator & ConnectionPool & + Scope & DatabaseContext & Client & StaticWebService, Any + ] final override def spec = tspec.provide( db.datasourceLayer, diff --git a/tests/src/org/tbasket/test/pages/LoginPageHandlerTests.scala b/tests/src/org/tbasket/test/endpoint/auth/LoginHandlerTests.scala similarity index 95% rename from tests/src/org/tbasket/test/pages/LoginPageHandlerTests.scala rename to tests/src/org/tbasket/test/endpoint/auth/LoginHandlerTests.scala index bbefe6b..7304951 100644 --- a/tests/src/org/tbasket/test/pages/LoginPageHandlerTests.scala +++ b/tests/src/org/tbasket/test/endpoint/auth/LoginHandlerTests.scala @@ -1,4 +1,4 @@ -package org.tbasket.test.pages +package org.tbasket.test.endpoint.auth import io.getquill.jdbczio.Quill import io.getquill.{SnakeCase, SqliteZioJdbcContext} @@ -9,6 +9,7 @@ import org.tbasket.endpoint.Endpoint.handle import org.tbasket.endpoint.auth.LoginHandler import org.tbasket.error.* import org.tbasket.test.TestUtils.* +import org.tbasket.test.endpoint.TBasketPageSpec import org.tbasket.test.{TestLayers, TestUtils} import zio.* import zio.http.* @@ -20,7 +21,7 @@ import zio.json.ast.{Json, JsonCursor} import zio.test.* import zio.test.Assertion.* -object LoginPageHandlerTests extends TBasketPageSpec("/login") { +object LoginHandlerTests extends TBasketPageSpec("/login") { private def requestsSpec = suite("bad request tests")( diff --git a/tests/src/org/tbasket/test/pages/RegisterPageHandlerTests.scala b/tests/src/org/tbasket/test/endpoint/auth/RegisterHandlerTests.scala similarity index 94% rename from tests/src/org/tbasket/test/pages/RegisterPageHandlerTests.scala rename to tests/src/org/tbasket/test/endpoint/auth/RegisterHandlerTests.scala index c62db8a..8ca7a36 100644 --- a/tests/src/org/tbasket/test/pages/RegisterPageHandlerTests.scala +++ b/tests/src/org/tbasket/test/endpoint/auth/RegisterHandlerTests.scala @@ -1,17 +1,18 @@ -package org.tbasket.test.pages +package org.tbasket.test.endpoint.auth import org.tbasket.endpoint.Endpoint.handle import org.tbasket.test.TestUtils import org.tbasket.test.TestUtils.* -import org.tbasket.test.pages.RegisterPageHandlerTests.test +import org.tbasket.test.endpoint.TBasketPageSpec +import org.tbasket.test.endpoint.auth.RegisterHandlerTests.test import zio.* import zio.http.* import zio.http.model.{HeaderNames, Headers, Status} import zio.json.ast.JsonCursor +import zio.test.* import zio.test.Assertion.* -import zio.test.{assert, *} -object RegisterPageHandlerTests extends TBasketPageSpec("/register") { +object RegisterHandlerTests extends TBasketPageSpec("/register") { private def requestsSpec = suite("bad request tests")(