(knox) branch KNOX-3077-2 updated: KNOX-3077 - More review comments

[more]

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

more pushed a commit to branch KNOX-3077-2
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/KNOX-3077-2 by this push:
     new 0aabfed3f KNOX-3077 - More review comments
0aabfed3f is described below

commit 0aabfed3fd8e974fe1a8064e847d1e07c83f9cc6
Author: Sandeep Moré <moresand...@gmail.com>
AuthorDate: Tue Feb 25 09:11:52 2025 -0500

    KNOX-3077 - More review comments
---
 .../pac4j/filter/Pac4jDispatcherFilterTest.java    | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git 
a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilterTest.java
 
b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilterTest.java
index 1ea0e68ef..d5696555d 100644
--- 
a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilterTest.java
+++ 
b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilterTest.java
@@ -68,7 +68,15 @@ public class Pac4jDispatcherFilterTest {
         return mocks;
     }
 
-    private void setupCommonExpectations(TestMocks mocks, List<String> params) 
throws Exception {
+    private void setupCommonExpectations(TestMocks mocks, List<String> 
additionalParams) throws Exception {
+        List<String> params = new ArrayList<>();
+        params.add(Pac4jDispatcherFilter.PAC4J_CALLBACK_URL);
+        params.add("clientName");
+        params.add(SAML_KEYSTORE_PATH);
+        params.add(SAML_IDENTITY_PROVIDER_METADATA_PATH);
+
+        params.addAll(additionalParams);
+
         
EasyMock.expect(mocks.keystoreService.getKeystoreForGateway()).andReturn(mocks.ks).anyTimes();
         
EasyMock.expect(mocks.masterService.getMasterSecret()).andReturn("apacheknox".toCharArray()).anyTimes();
 
@@ -105,15 +113,10 @@ public class Pac4jDispatcherFilterTest {
     @Test
     public void testCustomCookieMaxAge() throws Exception {
         final String expectedCookieMaxAge = "1800";
-        List<String> params = new ArrayList<>();
-        params.add(Pac4jDispatcherFilter.PAC4J_CALLBACK_URL);
-        params.add(Pac4jDispatcherFilter.PAC4J_COOKIE_MAX_AGE);
-        params.add("clientName");
-        params.add(SAML_KEYSTORE_PATH);
-        params.add(SAML_IDENTITY_PROVIDER_METADATA_PATH);
-
         TestMocks mocks = createMocks();
-        setupCommonExpectations(mocks, params);
+        List<String> additionalParams = new ArrayList<>();
+        additionalParams.add(Pac4jDispatcherFilter.PAC4J_COOKIE_MAX_AGE);
+        setupCommonExpectations(mocks, additionalParams);
         
EasyMock.expect(mocks.filterConfig.getInitParameter(Pac4jDispatcherFilter.PAC4J_COOKIE_MAX_AGE)).andReturn(expectedCookieMaxAge).anyTimes();
 
         EasyMock.replay(mocks.context, mocks.services, mocks.cryptoService, 
mocks.aliasService, 
@@ -139,7 +142,7 @@ public class Pac4jDispatcherFilterTest {
         params.add(SAML_IDENTITY_PROVIDER_METADATA_PATH);
 
         TestMocks mocks = createMocks();
-        setupCommonExpectations(mocks, params);
+        setupCommonExpectations(mocks, Collections.EMPTY_LIST);
 
         EasyMock.replay(mocks.context, mocks.services, mocks.cryptoService, 
mocks.aliasService, 
                        mocks.keystoreService, mocks.masterService, 
mocks.filterConfig);