diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index aee3520..77034a3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -15,9 +15,9 @@ quarkus.http.auth.permission.authenticated.policy=authenticated # Postgres quarkus.hibernate-orm.schema-management.strategy=validate quarkus.datasource.db-kind=postgresql -%dev,test.quarkus.datasource.username=postgres -%dev,test.quarkus.datasource.password=postgres -%dev,test.quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres +%dev.quarkus.datasource.username=postgres +%dev.quarkus.datasource.password=postgres +%dev.quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres # Flyway %dev,test.quarkus.flyway.clean-at-start=true diff --git a/src/test/java/dev/dinauer/maven/maven/core/ResourceTest.java b/src/test/java/dev/dinauer/maven/maven/core/ResourceTest.java index c2bdec1..8f9d198 100644 --- a/src/test/java/dev/dinauer/maven/maven/core/ResourceTest.java +++ b/src/test/java/dev/dinauer/maven/maven/core/ResourceTest.java @@ -1,6 +1,5 @@ package dev.dinauer.maven.maven.core; -import dev.dinauer.maven.maven.core.release.ReleaseVersion; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.security.TestSecurity; import io.restassured.RestAssured; @@ -13,7 +12,6 @@ import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import java.util.Optional; @QuarkusTest public class ResourceTest @@ -24,17 +22,8 @@ public class ResourceTest @BeforeEach void before() { - //flyway.clean(); - //flyway.migrate(); - } - - @Test - @TestSecurity(user = "user") - void test_01() - { - RestAssured.given().body(readFile("/jar/postgresql-42.7.9.jar")).put("/maven2/org/postgresql/postgresql/42.7.9/postgresql-42.7.9.jar"); - RestAssured.given().body(readFile("/jar/postgresql-42.7.9.pom")).put("/maven2/org/postgresql/postgresql/42.7.9/postgresql-42.7.9.pom"); - System.out.println("x"); + flyway.clean(); + flyway.migrate(); } @Test @@ -71,14 +60,6 @@ public class ResourceTest Assertions.assertEquals(uploadPom, pom); } - @Test - @TestSecurity(user = "user") - void test_snapshot() - { - RestAssured.given().body(readFile("/jar/postgresql-42.7.9.jar")).put("/maven2/org/postgresql/postgresql/42.7.9-SNAPSHOT/postgresql-42.7.9.jar").then().statusCode(501); - RestAssured.given().body(readFile("/jar/postgresql-42.7.9.pom")).put("/maven2/org/postgresql/postgresql/42.7.9-SNAPSHOT/postgresql-42.7.9.pom").then().statusCode(501); - } - private InputStream readFile(String path) { return getClass().getResourceAsStream(path); diff --git a/src/test/java/dev/dinauer/maven/maven/core/model/ExtensionParserTest.java b/src/test/java/dev/dinauer/maven/maven/core/model/ExtensionParserTest.java index 87b21b5..6a0b7da 100644 --- a/src/test/java/dev/dinauer/maven/maven/core/model/ExtensionParserTest.java +++ b/src/test/java/dev/dinauer/maven/maven/core/model/ExtensionParserTest.java @@ -16,7 +16,7 @@ public class ExtensionParserTest Assertions.assertEquals("jackson-core-2.21.0-20250419.123456-1", extensionResult.remainder()); Assertions.assertEquals(FileExt.JAR, extensionResult.result().ext()); - Assertions.assertEquals(FileHash.MD5, extensionResult.result().hashExt()); + Assertions.assertEquals(FileHash.MD5, extensionResult.result().hashExt().orElseThrow()); } @Test @@ -28,7 +28,7 @@ public class ExtensionParserTest Assertions.assertEquals("test", extensionResult.remainder()); Assertions.assertEquals(FileExt.POM, extensionResult.result().ext()); - Assertions.assertEquals(FileHash.SHA1, extensionResult.result().hashExt()); + Assertions.assertEquals(FileHash.SHA1, extensionResult.result().hashExt().orElseThrow()); } @Test @@ -40,6 +40,6 @@ public class ExtensionParserTest Assertions.assertEquals("test", extensionResult.remainder()); Assertions.assertEquals(FileExt.JAR, extensionResult.result().ext()); - Assertions.assertNull(extensionResult.result().hashExt()); + Assertions.assertTrue(extensionResult.result().hashExt().isEmpty()); } } diff --git a/src/test/java/dev/dinauer/maven/maven/core/release/ReleaseServiceTest.java b/src/test/java/dev/dinauer/maven/maven/core/release/ReleaseServiceTest.java deleted file mode 100644 index 32677f1..0000000 --- a/src/test/java/dev/dinauer/maven/maven/core/release/ReleaseServiceTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package dev.dinauer.maven.maven.core.release; - -import com.fasterxml.jackson.core.JsonProcessingException; -import dev.dinauer.maven.maven.core.MavenService; -import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; -import org.junit.jupiter.api.Test; - -@QuarkusTest -public class ReleaseServiceTest -{ - @Inject - MavenService mavenService; - - @Test - void test() - { - mavenService.upload("/com/fasterxml/jackson/core/jackson-databind/2.21.2/jackson-databind-2.21.2-tests.jar", null); - } -} diff --git a/src/test/java/dev/dinauer/maven/maven/core/snapshot/SnapshotServiceTest.java b/src/test/java/dev/dinauer/maven/maven/core/snapshot/SnapshotServiceTest.java deleted file mode 100644 index aa09e01..0000000 --- a/src/test/java/dev/dinauer/maven/maven/core/snapshot/SnapshotServiceTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package dev.dinauer.maven.maven.core.snapshot; - -import com.fasterxml.jackson.core.JsonProcessingException; -import dev.dinauer.maven.maven.core.MavenService; -import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; -import org.junit.jupiter.api.Test; - -@QuarkusTest -public class SnapshotServiceTest -{ - @Inject - MavenService mavenService; - - @Test - void test() throws JsonProcessingException - { - mavenService.upload("/com/fasterxml/jackson/core/jackson-databind/2.21.2-SNAPSHOT/jackson-databind-2.21.2-20240315.123456-3.jar", null); - } -}