Fix deprecations for quarkus and rebase issue

FAForever · Aug 11, 2023 · a16f9ae · a16f9ae
1 parent 2a01b5f
commit a16f9ae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/src/test/kotlin/com/faforever/userservice/OAuthControllerTest.kt b/src/test/kotlin/com/faforever/userservice/OAuthControllerTest.kt
@@ -8,9 +8,9 @@ import com.faforever.userservice.web.OAuthController
 import io.quarkus.arc.Unremovable
 import io.quarkus.security.identity.SecurityIdentity
 import io.quarkus.security.runtime.QuarkusSecurityIdentity
+import io.quarkus.test.InjectMock
 import io.quarkus.test.common.http.TestHTTPEndpoint
 import io.quarkus.test.junit.QuarkusTest
-import io.quarkus.test.junit.mockito.InjectMock
 import io.quarkus.test.security.TestSecurity
 import io.quarkus.test.security.TestSecurityIdentityAugmentor
 import io.restassured.RestAssured

diff --git a/src/test/kotlin/com/faforever/userservice/backend/domain/LoginServiceTest.kt b/src/test/kotlin/com/faforever/userservice/backend/domain/LoginServiceTest.kt
@@ -1,14 +1,11 @@
 package com.faforever.userservice.backend.domain
 
-import com.faforever.domain.Ban
-import com.faforever.domain.BanLevel
-import com.faforever.domain.BanRepository
 import com.faforever.userservice.backend.login.LoginResult
 import com.faforever.userservice.backend.login.LoginServiceImpl
 import com.faforever.userservice.backend.login.SecurityProperties
 import com.faforever.userservice.backend.security.PasswordEncoder
+import io.quarkus.test.InjectMock
 import io.quarkus.test.junit.QuarkusTest
-import io.quarkus.test.junit.mockito.InjectMock
 import jakarta.inject.Inject
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.instanceOf

diff --git a/src/test/kotlin/com/faforever/userservice/backend/hydra/HydraServiceTest.kt b/src/test/kotlin/com/faforever/userservice/backend/hydra/HydraServiceTest.kt
@@ -5,8 +5,8 @@ import com.faforever.userservice.backend.domain.UserRepository
 import com.faforever.userservice.backend.login.LoginResult
 import com.faforever.userservice.backend.login.LoginService
 import com.faforever.userservice.backend.security.OAuthScope
+import io.quarkus.test.InjectMock
 import io.quarkus.test.junit.QuarkusTest
-import io.quarkus.test.junit.mockito.InjectMock
 import jakarta.inject.Inject
 import org.eclipse.microprofile.rest.client.inject.RestClient
 import org.hamcrest.MatcherAssert.assertThat

diff --git a/src/test/kotlin/com/faforever/userservice/backend/registration/RegistrationServiceTest.kt b/src/test/kotlin/com/faforever/userservice/backend/registration/RegistrationServiceTest.kt
@@ -8,8 +8,8 @@ import com.faforever.userservice.backend.domain.UserRepository
 import com.faforever.userservice.backend.security.FafTokenService
 import com.faforever.userservice.config.FafProperties
 import io.quarkus.mailer.MockMailbox
+import io.quarkus.test.InjectMock
 import io.quarkus.test.junit.QuarkusTest
-import io.quarkus.test.junit.mockito.InjectMock
 import jakarta.inject.Inject
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.hasSize