Merge pull request #47 from entur/feature/ETU-62315

ETU-62315: Add support for parameter annotation in JUnit test classes.

Author: vevik

CHANGELOG.md

@@ -1,5 +1,8 @@
 # [Release notes](https://github.com/entur/oidc-auth-client)
 
+## oidc-auth-resource-server v1.1.4
+* Add support for parameter annotation in JUnit test classes.
+
 ## oidc-auth-resource-server v1.1.3
 * Moved port reservation from beforeAll into aconstuctor of TenantJsonWebToken.
 

oidc-rs-junit-tenant/src/main/java/org/entur/auth/junit/tenant/TenantJsonWebToken.java

@@ -139,17 +139,25 @@ public Object resolveParameter(
             throws ParameterResolutionException {
 
         if (parameterContext.getParameter().getType() == String.class) {
+            setupTenantAnnotation(); // Added her to support parameter annotation in JUnit test class
+            // constructor
             for (var entry : TENANT_LIST) {
                 Optional<? extends Annotation> annotation = parameterContext.findAnnotation(entry);
                 if (annotation.isPresent()) {
                     return tokenFactory.createToken(annotation.get());
                 }
             }
         } else if (parameterContext.getParameter().getType() == TenantAnnotationTokenFactory.class) {
+            setupTenantAnnotation(); // Added her to support parameter annotation in JUnit test class
+            // constructor
             return tokenFactory;
         } else if (parameterContext.getParameter().getType() == WireMockAuthenticationServer.class) {
+            setupTenantAnnotation(); // Added her to support parameter annotation in JUnit test class
+            // constructor
             return tokenFactory.getServer();
         } else if (parameterContext.getParameter().getType() == WireMock.class) {
+            setupTenantAnnotation(); // Added her to support parameter annotation in JUnit test class
+            // constructor
             return tokenFactory.getServer().getMockServer();
         }
 

oidc-rs-spring-boot-web-test/src/test/java/org/entur/auth/spring/test/other/ParameterAnnotationInConstructorTest.java

@@ -0,0 +1,40 @@
+package org.entur.auth.spring.test.other;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.entur.auth.junit.tenant.InternalTenant;
+import org.entur.auth.junit.tenant.TenantJsonWebToken;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+@ExtendWith({SpringExtension.class, TenantJsonWebToken.class})
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureMockMvc
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ParameterAnnotationInConstructorTest {
+    @Autowired private MockMvc mockMvc;
+    private final String authorization;
+
+    ParameterAnnotationInConstructorTest(
+            @InternalTenant(clientId = "clientId") String authorization) {
+        this.authorization = authorization;
+    }
+
+    @Test
+    void testInternal() throws Exception {
+        var requestHeaders = new HttpHeaders();
+        requestHeaders.add("Accept", MediaType.APPLICATION_JSON_VALUE);
+        requestHeaders.add("Authorization", authorization);
+
+        mockMvc.perform(get("/internal").headers(requestHeaders)).andExpect(status().isOk());
+    }
+}

oidc-rs-spring-boot-webflux-test/src/test/java/org/entur/auth/spring/test/other/LifecycleClassTest.java

@@ -2,6 +2,7 @@
 
 import org.entur.auth.junit.tenant.InternalTenant;
 import org.entur.auth.junit.tenant.TenantJsonWebToken;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -26,6 +27,21 @@ static void registerProps(DynamicPropertyRegistry registry) {
         TenantJsonWebToken.setupTokenFactory();
     }
 
+    @BeforeAll
+    void statup(@InternalTenant(clientId = "clientId") String authorization) {
+        webTestClient
+                .get()
+                .uri("/internal")
+                .headers(
+                        httpHeaders -> {
+                            httpHeaders.add("Accept", MediaType.APPLICATION_JSON_VALUE);
+                            httpHeaders.add("Authorization", authorization);
+                        })
+                .exchange()
+                .expectStatus()
+                .isOk();
+    }
+
     @Test
     void testInternal(@InternalTenant(clientId = "clientId") String authorization) {
         webTestClient

oidc-rs-spring-boot-webflux-test/src/test/java/org/entur/auth/spring/test/other/ParameterAnnotationInConstructorTest.java

@@ -0,0 +1,42 @@
+package org.entur.auth.spring.test.other;
+
+import org.entur.auth.junit.tenant.InternalTenant;
+import org.entur.auth.junit.tenant.TenantJsonWebToken;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@ExtendWith({SpringExtension.class, TenantJsonWebToken.class})
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureMockMvc
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ParameterAnnotationInConstructorTest {
+    @Autowired private WebTestClient webTestClient;
+    private final String authorization;
+
+    ParameterAnnotationInConstructorTest(
+            @InternalTenant(clientId = "clientId") String authorization) {
+        this.authorization = authorization;
+    }
+
+    @Test
+    void testInternal() {
+        webTestClient
+                .get()
+                .uri("/internal")
+                .headers(
+                        httpHeaders -> {
+                            httpHeaders.add("Accept", MediaType.APPLICATION_JSON_VALUE);
+                            httpHeaders.add("Authorization", authorization);
+                        })
+                .exchange()
+                .expectStatus()
+                .isOk();
+    }
+}