From 78af324fe256db7f1b85d853db492bbb91f022fe Mon Sep 17 00:00:00 2001
From: Devi Pathak <dp.official.1122@gmail.com>
Date: Mon, 16 Mar 2026 19:39:29 +0530
Subject: [PATCH] FINERACT-2540: Add unit tests for IpAddressUtils Add unit
 tests verifying the behavior of getClientIp() under different request context
 scenarios including missing request attributes, missing IP attribute, and
 valid IP extraction.

These tests improve coverage for request utility helpers used
to retrieve client IP information.
---
 .../core/service/IpAddressUtilsTest.java      | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 fineract-core/src/test/java/org/apache/fineract/infrastructure/core/service/IpAddressUtilsTest.java

diff --git a/fineract-core/src/test/java/org/apache/fineract/infrastructure/core/service/IpAddressUtilsTest.java b/fineract-core/src/test/java/org/apache/fineract/infrastructure/core/service/IpAddressUtilsTest.java
new file mode 100644
index 00000000000..af3e578f004
--- /dev/null
+++ b/fineract-core/src/test/java/org/apache/fineract/infrastructure/core/service/IpAddressUtilsTest.java
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.infrastructure.core.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+class IpAddressUtilsTest {
+
+    @AfterEach
+    void clearContext() {
+        RequestContextHolder.resetRequestAttributes();
+    }
+
+    @Test
+    void getClientIpReturnsEmptyWhenNoRequestContext() {
+        RequestContextHolder.resetRequestAttributes();
+
+        String result = IpAddressUtils.getClientIp();
+
+        assertEquals("", result);
+    }
+
+    @Test
+    void getClientIpReturnsEmptyWhenIpAttributeMissing() {
+        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+        Mockito.when(request.getAttribute("IP")).thenReturn(null);
+
+        ServletRequestAttributes attributes = new ServletRequestAttributes(request);
+        RequestContextHolder.setRequestAttributes(attributes);
+
+        String result = IpAddressUtils.getClientIp();
+
+        assertEquals("", result);
+    }
+
+    @Test
+    void getClientIpReturnsIpWhenAttributePresent() {
+        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+        Mockito.when(request.getAttribute("IP")).thenReturn("192.168.1.1");
+
+        ServletRequestAttributes attributes = new ServletRequestAttributes(request);
+        RequestContextHolder.setRequestAttributes(attributes);
+
+        String result = IpAddressUtils.getClientIp();
+
+        assertEquals("192.168.1.1", result);
+    }
+
+    @Test
+    void getClientIpConvertsNonStringAttributeUsingToString() {
+        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+        Mockito.when(request.getAttribute("IP")).thenReturn(12345);
+
+        ServletRequestAttributes attributes = new ServletRequestAttributes(request);
+        RequestContextHolder.setRequestAttributes(attributes);
+
+        String result = IpAddressUtils.getClientIp();
+
+        assertEquals("12345", result);
+    }
+}