Cleanup test classes

dzikoysk · Jul 11, 2023 · 2394fa8 · 2394fa8
1 parent 8e364c1
commit 2394fa8
Show file tree

Hide file tree

Showing 23 changed files with 62 additions and 68 deletions.
diff --git a/...mentalLocalSpecificationJunitExtension.kt → ...mentalLocalSpecificationJunitExtension.kt b/...mentalLocalSpecificationJunitExtension.kt → ...mentalLocalSpecificationJunitExtension.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.reposilite.specification
+package com.reposilite
 
 import com.reposilite.storage.filesystem.FileSystemStorageProviderSettings
 import org.junit.jupiter.api.extension.BeforeEachCallback

diff --git a/...entalRemoteSpecficiationJunitExtension.kt → ...entalRemoteSpecficiationJunitExtension.kt b/...entalRemoteSpecficiationJunitExtension.kt → ...entalRemoteSpecficiationJunitExtension.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.reposilite.specification
+package com.reposilite
 
 import com.reposilite.storage.filesystem.FileSystemStorageProviderSettings
 import org.junit.jupiter.api.extension.AfterEachCallback

diff --git a/...ation/LocalSpecificationJunitExtension.kt → ...mendedLocalSpecificationJunitExtension.kt b/...ation/LocalSpecificationJunitExtension.kt → ...mendedLocalSpecificationJunitExtension.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.reposilite.specification
+package com.reposilite
 
 import com.reposilite.storage.filesystem.FileSystemStorageProviderSettings
 import org.junit.jupiter.api.extension.BeforeEachCallback
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.extension.ExtensionContext
  * - SQLite
  * - Local file system
  */
-internal class LocalSpecificationJunitExtension : Extension, BeforeEachCallback {
+internal class RecommendedLocalSpecificationJunitExtension : Extension, BeforeEachCallback {
 
     override fun beforeEach(context: ExtensionContext?) {
         context?.also {

diff --git a/...tion/RemoteSpecificationJunitExtension.kt → ...endedRemoteSpecificationJunitExtension.kt b/...tion/RemoteSpecificationJunitExtension.kt → ...endedRemoteSpecificationJunitExtension.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.reposilite.specification
+package com.reposilite
 
 import com.reposilite.storage.s3.S3StorageProviderSettings
 import org.junit.jupiter.api.extension.AfterEachCallback
@@ -34,7 +34,7 @@ import org.testcontainers.utility.DockerImageName
  * - AWS S3 through LocalStack
  */
 @Testcontainers
-internal class RemoteSpecificationJunitExtension : Extension, BeforeEachCallback, AfterEachCallback {
+internal class RecommendedRemoteSpecificationJunitExtension : Extension, BeforeEachCallback, AfterEachCallback {
 
     private class SpecifiedMariaDBContainer(image: String) : MariaDBContainer<SpecifiedMariaDBContainer>(DockerImageName.parse(image))
 

diff --git a/...osilite/specification/ReposiliteRunner.kt → ...kotlin/com/reposilite/ReposiliteRunner.kt b/...osilite/specification/ReposiliteRunner.kt → ...kotlin/com/reposilite/ReposiliteRunner.kt
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-package com.reposilite.specification
+package com.reposilite
 
-import com.reposilite.Reposilite
-import com.reposilite.ReposiliteFactory
-import com.reposilite.ReposiliteParameters
 import com.reposilite.configuration.local.LocalConfiguration
 import com.reposilite.configuration.local.infrastructure.LOCAL_CONFIGURATION_FILE
 import com.reposilite.configuration.shared.SharedConfigurationFacade
@@ -38,15 +35,13 @@ import org.junit.jupiter.api.io.TempDir
 import panda.std.Result
 import panda.std.reactive.ReferenceUtils
 import java.io.File
-import java.io.PrintStream
-import java.nio.file.Files
 import java.util.concurrent.ThreadLocalRandom
 
 /**
  * This is a dirty launcher of Reposilite instance for integration tests.
  * Every integration test is launched twice, with local and remote integrations, through dedicated extensions:
- * - [LocalSpecificationJunitExtension]
- * - [RemoteSpecificationJunitExtension]
+ * - [RecommendedLocalSpecificationJunitExtension]
+ * - [RecommendedRemoteSpecificationJunitExtension]
  */
 @Suppress("PropertyName")
 internal abstract class ReposiliteRunner {

diff --git a/.../specification/ReposiliteSpecification.kt → ...com/reposilite/ReposiliteSpecification.kt b/.../specification/ReposiliteSpecification.kt → ...com/reposilite/ReposiliteSpecification.kt
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.reposilite.specification
+package com.reposilite
 
-import com.reposilite.ReposiliteObjectMapper
 import com.reposilite.maven.MavenFacade
 import com.reposilite.maven.api.DeployRequest
 import com.reposilite.maven.api.Metadata

diff --git a/...te-backend/src/integration/kotlin/com/reposilite/configuration/SettingsIntegrationTest.kt b/...te-backend/src/integration/kotlin/com/reposilite/configuration/SettingsIntegrationTest.kt
@@ -26,8 +26,8 @@ import com.reposilite.configuration.specification.SettingsIntegrationSpecificati
 import com.reposilite.frontend.application.FrontendSettings
 import com.reposilite.maven.application.MavenSettings
 import com.reposilite.shared.ErrorResponse
-import com.reposilite.specification.LocalSpecificationJunitExtension
-import com.reposilite.specification.RemoteSpecificationJunitExtension
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
+import com.reposilite.RecommendedRemoteSpecificationJunitExtension
 import com.reposilite.statistics.api.ResolvedRequestsInterval.YEARLY
 import com.reposilite.statistics.application.StatisticsSettings
 import com.reposilite.web.application.WebSettings
@@ -38,10 +38,10 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
 internal class LocalSettingsIntegrationTest : SettingsIntegrationTest()
 
-@ExtendWith(RemoteSpecificationJunitExtension::class)
+@ExtendWith(RecommendedRemoteSpecificationJunitExtension::class)
 internal class RemoteSettingsIntegrationTest : SettingsIntegrationTest()
 
 internal abstract class SettingsIntegrationTest : SettingsIntegrationSpecification() {

diff --git a/...te/ReposiliteParametersIntegrationTest.kt → ...ation/StartupParametersIntegrationTest.kt b/...te/ReposiliteParametersIntegrationTest.kt → ...ation/StartupParametersIntegrationTest.kt
@@ -16,19 +16,20 @@
 
 @file:Suppress("FunctionName")
 
-package com.reposilite
+package com.reposilite.configuration
 
+import com.reposilite.ReposiliteParameters
 import com.reposilite.configuration.shared.SharedConfigurationFacade
 import com.reposilite.frontend.application.FrontendSettings
-import com.reposilite.specification.LocalSpecificationJunitExtension
-import com.reposilite.specification.ReposiliteSpecification
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
+import com.reposilite.ReposiliteSpecification
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import java.nio.file.Files
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
-internal class ReposiliteParametersIntegrationTest : ReposiliteSpecification() {
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
+internal class StartupParametersIntegrationTest : ReposiliteSpecification() {
 
     override fun overrideParameters(parameters: ReposiliteParameters) {
         // given: a custom shared configuration

diff --git a/...ion/kotlin/com/reposilite/configuration/specification/SettingsIntegrationSpecification.kt b/...ion/kotlin/com/reposilite/configuration/specification/SettingsIntegrationSpecification.kt
@@ -16,6 +16,6 @@
 
 package com.reposilite.configuration.specification
 
-import com.reposilite.specification.ReposiliteSpecification
+import com.reposilite.ReposiliteSpecification
 
 internal abstract class SettingsIntegrationSpecification : ReposiliteSpecification()
diff --git a/reposilite-backend/src/integration/kotlin/com/reposilite/javadocs/JavadocsIntegrationTest.kt b/reposilite-backend/src/integration/kotlin/com/reposilite/javadocs/JavadocsIntegrationTest.kt
@@ -3,18 +3,18 @@
 package com.reposilite.javadocs
 
 import com.reposilite.javadocs.specification.JavadocsIntegrationSpecification
-import com.reposilite.specification.LocalSpecificationJunitExtension
-import com.reposilite.specification.RemoteSpecificationJunitExtension
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
+import com.reposilite.RecommendedRemoteSpecificationJunitExtension
 import com.reposilite.storage.api.Location
 import kong.unirest.Unirest.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
 internal class LocalJavadocsIntegrationTest : JavadocsIntegrationTest()
 
-@ExtendWith(RemoteSpecificationJunitExtension::class)
+@ExtendWith(RecommendedRemoteSpecificationJunitExtension::class)
 internal class RemoteJavadocsIntegrationTest : JavadocsIntegrationTest()
 
 internal abstract class JavadocsIntegrationTest : JavadocsIntegrationSpecification() {

diff --git a/...egration/kotlin/com/reposilite/javadocs/specification/JavadocsIntegrationSpecification.kt b/...egration/kotlin/com/reposilite/javadocs/specification/JavadocsIntegrationSpecification.kt
@@ -1,5 +1,5 @@
 package com.reposilite.javadocs.specification
 
-import com.reposilite.specification.ReposiliteSpecification
+import com.reposilite.ReposiliteSpecification
 
 internal abstract class JavadocsIntegrationSpecification : ReposiliteSpecification()
diff --git a/reposilite-backend/src/integration/kotlin/com/reposilite/maven/MavenApiIntegrationTest.kt b/reposilite-backend/src/integration/kotlin/com/reposilite/maven/MavenApiIntegrationTest.kt
@@ -19,8 +19,8 @@
 package com.reposilite.maven
 
 import com.reposilite.maven.specification.MavenIntegrationSpecification
-import com.reposilite.specification.LocalSpecificationJunitExtension
-import com.reposilite.specification.RemoteSpecificationJunitExtension
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
+import com.reposilite.RecommendedRemoteSpecificationJunitExtension
 import com.reposilite.token.RoutePermission.READ
 import io.javalin.http.HttpStatus.UNAUTHORIZED
 import kong.unirest.Unirest.get
@@ -30,10 +30,10 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
 internal class LocalMavenApiIntegrationTest : MavenApiIntegrationTest()
 
-@ExtendWith(RemoteSpecificationJunitExtension::class)
+@ExtendWith(RecommendedRemoteSpecificationJunitExtension::class)
 internal class RemoteMavenApiIntegrationTest : MavenApiIntegrationTest()
 
 internal abstract class MavenApiIntegrationTest : MavenIntegrationSpecification() {

diff --git a/reposilite-backend/src/integration/kotlin/com/reposilite/maven/MavenIntegrationTest.kt b/reposilite-backend/src/integration/kotlin/com/reposilite/maven/MavenIntegrationTest.kt
@@ -19,12 +19,10 @@
 package com.reposilite.maven
 
 import com.reposilite.configuration.local.LocalConfiguration
-import com.reposilite.configuration.shared.SharedConfigurationFacade
-import com.reposilite.maven.application.MavenSettings
 import com.reposilite.maven.specification.MavenIntegrationSpecification
 import com.reposilite.shared.ErrorResponse
-import com.reposilite.specification.LocalSpecificationJunitExtension
-import com.reposilite.specification.RemoteSpecificationJunitExtension
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
+import com.reposilite.RecommendedRemoteSpecificationJunitExtension
 import com.reposilite.storage.api.DocumentInfo
 import io.javalin.http.HttpStatus.NOT_FOUND
 import io.javalin.http.HttpStatus.UNAUTHORIZED
@@ -40,10 +38,10 @@ import org.junit.jupiter.api.extension.ExtendWith
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CountDownLatch
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
 internal class LocalMavenIntegrationTest : MavenIntegrationTest()
 
-@ExtendWith(RemoteSpecificationJunitExtension::class)
+@ExtendWith(RecommendedRemoteSpecificationJunitExtension::class)
 internal class RemoteMavenIntegrationTest : MavenIntegrationTest()
 
 internal abstract class MavenIntegrationTest : MavenIntegrationSpecification() {

diff --git a/...rc/integration/kotlin/com/reposilite/maven/specification/MavenIntegrationSpecification.kt b/...rc/integration/kotlin/com/reposilite/maven/specification/MavenIntegrationSpecification.kt
@@ -16,7 +16,7 @@
 
 package com.reposilite.maven.specification
 
-import com.reposilite.specification.ReposiliteSpecification
+import com.reposilite.ReposiliteSpecification
 import io.javalin.Javalin
 import kotlinx.coroutines.Job
 

diff --git a/...ite-backend/src/integration/kotlin/com/reposilite/statistics/StatisticsIntegrationTest.kt b/...ite-backend/src/integration/kotlin/com/reposilite/statistics/StatisticsIntegrationTest.kt
@@ -19,10 +19,10 @@
 package com.reposilite.statistics
 
 import com.reposilite.maven.api.Identifier
-import com.reposilite.specification.ExperimentalLocalSpecificationJunitExtension
-import com.reposilite.specification.ExperimentalRemoteSpecficiationJunitExtension
-import com.reposilite.specification.LocalSpecificationJunitExtension
-import com.reposilite.specification.RemoteSpecificationJunitExtension
+import com.reposilite.ExperimentalLocalSpecificationJunitExtension
+import com.reposilite.ExperimentalRemoteSpecficiationJunitExtension
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
+import com.reposilite.RecommendedRemoteSpecificationJunitExtension
 import com.reposilite.statistics.api.AllResolvedResponse
 import com.reposilite.statistics.api.IntervalRecord
 import com.reposilite.statistics.api.RepositoryStatistics
@@ -44,13 +44,13 @@ import java.time.temporal.ChronoUnit
 @ExtendWith(ExperimentalRemoteSpecficiationJunitExtension::class)
 internal class ExperimentalRemoteStatisticsIntegrationTest : StatisticsIntegrationTest()
 
-@ExtendWith(RemoteSpecificationJunitExtension::class)
+@ExtendWith(RecommendedRemoteSpecificationJunitExtension::class)
 internal class RemoteStatisticsIntegrationTest : StatisticsIntegrationTest()
 
 @ExtendWith(ExperimentalLocalSpecificationJunitExtension::class)
 internal class ExperimentalLocalStatisticsIntegrationTest : StatisticsIntegrationTest()
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
 internal class LocalStatisticsIntegrationTest : StatisticsIntegrationTest()
 
 internal abstract class StatisticsIntegrationTest : StatisticsIntegrationSpecification() {

diff --git a/...tion/kotlin/com/reposilite/statistics/specification/StatisticsIntegrationSpecification.kt b/...tion/kotlin/com/reposilite/statistics/specification/StatisticsIntegrationSpecification.kt
@@ -16,7 +16,7 @@
 
 package com.reposilite.statistics.specification
 
-import com.reposilite.specification.ReposiliteSpecification
+import com.reposilite.ReposiliteSpecification
 import com.reposilite.maven.api.Identifier
 import com.reposilite.statistics.StatisticsFacade
 import io.javalin.http.HttpStatus.OK

diff --git a/reposilite-backend/src/integration/kotlin/com/reposilite/status/StatusIntegrationTest.kt b/reposilite-backend/src/integration/kotlin/com/reposilite/status/StatusIntegrationTest.kt
@@ -19,10 +19,10 @@
 package com.reposilite.status
 
 import com.reposilite.VERSION
-import com.reposilite.specification.ExperimentalLocalSpecificationJunitExtension
-import com.reposilite.specification.ExperimentalRemoteSpecficiationJunitExtension
-import com.reposilite.specification.LocalSpecificationJunitExtension
-import com.reposilite.specification.RemoteSpecificationJunitExtension
+import com.reposilite.ExperimentalLocalSpecificationJunitExtension
+import com.reposilite.ExperimentalRemoteSpecficiationJunitExtension
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
+import com.reposilite.RecommendedRemoteSpecificationJunitExtension
 import com.reposilite.status.api.InstanceStatusResponse
 import com.reposilite.status.api.StatusSnapshot
 import com.reposilite.status.specification.StatusIntegrationSpecification
@@ -37,13 +37,13 @@ import org.junit.jupiter.api.extension.ExtendWith
 @ExtendWith(ExperimentalRemoteSpecficiationJunitExtension::class)
 internal class ExperimentalRemoteStatusIntegrationTest : StatusIntegrationTest()
 
-@ExtendWith(RemoteSpecificationJunitExtension::class)
+@ExtendWith(RecommendedRemoteSpecificationJunitExtension::class)
 internal class RemoteStatusIntegrationTest : StatusIntegrationTest()
 
 @ExtendWith(ExperimentalLocalSpecificationJunitExtension::class)
 internal class ExperimentalLocalStatusIntegrationTest : StatusIntegrationTest()
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
 internal class LocalStatusIntegrationTest : StatusIntegrationTest()
 
 internal abstract class StatusIntegrationTest : StatusIntegrationSpecification() {

diff --git a/.../integration/kotlin/com/reposilite/status/specification/StatusIntegrationSpecification.kt b/.../integration/kotlin/com/reposilite/status/specification/StatusIntegrationSpecification.kt
@@ -16,7 +16,7 @@
 
 package com.reposilite.status.specification
 
-import com.reposilite.specification.ReposiliteSpecification
+import com.reposilite.ReposiliteSpecification
 
 internal abstract class StatusIntegrationSpecification : ReposiliteSpecification() {
 

diff --git a/...backend/src/integration/kotlin/com/reposilite/token/AccessTokenCommandsIntegrationTest.kt b/...backend/src/integration/kotlin/com/reposilite/token/AccessTokenCommandsIntegrationTest.kt
@@ -18,7 +18,7 @@
 
 package com.reposilite.token
 
-import com.reposilite.specification.LocalSpecificationJunitExtension
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
 import com.reposilite.console.CommandStatus.SUCCEEDED
 import com.reposilite.console.ConsoleFacade
 import com.reposilite.token.AccessTokenPermission.MANAGER
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import panda.std.ResultAssertions.assertOk
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
 internal class LocalAccessTokenCommandsIntegrationTest : AccessTokenCommandsIntegrationTest()
 
 internal abstract class AccessTokenCommandsIntegrationTest : AccessTokenIntegrationSpecification() {

diff --git a/reposilite-backend/src/integration/kotlin/com/reposilite/token/AccessTokenIntegrationTest.kt b/reposilite-backend/src/integration/kotlin/com/reposilite/token/AccessTokenIntegrationTest.kt
@@ -19,8 +19,8 @@
 package com.reposilite.token
 
 import com.reposilite.shared.ErrorResponse
-import com.reposilite.specification.LocalSpecificationJunitExtension
-import com.reposilite.specification.RemoteSpecificationJunitExtension
+import com.reposilite.RecommendedLocalSpecificationJunitExtension
+import com.reposilite.RecommendedRemoteSpecificationJunitExtension
 import com.reposilite.token.AccessTokenPermission.MANAGER
 import com.reposilite.token.AccessTokenType.PERSISTENT
 import com.reposilite.token.api.AccessTokenDto
@@ -36,10 +36,10 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 
-@ExtendWith(LocalSpecificationJunitExtension::class)
+@ExtendWith(RecommendedLocalSpecificationJunitExtension::class)
 internal class LocalAccessTokenIntegrationTest : AccessTokenIntegrationTest()
 
-@ExtendWith(RemoteSpecificationJunitExtension::class)
+@ExtendWith(RecommendedRemoteSpecificationJunitExtension::class)
 internal class RemoteAccessTokenIntegrationTest : AccessTokenIntegrationTest()
 
 internal abstract class AccessTokenIntegrationTest : AccessTokenIntegrationSpecification() {

diff --git a/...egration/kotlin/com/reposilite/token/specification/AccessTokenIntegrationSpecification.kt b/...egration/kotlin/com/reposilite/token/specification/AccessTokenIntegrationSpecification.kt
@@ -16,7 +16,7 @@
 
 package com.reposilite.token.specification
 
-import com.reposilite.specification.ReposiliteSpecification
+import com.reposilite.ReposiliteSpecification
 import com.reposilite.auth.AuthenticationFacade
 import com.reposilite.auth.api.SessionDetails
 import com.reposilite.token.AccessTokenFacade