Push works

cccp-education · Sep 30, 2024 · 937d932 · 937d932
1 parent 13ae0f3
commit 937d932
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/springboot/api/src/test/kotlin/core/AppUtilsTests.kt b/springboot/api/src/test/kotlin/core/AppUtilsTests.kt
@@ -9,20 +9,19 @@ import org.springframework.beans.factory.getBean
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 import org.springframework.test.context.ActiveProfiles
+import tdd.TestUtils.Data.user
 import webapp.Application
-import webapp.TestUtils.Data.user
 import webapp.core.utils.AppUtils.cleanField
 import webapp.core.utils.AppUtils.toJson
 import webapp.core.utils.i
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-
+@ActiveProfiles("test")
 @SpringBootTest(
-    properties = ["spring.main.web-application-type=reactive"],
-    classes = [Application::class]
+    classes = [Application::class],
+    properties = ["spring.main.web-application-type=reactive"]
 )
-@ActiveProfiles("test")
 class AppUtilsTests {
 
     @Autowired

diff --git a/...t/api/src/test/kotlin/webapp/TestTools.kt → ...boot/api/src/test/kotlin/tdd/TestTools.kt b/...t/api/src/test/kotlin/webapp/TestTools.kt → ...boot/api/src/test/kotlin/tdd/TestTools.kt
@@ -1,6 +1,6 @@
 @file:Suppress("unused")
 
-package webapp
+package tdd
 
 
 //import webapp.accounts.models.Account
@@ -18,6 +18,7 @@ import org.hamcrest.TypeSafeDiagnosingMatcher
 import org.springframework.boot.runApplication
 import org.springframework.boot.web.reactive.context.StandardReactiveWebEnvironment
 import org.springframework.context.ConfigurableApplicationContext
+import webapp.Application
 import webapp.core.property.*
 import webapp.core.utils.i
 import java.io.IOException

diff --git a/...t/api/src/test/kotlin/webapp/TestUtils.kt → ...boot/api/src/test/kotlin/tdd/TestUtils.kt b/...t/api/src/test/kotlin/webapp/TestUtils.kt → ...boot/api/src/test/kotlin/tdd/TestUtils.kt
@@ -4,7 +4,7 @@
     "unused"
 )
 
-package webapp
+package tdd
 
 import org.springframework.beans.factory.getBean
 import org.springframework.context.ApplicationContext

diff --git a/springboot/api/src/test/kotlin/webapp/ApplicationTests.kt b/springboot/api/src/test/kotlin/webapp/ApplicationTests.kt
@@ -6,7 +6,7 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 import org.springframework.context.MessageSource
 import org.springframework.test.context.ActiveProfiles
-import webapp.TestUtils.Data.OFFICIAL_SITE
+import tdd.TestUtils.Data.OFFICIAL_SITE
 import webapp.core.property.Config
 import webapp.core.property.DEVELOPMENT
 import webapp.core.property.PRODUCTION

diff --git a/springboot/api/src/test/kotlin/webapp/users/UserDaoTests.kt b/springboot/api/src/test/kotlin/webapp/users/UserDaoTests.kt
@@ -12,11 +12,11 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 import org.springframework.dao.EmptyResultDataAccessException
 import org.springframework.test.context.ActiveProfiles
-import webapp.TestUtils.Data.user
-import webapp.TestUtils.countRoles
-import webapp.TestUtils.countUsers
-import webapp.TestUtils.defaultRoles
-import webapp.TestUtils.deleteAllUsersOnly
+import tdd.TestUtils.Data.user
+import tdd.TestUtils.countRoles
+import tdd.TestUtils.countUsers
+import tdd.TestUtils.defaultRoles
+import tdd.TestUtils.deleteAllUsersOnly
 import webapp.core.model.EntityModel.Members.withId
 import webapp.core.utils.AppUtils.cleanField
 import webapp.core.utils.AppUtils.toJson

diff --git a/springboot/api/src/test/kotlin/webapp/users/UserTests.kt b/springboot/api/src/test/kotlin/webapp/users/UserTests.kt
@@ -11,11 +11,11 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.ApplicationContext
 import org.springframework.dao.EmptyResultDataAccessException
 import org.springframework.test.context.ActiveProfiles
-import webapp.TestUtils.Data.user
-import webapp.TestUtils.countRoles
-import webapp.TestUtils.countUsers
-import webapp.TestUtils.defaultRoles
-import webapp.TestUtils.deleteAllUsersOnly
+import tdd.TestUtils.Data.user
+import tdd.TestUtils.countRoles
+import tdd.TestUtils.countUsers
+import tdd.TestUtils.defaultRoles
+import tdd.TestUtils.deleteAllUsersOnly
 import webapp.core.model.EntityModel.Members.withId
 import webapp.users.UserDao.Dao.findOneByEmail
 import webapp.users.UserDao.Dao.save

diff --git a/springboot/api/src/test/kotlin/webapp/users/signup/SignupIntegrationTests.kt b/springboot/api/src/test/kotlin/webapp/users/signup/SignupIntegrationTests.kt
@@ -18,14 +18,14 @@ import org.springframework.http.MediaType.APPLICATION_JSON
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.reactive.server.returnResult
-import webapp.TestTools.logBody
-import webapp.TestTools.requestToString
-import webapp.TestUtils
-import webapp.TestUtils.Data.DEFAULT_USER_JSON
-import webapp.TestUtils.Data.user
-import webapp.TestUtils.countUserAuthority
-import webapp.TestUtils.countUsers
-import webapp.TestUtils.deleteAllUsersOnly
+import tdd.TestTools.logBody
+import tdd.TestTools.requestToString
+import tdd.TestUtils
+import tdd.TestUtils.Data.DEFAULT_USER_JSON
+import tdd.TestUtils.Data.user
+import tdd.TestUtils.countUserAuthority
+import tdd.TestUtils.countUsers
+import tdd.TestUtils.deleteAllUsersOnly
 import webapp.core.utils.i
 import webapp.users.User
 import webapp.users.UserDao.Dao.findOneByEmail