use different test execution phase instead of before class

Fadelis · Sep 26, 2023 · 6bf69f1 · 6bf69f1
1 parent 2ee2f48
commit 6bf69f1
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 35 deletions.
diff --git a/...mock-spring-boot/src/main/java/org/grpcmock/springboot/GrpcMockTestExecutionListener.java b/...mock-spring-boot/src/main/java/org/grpcmock/springboot/GrpcMockTestExecutionListener.java
@@ -17,7 +17,7 @@ public final class GrpcMockTestExecutionListener extends AbstractTestExecutionLi
   private static final Logger log = LoggerFactory.getLogger(GrpcMockTestExecutionListener.class);
 
   @Override
-  public void beforeTestClass(TestContext testContext) {
+  public void prepareTestInstance(TestContext testContext) {
     if (isInvalidContext(testContext)) {
       return;
     }
@@ -52,9 +52,9 @@ public void afterTestMethod(TestContext testContext) {
   }
 
   private boolean isInvalidContext(TestContext testContext) {
-    return annotationMissing(testContext)
-        || wireMockConfigurationMissing(testContext)
-        || applicationContextBroken(testContext);
+    return applicationContextBroken(testContext)
+        || annotationMissing(testContext)
+        || grpcMockConfigurationMissing(testContext);
   }
 
   private boolean annotationMissing(TestContext testContext) {
@@ -66,7 +66,7 @@ private boolean annotationMissing(TestContext testContext) {
     return false;
   }
 
-  private boolean wireMockConfigurationMissing(TestContext testContext) {
+  private boolean grpcMockConfigurationMissing(TestContext testContext) {
     boolean missing = !testContext(testContext).containsBean(GrpcMockConfiguration.class.getName());
     log.debug("GrpcMockConfiguration is missing [{}]", missing);
     return missing;

diff --git a/...-boot/src/test/java/org/grpcmock/springboot/GrpcMockInProcessServerWithFixedNameTest.java b/...-boot/src/test/java/org/grpcmock/springboot/GrpcMockInProcessServerWithFixedNameTest.java
@@ -5,7 +5,6 @@
 import static org.grpcmock.GrpcMock.stubFor;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
-import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.health.v1.HealthGrpc;
@@ -30,12 +29,11 @@ void should_reset_mappings_for_dynamic_port_test1() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.NOT_SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 
   @Test

diff --git a/...boot/src/test/java/org/grpcmock/springboot/GrpcMockInProcessServerWithRandomNameTest.java b/...boot/src/test/java/org/grpcmock/springboot/GrpcMockInProcessServerWithRandomNameTest.java
@@ -5,7 +5,6 @@
 import static org.grpcmock.GrpcMock.stubFor;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
-import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.health.v1.HealthGrpc;
@@ -31,12 +30,11 @@ void should_reset_mappings_for_dynamic_port_test1() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.NOT_SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 
   @Test

diff --git a/...-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestDynamicPortResetFirst.java b/...-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestDynamicPortResetFirst.java
@@ -4,7 +4,6 @@
 import static org.grpcmock.GrpcMock.stubFor;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
-import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.health.v1.HealthGrpc;
@@ -24,11 +23,10 @@ void should_reset_mappings_for_dynamic_port_test1() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.NOT_SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 }
diff --git a/...spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestDynamicPortResetSecond.java b/...spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestDynamicPortResetSecond.java
@@ -4,7 +4,6 @@
 import static org.grpcmock.GrpcMock.stubFor;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
-import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.health.v1.HealthGrpc;
@@ -24,11 +23,10 @@ void should_reset_mappings_for_dynamic_port_test1() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 }
diff --git a/...ck-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestFixedPortResetFirst.java b/...ck-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestFixedPortResetFirst.java
@@ -5,7 +5,6 @@
 import static org.grpcmock.GrpcMock.stubFor;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
-import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.health.v1.HealthGrpc;
@@ -30,12 +29,11 @@ void should_reset_mappings_for_dynamic_port_test1() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.NOT_SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 
   @Test

diff --git a/...k-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestFixedPortResetSecond.java b/...k-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestFixedPortResetSecond.java
@@ -5,7 +5,6 @@
 import static org.grpcmock.GrpcMock.stubFor;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
-import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.health.v1.HealthGrpc;
@@ -30,12 +29,11 @@ void should_reset_mappings_for_dynamic_port_test1() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 
 

diff --git a/...-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestInterceptorInsertTest.java b/...-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestInterceptorInsertTest.java
@@ -9,7 +9,6 @@
 import io.grpc.ServerCall.Listener;
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptor;
-import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.health.v1.HealthGrpc;
@@ -33,13 +32,12 @@ void should_use_configured_interceptor() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .withHeader(MY_HEADER, HEADER_VALUE)
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 
   public static class MyServerInterceptor implements ServerInterceptor {

diff --git a/...k-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestResetAfterTestMethod.java b/...k-spring-boot/src/test/java/org/grpcmock/springboot/GrpcMockTestResetAfterTestMethod.java
@@ -5,7 +5,6 @@
 import static org.grpcmock.GrpcMock.stubFor;
 import static org.grpcmock.GrpcMock.unaryMethod;
 
-import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.health.v1.HealthGrpc;
@@ -25,20 +24,18 @@ void should_respond_with_response() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.NOT_SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 
   @Test
   void should_respond_with_unimplemented_error() {
     HealthCheckResponse response = HealthCheckResponse.getDefaultInstance();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
-    assertThatThrownBy(() -> runAndAssertHealthCheckRequest(request, response))
+    assertThatThrownBy(() -> runAndAssertHealthCheckRequest(response))
         .hasMessage("UNIMPLEMENTED: Method not found: grpc.health.v1.Health/Check");
   }
 }
diff --git a/grpcmock-spring-boot/src/test/java/org/grpcmock/springboot/TestBase.java b/grpcmock-spring-boot/src/test/java/org/grpcmock/springboot/TestBase.java
@@ -16,7 +16,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.StringUtils;
 
 /**
  * @author Fadelis
@@ -50,7 +49,7 @@ void tearDownChannel() {
     serverChannel.shutdownNow();
   }
 
-  void runAndAssertHealthCheckRequest(HealthCheckRequest request, HealthCheckResponse response) {
+  void runAndAssertHealthCheckRequest(HealthCheckResponse response) {
     HealthBlockingStub serviceStub = HealthGrpc.newBlockingStub(serverChannel);
 
     assertThat(serviceStub.check(HealthCheckRequest.getDefaultInstance())).isEqualTo(response);
@@ -60,11 +59,10 @@ void simpleHealthCheckRequest() {
     HealthCheckResponse response = HealthCheckResponse.newBuilder()
         .setStatus(ServingStatus.SERVING)
         .build();
-    HealthCheckRequest request = HealthCheckRequest.getDefaultInstance();
 
     stubFor(unaryMethod(HealthGrpc.getCheckMethod())
         .willReturn(response(response)));
 
-    runAndAssertHealthCheckRequest(request, response);
+    runAndAssertHealthCheckRequest(response);
   }
 }
diff --git a/.../test/java/org/grpcmock/springboot/TestExecutionListenerAllowsOtherBeforeActionsTest.java b/.../test/java/org/grpcmock/springboot/TestExecutionListenerAllowsOtherBeforeActionsTest.java
@@ -0,0 +1,48 @@
+package org.grpcmock.springboot;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.grpcmock.springboot.TestExecutionListenerAllowsOtherBeforeActionsTest.ApplicationEventListener;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.test.annotation.DirtiesContext;
+
+/**
+ * @author Fadelis
+ */
+@SpringBootTest(classes = TestApplication.class, webEnvironment = WebEnvironment.NONE)
+@AutoConfigureGrpcMock
+@DirtiesContext
+@Import(ApplicationEventListener.class)
+class TestExecutionListenerAllowsOtherBeforeActionsTest extends TestBase {
+
+  private static boolean beforeAllRunSuccessful;
+  private static boolean applicationContextInitialized;
+
+  @BeforeAll
+  static void checkIfApplicationContextNotInitialized() {
+    beforeAllRunSuccessful = !applicationContextInitialized;
+  }
+
+  @Test
+  void should_run_before_all_action_before_application_context_is_available() {
+    // check that beforeAll method was actually run before the application context was initialized
+    assertThat(beforeAllRunSuccessful).isTrue();
+    // check that grpc mock instance is running
+    simpleHealthCheckRequest();
+  }
+
+
+  public static class ApplicationEventListener implements ApplicationListener<ContextRefreshedEvent> {
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+      applicationContextInitialized = true;
+    }
+  }
+}