Prefer to use HttpServer and GrpcServer to retrieve running ports instead of configuration (#2070)

Author: radcortez

grpc-locations/src/test/kotlin/io/quarkus/sample/superheroes/location/ContractVerificationTests.kt

@@ -10,9 +10,9 @@ import au.com.dius.pact.provider.junitsupport.loader.PactFolder
 import au.com.dius.pact.provider.junitsupport.loader.SelectorBuilder
 import io.mockk.every
 import io.quarkiverse.test.junit.mockk.InjectSpy
+import io.quarkus.grpc.runtime.GrpcServer
 import io.quarkus.sample.superheroes.location.repository.LocationRepository
 import io.quarkus.test.junit.QuarkusTest
-import org.eclipse.microprofile.config.inject.ConfigProperty
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.TestTemplate
 import org.junit.jupiter.api.extension.ExtendWith
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 // if you'd like to use a Pact broker. You'd also un-comment the following 2 annotations
 //@PactBroker(url = "https://quarkus-super-heroes.pactflow.io")
 //@EnabledIfSystemProperty(named = "pactbroker.auth.token", matches = ".+", disabledReason = "pactbroker.auth.token system property not set")
-class ContractVerificationTests(@ConfigProperty(name = "quarkus.grpc.server.test-port") val quarkusPort: Int) {
+class ContractVerificationTests() {
   @InjectSpy
 	lateinit var locationRepository: LocationRepository
 
@@ -44,10 +44,10 @@ class ContractVerificationTests(@ConfigProperty(name = "quarkus.grpc.server.test
   }
 
   @BeforeEach
-  fun beforeEach(context: PactVerificationContext) {
+  fun beforeEach(context: PactVerificationContext, grpcServer: GrpcServer) {
     context.target = PluginTestTarget(mutableMapOf(
       "host" to "localhost",
-      "port" to quarkusPort,
+      "port" to grpcServer.port,
       "transport" to "grpc"
     ))
 

grpc-locations/src/test/kotlin/io/quarkus/sample/superheroes/location/grpc/LocationGrpcServiceIT.kt

@@ -4,14 +4,14 @@ import io.grpc.ManagedChannel
 import io.grpc.ManagedChannelBuilder
 import io.grpc.Status.Code
 import io.grpc.StatusRuntimeException
+import io.quarkus.grpc.runtime.GrpcServer
 import io.quarkus.test.junit.QuarkusIntegrationTest
 import io.quarkus.sample.superheroes.location.Location
 import io.quarkus.sample.superheroes.location.LocationType
 import io.quarkus.sample.superheroes.location.grpc.LocationsGrpc.LocationsBlockingStub
 import io.quarkus.sample.superheroes.location.mapping.LocationMapper
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
-import org.eclipse.microprofile.config.ConfigProvider
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation
@@ -49,9 +49,8 @@ class LocationGrpcServiceIT {
 
 		@BeforeAll
 		@JvmStatic
-		internal fun beforeAll() {
-			val port = ConfigProvider.getConfig().getValue("quarkus.http.test-port", Integer::class.java)
-			channel = ManagedChannelBuilder.forAddress("localhost", port.toInt())
+		internal fun beforeAll(grpcserver: GrpcServer) {
+			channel = ManagedChannelBuilder.forAddress("localhost", grpcserver.port)
 				.usePlaintext()
 				.build()
 

rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/ContractVerificationTests.java

@@ -5,7 +5,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import io.quarkus.vertx.http.HttpServer;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -33,18 +34,15 @@
 public class ContractVerificationTests {
   private static final String NO_FIGHTS_FOUND_STATE = "No fights exist";
 
-  @ConfigProperty(name = "quarkus.http.test-port")
-  int quarkusPort;
-
   @TestTemplate
   @ExtendWith(PactVerificationInvocationContextProvider.class)
   void pactVerificationTestTemplate(PactVerificationContext context) {
     context.verifyInteraction();
   }
 
   @BeforeEach
-  void beforeEach(PactVerificationContext context) {
-    context.setTarget(new HttpTestTarget("localhost", this.quarkusPort));
+  void beforeEach(PactVerificationContext context, HttpServer httpServer) {
+    context.setTarget(new HttpTestTarget("localhost", httpServer.getPort()));
 
     // Have to do this here because the CDI context doesn't seem to be available
     // in the @State method below

rest-heroes/src/test/java/io/quarkus/sample/superheroes/hero/ContractVerificationTests.java

@@ -5,7 +5,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import io.quarkus.vertx.http.HttpServer;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,9 +36,6 @@
 public class ContractVerificationTests {
   private static final String NO_RANDOM_HERO_FOUND_STATE = "No random hero found";
 
-  @ConfigProperty(name = "quarkus.http.test-port")
-  int quarkusPort;
-
   @InjectSpy
   HeroRepository heroRepository;
 
@@ -48,8 +46,8 @@ void pactVerificationTestTemplate(PactVerificationContext context) {
   }
 
   @BeforeEach
-  void beforeEach(PactVerificationContext context) {
-    context.setTarget(new HttpTestTarget("localhost", this.quarkusPort));
+  void beforeEach(PactVerificationContext context, HttpServer httpServer) {
+    context.setTarget(new HttpTestTarget("localhost", httpServer.getPort()));
 
     // Have to do this here because the CDI context doesn't seem to be available
     // in the @State method below

rest-narration/src/test/java/io/quarkus/sample/superheroes/narration/ContractVerificationTests.java

@@ -1,6 +1,7 @@
 package io.quarkus.sample.superheroes.narration;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import io.quarkus.vertx.http.HttpServer;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -23,18 +24,15 @@
 //@PactBroker(url = "https://quarkus-super-heroes.pactflow.io")
 //@EnabledIfSystemProperty(named = "pactbroker.auth.token", matches = ".+", disabledReason = "pactbroker.auth.token system property not set")
 public class ContractVerificationTests {
-  @ConfigProperty(name = "quarkus.http.test-port")
-  int quarkusPort;
-
   @TestTemplate
   @ExtendWith(PactVerificationInvocationContextProvider.class)
   void pactVerificationTestTemplate(PactVerificationContext context) {
     context.verifyInteraction();
   }
 
   @BeforeEach
-  void beforeEach(PactVerificationContext context) {
-    context.setTarget(new HttpTestTarget("localhost", this.quarkusPort));
+  void beforeEach(PactVerificationContext context, HttpServer httpServer) {
+    context.setTarget(new HttpTestTarget("localhost", httpServer.getPort()));
   }
 
   @PactBrokerConsumerVersionSelectors

rest-villains/src/test/java/io/quarkus/sample/superheroes/villain/ContractVerificationTests.java

@@ -5,7 +5,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
+import io.quarkus.vertx.http.HttpServer;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -32,18 +33,15 @@
 public class ContractVerificationTests {
   private static final String NO_RANDOM_VILLAIN_FOUND_STATE = "No random villain found";
 
-  @ConfigProperty(name = "quarkus.http.test-port")
-  int quarkusPort;
-
   @TestTemplate
   @ExtendWith(PactVerificationInvocationContextProvider.class)
   void pactVerificationTestTemplate(PactVerificationContext context) {
     context.verifyInteraction();
   }
 
   @BeforeEach
-  void beforeEach(PactVerificationContext context) {
-    context.setTarget(new HttpTestTarget("localhost", this.quarkusPort));
+  void beforeEach(PactVerificationContext context, HttpServer httpServer) {
+    context.setTarget(new HttpTestTarget("localhost", httpServer.getPort()));
 
     // Have to do this here because the CDI context doesn't seem to be available
     // in the @State method below