Add new FAT to test tcpOptions inactivityTimeout

Author: pnicolucci

Diff for: dev/io.openliberty.transport.http_fat/fat/src/io/openliberty/transport/http_fat/FATSuite.java

@@ -23,7 +23,8 @@
 @RunWith(Suite.class)
 @SuiteClasses({
                 AccessListsTests.class,
-                MaxOpenConnectionsTest.class
+                MaxOpenConnectionsTest.class,
+                InactivityTimeoutTests.class
 })
 public class FATSuite {
 

Diff for: dev/io.openliberty.transport.http_fat/fat/src/io/openliberty/transport/http_fat/InactivityTimeoutTests.java

@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright (c) 2025 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package io.openliberty.transport.http_fat;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.logging.Logger;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.ibm.websphere.simplicity.config.HttpEndpoint;
+import com.ibm.websphere.simplicity.config.ServerConfiguration;
+
+import componenttest.annotation.Server;
+import componenttest.custom.junit.runner.FATRunner;
+import componenttest.custom.junit.runner.Mode;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.topology.impl.LibertyServer;
+
+/**
+ * Test to ensure that the tcpOptions inactivityTimeout works.
+ */
+@RunWith(FATRunner.class)
+@Mode(TestMode.FULL)
+public class InactivityTimeoutTests {
+
+    static final Logger LOG = Logger.getLogger(InactivityTimeoutTests.class.getName());
+    private static final String APP_NAME = "InactivityTimeout";
+
+    @Server("InactivityTimeout")
+    public static LibertyServer server;
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        // Start the server and use the class name so we can find logs easily.
+        server.startServer(InactivityTimeoutTests.class.getSimpleName() + ".log");
+    }
+
+    /**
+     * Save the server configuration before each test, this should be the default server
+     * configuration.
+     *
+     * @throws Exception
+     */
+    @Before
+    public void beforeTest() throws Exception {
+        server.saveServerConfiguration();
+
+        ServerConfiguration configuration = server.getServerConfiguration();
+        LOG.info("Server configuration that was saved: " + configuration);
+    }
+
+    /**
+     * Restore the server configuration to the default state after each test.
+     *
+     * @throws Exception
+     */
+    @After
+    public void afterTest() throws Exception {
+        // Restore the server to the default state.
+        server.setMarkToEndOfLog();
+        server.restoreServerConfiguration();
+        server.waitForConfigUpdateInLogUsingMark(null);
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        // Stop the server
+        if (server != null && server.isStarted()) {
+            server.stopServer();
+        }
+
+    }
+
+    /**
+     * The test will check the default value of inactivityTimeout by searching the trace file.
+     *
+     * The default value is 60 seconds will be logged as 60000 miliseconds.
+     */
+    @Test
+    public void testInactivityTimeout_default() throws Exception {
+
+        // Validate that inActivityTimeout default is 60s.
+        assertNotNull("The default value of inactivityTimeout was not: 60000!", server.waitForStringInTrace("inactivityTimeout: 60000"));
+
+    }
+
+    /**
+     * The test will set inactivityTimeout to a value of 120s and validate in the trace file that
+     * the correct value is being used.
+     *
+     * The below configuration will be used to set inactivityTimeout to 120s:
+     * <tcpOptions inactivityTimeout="120s"/>
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testInactivityTimeout_nonDefault() throws Exception {
+        ServerConfiguration configuration = server.getServerConfiguration();
+        LOG.info("Server configuration that the test started with: " + configuration);
+
+        HttpEndpoint httpEndpoint = configuration.getHttpEndpoints().getById("defaultHttpEndpoint");
+        httpEndpoint.getTcpOptions().setInactivityTimeout("120s");
+
+        server.setMarkToEndOfLog();
+        server.setTraceMarkToEndOfDefaultTrace();
+        server.updateServerConfiguration(configuration);
+        server.waitForConfigUpdateInLogUsingMark(null);
+
+        // Validate that inactivityTimeout is set to 120000 (120s).
+        assertNotNull("The configured value of inactivityTimeout was not 120000!", server.waitForStringInTraceUsingMark("inactivityTimeout: 120000"));
+
+    }
+
+}