From 915e93364ce325629172e7a02819326388b72a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Csahvx655-wq=E2=80=9D?= <“sahvx655@gmail.com”>
Date: Tue, 2 Jun 2026 11:41:09 +0530
Subject: [PATCH] Fix Platform-Dependent URI Mock Failures in fileinstall Tests

---
 .../felix/fileinstall/internal/ConfigInstallerTest.java     | 4 ++--
 .../felix/fileinstall/internal/DirectoryWatcherTest.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
index f423379041..4d3ef8d23f 100644
--- a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
+++ b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/ConfigInstallerTest.java
@@ -245,7 +245,7 @@ public void testCreateConfigAndObserveCMDeleted() throws Exception
         EasyMock.expect(mockBundleContext.getProperty((String) EasyMock.anyObject()))
                 .andReturn(null)
                 .anyTimes();
-        EasyMock.expect(mockConfigurationAdmin.listConfigurations("(felix.fileinstall.filename=file:" + file + ")"))
+        EasyMock.expect(mockConfigurationAdmin.listConfigurations("(felix.fileinstall.filename=" + file.getAbsoluteFile().toURI().toString() + ")"))
                 .andReturn(null);
         EasyMock.expect(mockConfigurationAdmin.listConfigurations("(service.pid=" + pid + ")"))
                 .andReturn(new Configuration[] { mockConfiguration });
@@ -396,7 +396,7 @@ public void testDoConfigurationEventSavesUpdatedConfigurationWhenUsingCachingPer
         final Configuration newConfiguration = EasyMock.createMock(Configuration.class);
         EasyMock.expect(newConfiguration.getAttributes()).andReturn(Collections.emptySet()).times(2);
 
-        EasyMock.expect(mockConfigurationAdmin.listConfigurations("(felix.fileinstall.filename=file:" + file + ")"))
+        EasyMock.expect(mockConfigurationAdmin.listConfigurations("(felix.fileinstall.filename=" + file.getAbsoluteFile().toURI().toString() + ")"))
                 .andReturn(new Configuration[] { newConfiguration });
 
         EasyMock.expect(newConfiguration.getProperties())
diff --git a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
index 6769c4d3d5..ccb22f99f1 100644
--- a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
+++ b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
@@ -289,7 +289,7 @@ public void testInitializeCurrentManagedBundlesNonOpaqueURIOnBundleLocation() th
 
         final String bundleFileName = "firstjar.jar";
         final File bundleFile = new File(watchedDirectoryPath,bundleFileName);
-        final String bundleLocation = "file:"+watchedDirectoryPath+'/'+bundleFileName;
+        final String bundleLocation = new File(watchedDirectoryFile, bundleFileName).toURI().toString();
 
         // break execution
         final Scanner scanner = new Scanner(watchedDirectoryFile)
@@ -341,7 +341,7 @@ public void testInitializeCurrentManagedBundlesOpaqueURIOnBundleLocation() throw
 
         final String bundleFileName = "firstjar.jar";
         final File bundleFile = new File(watchedDirectoryPath,bundleFileName);
-        final String bundleLocation = "blueprint:file:"+watchedDirectoryPath+'/'+bundleFileName+"$Bundle-SymbolicName=foo&Bundle-Version=1.0";
+        final String bundleLocation = "blueprint:" + new File(watchedDirectoryFile, bundleFileName).toURI().toString() + "$Bundle-SymbolicName=foo&Bundle-Version=1.0";
 
         // break execution
         Scanner scanner = new Scanner(watchedDirectoryFile)
@@ -390,7 +390,7 @@ public void testProcessOpaqueURIOnBundleLocation() throws URISyntaxException
 
         final String bundleFileName = "firstjar.jar";
         final File bundleFile = new File(watchedDirectoryPath,bundleFileName);
-        final String bundleLocation = "blueprint:file:"+watchedDirectoryPath+'/'+bundleFileName;
+        final String bundleLocation = "blueprint:" + new File(watchedDirectoryFile, bundleFileName).toURI().toString();
 
         final Scanner scanner = new Scanner(watchedDirectoryFile)
         {