Skip to content

Commit 73a69fd

Browse files
abutch3rabutch3r
committed
Actually Repeat Jakarta 3.0 tests for EE11
While the repeat logic caused the tests to run twice, due to the nature of how the configuration was managed, all that changed was EE11_FEATURES was added to the test and server names. the server configuration was left as is. Use the RepeatTestFilter to determine if we are running the EE11 feature set and switch to the ee11 version of the configuration which includes the EE11 compatible feature set.
1 parent 07fb56e commit 73a69fd

File tree

50 files changed

+634
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+634
-71
lines changed

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.common/publish/shared/config/op_features_ee11.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<server>
2+
3+
<featureManager>
4+
<feature>servlet-6.1</feature>
5+
<feature>appSecurity-6.0</feature>
6+
<feature>openidConnectServer-1.0</feature>
7+
<feature>ssl-1.0</feature>
8+
</featureManager>
9+
10+
</server>

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.common/publish/shared/config/rp_features_ee11.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<server>
2+
3+
<featureManager>
4+
<feature>servlet-6.1</feature>
5+
<feature>appSecurity-6.0</feature>
6+
<feature>ssl-1.0</feature>
7+
<feature>jsonp-2.1</feature>
8+
</featureManager>
9+
10+
</server>

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.common/src/io/openliberty/security/jakartasec/fat/commonTests/CommonAnnotatedSecurityTests.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,4 +779,15 @@ public boolean refreshTokensAreDifferent(Page response1, Page response2) throws
779779

780780
}
781781

782+
public static String getServerConfigFile(String origConfigFile){
783+
String configFile = origConfigFile;
784+
String repeatAction = RepeatTestFilter.getRepeatActionsAsString();
785+
String[] fileArray = configFile.split("\\.");
786+
if (repeatAction.contains("EE11_FEATURES")){
787+
configFile = fileArray[0] + "_ee11." + fileArray[1];
788+
}
789+
790+
return configFile;
791+
}
792+
782793
}

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.1/bnd.bnd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ src: \
2525
fat.project: true
2626
publish.wlp.jar.disabled: true
2727

28-
tested.features: pages-3.1, transportsecurity-1.0, distributedmap-1.0, ssl-1.0, appsecurity-5.0, jndi-1.0, jsonp-2.1, federatedregistry-1.0, oauth-2.0, openidconnectserver-1.0, json-1.0, cdi-4.0, ldapregistry-3.0
28+
tested.features: pages-3.1, transportsecurity-1.0, distributedmap-1.0, ssl-1.0, appsecurity-5.0, jndi-1.0, jsonp-2.1, federatedregistry-1.0, oauth-2.0, openidconnectserver-1.0, json-1.0, cdi-4.0, ldapregistry-3.0, expressionlanguage-6.0, appsecurity-6.0, cdi-4.1, pages-4.0, servlet-6.1
2929

3030
javac.source: 11
3131
javac.target: 11

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.2/bnd.bnd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ src: \
2525
fat.project: true
2626
publish.wlp.jar.disabled: true
2727

28-
tested.features: pages-3.1, transportsecurity-1.0, distributedmap-1.0, ssl-1.0, appsecurity-5.0, jndi-1.0, jsonp-2.1, federatedregistry-1.0, oauth-2.0, openidconnectserver-1.0, json-1.0, cdi-4.0, ldapregistry-3.0
28+
tested.features: pages-3.1, transportsecurity-1.0, distributedmap-1.0, ssl-1.0, appsecurity-5.0, jndi-1.0, jsonp-2.1, federatedregistry-1.0, oauth-2.0, openidconnectserver-1.0, json-1.0, cdi-4.0, ldapregistry-3.0, expressionlanguage-6.0, appsecurity-6.0, cdi-4.1, pages-4.0, servlet-6.1
2929

3030
javac.source: 11
3131
javac.target: 11

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationClaimsDefinitionTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2022, 2024 IBM Corporation and others.
2+
* Copyright (c) 2022, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -82,12 +82,12 @@ public static void setUp() throws Exception {
8282
updateTrackers(opServer, rpServer, false);
8383

8484
List<String> waitForMsgs = null;
85-
opServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
85+
opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
8686
SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
8787
opHttpBase = "http://localhost:" + opServer.getBvtPort();
8888
opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
8989

90-
rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
90+
rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
9191
SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
9292

9393
rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationDisplayTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2023 IBM Corporation and others.
2+
* Copyright (c) 2023, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -80,12 +80,12 @@ public static void setUp() throws Exception {
8080
updateTrackers(opServer, rpServer, false);
8181

8282
List<String> waitForMsgs = null;
83-
opServer.startServerUsingExpandedConfiguration("server_display.xml", waitForMsgs);
83+
opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_display.xml"), waitForMsgs);
8484
SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
8585
opHttpBase = "http://localhost:" + opServer.getBvtPort();
8686
opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
8787

88-
rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
88+
rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
8989
SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
9090

9191
rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationELValuesOverrideTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2022, 2023 IBM Corporation and others.
2+
* Copyright (c) 2022, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -73,12 +73,12 @@ public static void setUp() throws Exception {
7373
updateTrackers(opServer, rpServer, false);
7474

7575
List<String> waitForMsgs = null;
76-
opServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
76+
opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
7777
SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
7878
opHttpBase = "http://localhost:" + opServer.getBvtPort();
7979
opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
8080

81-
rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
81+
rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
8282
SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
8383

8484
rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationELValuesOverrideWithoutHttpSessionTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2022, 2023 IBM Corporation and others.
2+
* Copyright (c) 2022, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -71,12 +71,12 @@ public static void setUp() throws Exception {
7171
updateTrackers(opServer, rpServer, false);
7272

7373
List<String> waitForMsgs = null;
74-
opServer.startServerUsingExpandedConfiguration("server_orig_withoutHttpSession.xml", waitForMsgs);
74+
opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig_withoutHttpSession.xml"), waitForMsgs);
7575
SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
7676
opHttpBase = "http://localhost:" + opServer.getBvtPort();
7777
opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
7878

79-
rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
79+
rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
8080
SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
8181

8282
rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

‎dev/io.openliberty.security.jakartasec.3.0.internal_fat.config.commonTest/fat/src/io/openliberty/security/jakartasec/fat/config/tests/ConfigurationExtraParametersTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2023 IBM Corporation and others.
2+
* Copyright (c) 2023, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -86,12 +86,12 @@ public static void setUp() throws Exception {
8686
updateTrackers(opServer, rpServer, false);
8787

8888
List<String> waitForMsgs = null;
89-
opServer.startServerUsingExpandedConfiguration("server_extraParameters.xml", waitForMsgs);
89+
opServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_extraParameters.xml"), waitForMsgs);
9090
SecurityFatHttpUtils.saveServerPorts(opServer, Constants.BVT_SERVER_1_PORT_NAME_ROOT);
9191
opHttpBase = "http://localhost:" + opServer.getBvtPort();
9292
opHttpsBase = "https://localhost:" + opServer.getBvtSecurePort();
9393

94-
rpServer.startServerUsingExpandedConfiguration("server_orig.xml", waitForMsgs);
94+
rpServer.startServerUsingExpandedConfiguration(getServerConfigFile("server_orig.xml"), waitForMsgs);
9595
SecurityFatHttpUtils.saveServerPorts(rpServer, Constants.BVT_SERVER_2_PORT_NAME_ROOT);
9696

9797
rpHttpBase = "http://localhost:" + rpServer.getBvtPort();

0 commit comments

Comments
 (0)