fixed environments, internalized main test classes

vondacho · May 20, 2023 · 75bb19f · 75bb19f
1 parent c4144b3
commit 75bb19f
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 35 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -99,9 +99,7 @@ dependencies {
         exclude(group = "junit", module = "junit")
     }
     testImplementation("org.springframework.security:spring-security-test")
-    testImplementation("io.zonky.test:embedded-database-spring-test:${property("embedded-database-spring-test.version")}") {
-        exclude("net.java.dev.jna", "jna")
-    }
+    testImplementation("io.zonky.test:embedded-database-spring-test:${property("embedded-database-spring-test.version")}")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("io.mockk:mockk:${property("mockk.version")}")
     testImplementation("com.ninja-squad:springmockk:${property("springmockk.version")}")

diff --git a/doc/tech/architecture.md b/doc/tech/architecture.md
@@ -6,7 +6,6 @@
 - [Component view](https://www.structurizr.com/share/38199/diagrams#blueprint-api-components)
 
 ## AppMap
-- [E2E from API layer](https://appmap-viewer.herokuapp.com/appmap/appmap.html?appmap=https://vondacho.github.io/arch-blueprint-java/appmap/edu_obya_blueprint_customer_adapter_rest_CustomerEndpointIT_shouldCreateAndModifyAndDeleteCustomer.appmap.json)
 - [E2E from Service layer](https://appmap-viewer.herokuapp.com/appmap/appmap.html?appmap=https://vondacho.github.io/arch-blueprint-java/appmap/edu_obya_blueprint_customer_application_CustomerServiceIT_shouldCreateAndFindAndModifyAndRemoveACustomer.appmap.json)
 - [E2E from Data layer](https://appmap-viewer.herokuapp.com/appmap/appmap.html?appmap=https://vondacho.github.io/arch-blueprint-java/appmap/edu_obya_blueprint_customer_adapter_jpa_CustomerRepositoryIT_shouldCreateAndFindAndModifyAndRemoveACustomer.appmap.json)
 

diff --git a/src/acceptanceTest/kotlin/edu/obya/blueprint/basic/at/BasicAT.kt b/src/acceptanceTest/kotlin/edu/obya/blueprint/basic/at/BasicAT.kt
@@ -11,11 +11,11 @@ import org.springframework.boot.test.context.SpringBootTest
 @Suite
 @SelectClasspathResource("features/basic")
 @ConfigurationParameter(key = Constants.GLUE_PROPERTY_NAME, value = "edu.obya.blueprint.basic.at")
-class BasicAT
+internal class BasicAT
 
 @CucumberContextConfiguration
 @SpringBootTest
-class BasicATBootstrap
+internal class BasicATBootstrap
 
 @SpringBootConfiguration
-class BasicATSpringBootConfiguration
+internal class BasicATSpringBootConfiguration
diff --git a/src/acceptanceTest/kotlin/edu/obya/blueprint/client/at/ClientAT.kt b/src/acceptanceTest/kotlin/edu/obya/blueprint/client/at/ClientAT.kt
@@ -29,14 +29,14 @@ import org.springframework.test.context.ActiveProfiles
 @Suite
 @SelectClasspathResource("features/client")
 @ConfigurationParameter(key = Constants.GLUE_PROPERTY_NAME, value = "edu.obya.blueprint.client.at")
-class ClientAT
+internal class ClientAT
 
-@ActiveProfiles("test", "r2dbc")
+@ActiveProfiles("test", "r2dbc", "at")
 @AutoConfigureEmbeddedDatabase
 @EnableAutoConfiguration
 @CucumberContextConfiguration
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-class ClientATBootstrap {
+internal class ClientATBootstrap {
 
     @Autowired
     lateinit var clientState: ClientState
@@ -67,4 +67,4 @@ class ClientATBootstrap {
 }
 
 @SpringBootConfiguration
-class ClientATSpringBootConfiguration
+internal class ClientATSpringBootConfiguration
diff --git a/src/acceptanceTest/kotlin/edu/obya/blueprint/client/at/api/ClientWebApiClient.kt b/src/acceptanceTest/kotlin/edu/obya/blueprint/client/at/api/ClientWebApiClient.kt
@@ -20,7 +20,7 @@ import reactor.core.publisher.Mono
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
 
-class ClientWebApiClient(private val webClient: WebClient) : edu.obya.blueprint.client.at.api.ClientApiClient {
+class ClientWebApiClient(private val webClient: WebClient) : ClientApiClient {
 
     override fun addClient(input: TestClientInput): Mono<TestResult<ClientId, HttpStatus>> {
         return webClient.post().uri("clients")

diff --git a/src/acceptanceTest/kotlin/edu/obya/blueprint/problemsolving/at/ProblemSolvingAT.kt b/src/acceptanceTest/kotlin/edu/obya/blueprint/problemsolving/at/ProblemSolvingAT.kt
@@ -11,11 +11,11 @@ import org.springframework.boot.test.context.SpringBootTest
 @Suite
 @SelectClasspathResource("features/problemsolving")
 @ConfigurationParameter(key = Constants.GLUE_PROPERTY_NAME, value = "edu.obya.blueprint.problemsolving.at")
-class ProblemSolvingAT
+internal class ProblemSolvingAT
 
 @CucumberContextConfiguration
 @SpringBootTest
-class ProblemSolvingATBootstrap
+internal class ProblemSolvingATBootstrap
 
 @SpringBootConfiguration
-class ProblemSolvingATSpringBootConfiguration
+internal class ProblemSolvingATSpringBootConfiguration
diff --git a/src/acceptanceTest/resources/application-at.yml b/src/acceptanceTest/resources/application-at.yml
@@ -0,0 +1,9 @@
+server:
+  port: 9090
+  address: localhost
+
+zonky:
+  test:
+    database:
+      provider: DOCKER
+      type: POSTGRES
diff --git a/src/acceptanceTest/resources/application-test.yml b/src/acceptanceTest/resources/application-test.yml
diff --git a/...contractTest/kotlin/edu/obya/blueprint/client/cdc/pact/provider/ClientPactProviderTest.kt b/...contractTest/kotlin/edu/obya/blueprint/client/cdc/pact/provider/ClientPactProviderTest.kt
@@ -26,13 +26,13 @@ import reactor.core.publisher.Mono
 import java.util.*
 import java.util.function.Supplier
 
-@ActiveProfiles("test")
+@ActiveProfiles("test", "cdc")
 @Provider("clientAPI")
 @PactFolder("client/cdc/pact")
 @Import(ClientPactContextConfiguration::class)
 @AutoConfigureEmbeddedDatabase
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-class ClientPactProviderTest {
+internal class ClientPactProviderTest {
 
     @LocalServerPort
     var port = 0

diff --git a/...ntractTest/resources/application-test.yml → ...ontractTest/resources/application-cdc.yml b/...ntractTest/resources/application-test.yml → ...ontractTest/resources/application-cdc.yml
@@ -8,4 +8,4 @@ zonky:
   test:
     database:
       type: POSTGRES
-      provider: ZONKY
+      provider: DOCKER