Fix web finger test failure

wso2-extensions · Sep 9, 2024 · 953bc97 · 953bc97
1 parent ba3cf21
commit 953bc97
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 532 deletions.
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -55,6 +55,7 @@
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.testutil</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -83,11 +84,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity.framework</groupId>
-            <artifactId>org.wso2.carbon.identity.testutil</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-testng</artifactId>

diff --git a/...st/java/org/wso2/carbon/identity/webfinger/builders/WebFingerOIDCResponseBuilderTest.java b/...st/java/org/wso2/carbon/identity/webfinger/builders/WebFingerOIDCResponseBuilderTest.java
@@ -23,11 +23,17 @@
 import org.testng.annotations.Test;
 import org.wso2.carbon.base.ServerConfigurationException;
 import org.wso2.carbon.identity.base.IdentityException;
+import org.wso2.carbon.identity.common.testng.WithCarbonHome;
+import org.wso2.carbon.identity.core.util.IdentityConfigParser;
 import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
 import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
 import org.wso2.carbon.identity.webfinger.WebFingerEndpointException;
 import org.wso2.carbon.identity.webfinger.WebFingerRequest;
 import org.wso2.carbon.identity.webfinger.WebFingerResponse;
+import org.wso2.carbon.utils.CarbonUtils;
+
+import java.io.File;
+import java.lang.reflect.Field;
 
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mockStatic;
@@ -36,6 +42,7 @@
 /**
  * Unit test coverage for WebFingerOIDCResponseBuilder class.
  */
+@WithCarbonHome
 public class WebFingerOIDCResponseBuilderTest {
 
     private WebFingerOIDCResponseBuilder webFingerOIDCResponseBuilder;
@@ -63,6 +70,9 @@ public void setUp() throws Exception {
         webFingerRequest.setRel(rel);
         webFingerRequest.setTenant(tenant);
 
+        setPrivateStaticField(IdentityConfigParser.class, "configFilePath", System.getProperty("carbon.home")
+                + File.separator + "repository" + File.separator + "conf" + File.separator + "identity"
+                + File.separator + "identity.xml");
         oAuth2Util = mockStatic(OAuth2Util.class);
     }
 
@@ -72,6 +82,14 @@ public void tearDown() {
         oAuth2Util.close();
     }
 
+    private void setPrivateStaticField(Class<?> clazz, String fieldName, Object newValue)
+            throws NoSuchFieldException, IllegalAccessException {
+
+        Field field = clazz.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        field.set(null, newValue);
+    }
+
     @Test
     public void testBuildWebFingerResponse() throws Exception {