From f7c940ff917bae1c8fcb82d6624371577a33a606 Mon Sep 17 00:00:00 2001 From: Eric Shu Date: Wed, 20 Nov 2019 16:21:58 -0800 Subject: [PATCH] GEODE-7477: Allow tests to test different client/server settings. * Currently only proxy session region is being tested. We should be able to test caching proxy as well for Tomcat as caching proxy is the default setting. --- .../geode/session/tests/TomcatContainer.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java index 074fc744a88c..38d262d2dfaa 100644 --- a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java +++ b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java @@ -25,6 +25,7 @@ import org.codehaus.cargo.container.tomcat.TomcatPropertySet; import org.codehaus.cargo.util.XmlReplacement; + /** * Container for a tomcat installation * @@ -64,8 +65,17 @@ public TomcatContainer(TomcatInstall install, File containerConfigHome, setConfigFile(contextXMLFile.getAbsolutePath(), DEFAULT_TOMCAT_XML_REPLACEMENT_DIR, DEFAULT_TOMCAT_CONTEXT_XML_REPLACEMENT_NAME); - // Default properties - setCacheProperty("enableLocalCache", "false"); + if (install.getConnectionType() == ContainerInstall.ConnectionType.CLIENT_SERVER) { + // using proxy region, override the default client/server setting to set to false + setCacheProperty("enableLocalCache", + String.valueOf(install.getConnectionType().enableLocalCache())); + } else { + // using default, either setting it explicitly or leave it off should have the same effect + if (System.currentTimeMillis() % 2 == 0) { + setCacheProperty("enableLocalCache", + String.valueOf(install.getConnectionType().enableLocalCache())); + } + } setCacheProperty("className", install.getContextSessionManagerClass()); // Deploy war file to container configuration