This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ccc96a43a2 Simplify
ccc96a43a2 is described below
commit ccc96a43a2ac804230fc8f5fc9d32e9aea3883ae
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Oct 21 09:07:53 2026 +0100
Simplify
---
.../catalina/storeconfig/TestStoreConfig.java | 38 +++-------------------
1 file changed, 5 insertions(+), 33 deletions(-)
diff --git a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
index f9277fb513..1c8a037f9a 100644
--- a/test/org/apache/catalina/storeconfig/TestStoreConfig.java
+++ b/test/org/apache/catalina/storeconfig/TestStoreConfig.java
@@ -17,7 +17,6 @@
package org.apache.catalina.storeconfig;
import java.io.File;
-import java.io.FileReader;
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
@@ -41,7 +40,6 @@ import org.apache.catalina.startup.Catalina;
import org.apache.catalina.startup.CatalinaBaseConfigurationSource;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.catalina.util.IOTools;
import org.apache.catalina.util.SessionIdGeneratorBase;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.tomcat.util.net.SSLHostConfig;
@@ -161,12 +159,7 @@ public class TestStoreConfig extends TomcatBaseTest {
File serverXml = new File(tomcat.getServer().getCatalinaBase(),
Catalina.SERVER_XML);
Assert.assertTrue(serverXml.canRead());
addDeleteOnTearDown(serverXml);
- String serverXmlDump;
- try (FileReader reader = new FileReader(serverXml);
- StringWriter writer = new StringWriter()) {
- IOTools.flow(reader, writer);
- serverXmlDump = writer.toString();
- }
+ String serverXmlDump = Files.readString(serverXml.toPath(),
StandardCharsets.UTF_8);
Assert.assertTrue(serverXmlDump.contains("StoreConfigLifecycleListener"));
Assert.assertTrue(serverXmlDump.contains("UserDatabaseRealm"));
// The cluster must round-trip the channel start options the test had
to restrict, as the
@@ -253,12 +246,7 @@ public class TestStoreConfig extends TomcatBaseTest {
storeConfigListener.getStoreConfig().storeConfig();
// Read written configuration
- String serverXmlDump;
- try (FileReader reader = new FileReader(serverXml);
- StringWriter writer = new StringWriter()) {
- IOTools.flow(reader, writer);
- serverXmlDump = writer.toString();
- }
+ String serverXmlDump = Files.readString(serverXml.toPath(),
StandardCharsets.UTF_8);
Assert.assertTrue(serverXmlDump.contains("Header comment line"));
Assert.assertTrue(serverXmlDump.contains("Service comment"));
Assert.assertTrue(serverXmlDump.contains("Commented out connector"));
@@ -333,12 +321,7 @@ public class TestStoreConfig extends TomcatBaseTest {
}
// Read written configuration
- String contextXmlDump;
- try (FileReader reader = new FileReader(contextXml);
- StringWriter writer = new StringWriter()) {
- IOTools.flow(reader, writer);
- contextXmlDump = writer.toString();
- }
+ String contextXmlDump = Files.readString(contextXml.toPath(),
StandardCharsets.UTF_8);
Assert.assertTrue(contextXmlDump, contextXmlDump.contains("Context
comment"));
Assert.assertTrue(contextXmlDump, contextXmlDump.contains("watched
resources"));
Assert.assertTrue(contextXmlDump,
contextXmlDump.contains("conf/test.txt"));
@@ -796,12 +779,7 @@ public class TestStoreConfig extends TomcatBaseTest {
// also flagged
File generatedClass = new File(generatedCodeLocation,
"catalinaembedded/ServerXml.java");
Assert.assertTrue("Generated code was not created: " + generatedClass,
generatedClass.exists());
- String generatedCode;
- try (FileReader reader = new FileReader(generatedClass);
- StringWriter writer = new StringWriter()) {
- IOTools.flow(reader, writer);
- generatedCode = writer.toString();
- }
+ String generatedCode = Files.readString(generatedClass.toPath(),
StandardCharsets.UTF_8);
Assert.assertTrue(generatedCode,
generatedCode.contains(".setDeployedFromServerXml(true);"));
}
@@ -927,12 +905,7 @@ public class TestStoreConfig extends TomcatBaseTest {
// A new context configuration file must have been created instead
File contextXml = new File(tomcat.getHost().getConfigBaseFile(),
"standalone.xml");
Assert.assertTrue("Context file was not created: " + contextXml,
contextXml.exists());
- String contextXmlDump;
- try (FileReader reader = new FileReader(contextXml);
- StringWriter writer = new StringWriter()) {
- IOTools.flow(reader, writer);
- contextXmlDump = writer.toString();
- }
+ String contextXmlDump = Files.readString(contextXml.toPath(),
StandardCharsets.UTF_8);
Assert.assertTrue(contextXmlDump, contextXmlDump.contains("<Context"));
// The stored configuration must remain well-formed
SAXParserFactory.newInstance().newSAXParser().getXMLReader()
@@ -986,5 +959,4 @@ public class TestStoreConfig extends TomcatBaseTest {
Assert.assertFalse(new File(tomcat.getHost().getConfigBaseFile(),
"skipped.xml").exists());
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
