[tika] branch main updated: fix older, long broken tests on Windows

[tallison]

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

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new 742af7025 fix older, long broken tests on Windows
742af7025 is described below

commit 742af702529ffe6ea14257398f5b34cdf72cc047
Author: tallison <talli...@apache.org>
AuthorDate: Mon Apr 25 13:10:04 2022 -0400

    fix older, long broken tests on Windows
---
 .../java/org/apache/tika/server/core/TikaResourceFetcherTest.java     | 4 ++--
 .../test/resources/configs/tika-config-server-fetcher-template.xml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java
 
b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java
index 93dab810b..9df85bcd4 100644
--- 
a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java
+++ 
b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java
@@ -72,10 +72,10 @@ public class TikaResourceFetcherTest extends CXFTestBase {
         String configXML = getStringFromInputStream(
                 TikaResourceFetcherTest.class.getResourceAsStream(
                         "/configs/tika-config-server-fetcher-template.xml"));
-        configXML = configXML.replaceAll("\\$\\{FETCHER_BASE_PATH\\}",
+        configXML = configXML.replace("{FETCHER_BASE_PATH}",
                 inputDir.toAbsolutePath().toString());
 
-        configXML = configXML.replaceAll("\\$\\{PORT\\}", "9998");
+        configXML = configXML.replace("{PORT}", "9998");
         return new 
ByteArrayInputStream(configXML.getBytes(StandardCharsets.UTF_8));
     }
 
diff --git 
a/tika-server/tika-server-core/src/test/resources/configs/tika-config-server-fetcher-template.xml
 
b/tika-server/tika-server-core/src/test/resources/configs/tika-config-server-fetcher-template.xml
index 473e9499c..11616ceee 100644
--- 
a/tika-server/tika-server-core/src/test/resources/configs/tika-config-server-fetcher-template.xml
+++ 
b/tika-server/tika-server-core/src/test/resources/configs/tika-config-server-fetcher-template.xml
@@ -20,13 +20,13 @@
     <fetcher class="org.apache.tika.pipes.fetcher.fs.FileSystemFetcher">
       <params>
         <name>fsf</name>
-        <basePath>${FETCHER_BASE_PATH}</basePath>
+        <basePath>{FETCHER_BASE_PATH}</basePath>
       </params>
     </fetcher>
   </fetchers>
   <server>
     <params>
-      <port>${PORT}</port>
+      <port>{PORT}</port>
       <taskTimeoutMillis>54321</taskTimeoutMillis>
       <enableUnsecureFeatures>true</enableUnsecureFeatures>
       <noFork>true</noFork>