(nifi) branch NIFI-15258 updated: NIFI-15497: Fixed unit tests (#10805)

[bbende]

This is an automated email from the ASF dual-hosted git repository.

bbende pushed a commit to branch NIFI-15258
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/NIFI-15258 by this push:
     new b412d59077 NIFI-15497: Fixed unit tests (#10805)
b412d59077 is described below

commit b412d5907702bbc75b8ff4895f177ec02d49faf8
Author: Mark Payne <marka...@hotmail.com>
AuthorDate: Thu Jan 22 12:27:28 2026 -0500

    NIFI-15497: Fixed unit tests (#10805)
---
 .../TestParameterProviderSecretsManager.java       | 31 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/components/connector/secrets/TestParameterProviderSecretsManager.java
 
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/components/connector/secrets/TestParameterProviderSecretsManager.java
index 2ccb772f09..870576010e 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/components/connector/secrets/TestParameterProviderSecretsManager.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/components/connector/secrets/TestParameterProviderSecretsManager.java
@@ -105,7 +105,7 @@ public class TestParameterProviderSecretsManager {
         when(node.fetchParameterValues(anyList())).thenAnswer(invocation -> {
             final List<String> requestedNames = invocation.getArgument(0);
             final List<Parameter> matchingParameters = parameterList.stream()
-                    .filter(p -> requestedNames.contains(groupName + "." + 
p.getDescriptor().getName()))
+                    .filter(p -> requestedNames.contains(name + "." + 
groupName + "." + p.getDescriptor().getName()))
                     .toList();
             if (matchingParameters.isEmpty()) {
                 return List.of();
@@ -128,15 +128,34 @@ public class TestParameterProviderSecretsManager {
     }
 
     private SecretReference createSecretReference(final String providerId, 
final String providerName, final String secretName) {
-        final String groupName = getGroupName(secretName);
-        return new SecretReference(providerId, providerName, secretName, 
groupName + "." + secretName);
+        final String effectiveProviderId = providerId != null ? providerId : 
getProviderIdFromName(providerName);
+        final String effectiveProviderName = 
getProviderNameFromId(effectiveProviderId);
+        final String groupName = getGroupNameForProvider(effectiveProviderId);
+        return new SecretReference(providerId, providerName, secretName, 
effectiveProviderName + "." + groupName + "." + secretName);
     }
 
-    private String getGroupName(final String secretName) {
-        if (secretName.equals(SECRET_1_NAME) || 
secretName.equals(SECRET_2_NAME)) {
-            return GROUP_1_NAME;
+    private String getProviderIdFromName(final String providerName) {
+        if (PROVIDER_1_NAME.equals(providerName)) {
+            return PROVIDER_1_ID;
+        } else if (PROVIDER_2_NAME.equals(providerName)) {
+            return PROVIDER_2_ID;
         }
+        return null;
+    }
 
+    private String getProviderNameFromId(final String providerId) {
+        if (PROVIDER_1_ID.equals(providerId)) {
+            return PROVIDER_1_NAME;
+        } else if (PROVIDER_2_ID.equals(providerId)) {
+            return PROVIDER_2_NAME;
+        }
+        return "Unknown Provider";
+    }
+
+    private String getGroupNameForProvider(final String providerId) {
+        if (PROVIDER_1_ID.equals(providerId)) {
+            return GROUP_1_NAME;
+        }
         return GROUP_2_NAME;
     }