rpms/apache-commons-text
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
apache-commons-text/0001-disable-url-lookup.patch
Didik Supriadi 6deb2b1825 Update to version 1.10.0 
Disable tests

Signed-off-by: Didik Supriadi <didiksupriadi41@fedoraproject.org>
2023-06-24 20:32:08 +07:00

424 lines
19 KiB
Diff
Raw Permalink Blame History

From 3ac7f7d1a58c78088cb4392114caf53a715f3c24 Mon Sep 17 00:00:00 2001
From: Didik Supriadi <didiksupriadi41@fedoraproject.org>
Date: Sat, 24 Jun 2023 18:12:26 +0700
Subject: [PATCH] disable-url-lookup
Signed-off-by: Didik Supriadi <didiksupriadi41@fedoraproject.org>
---
...tutorWithInterpolatorStringLookupTest.java | 3 +
...WithInterpolatorStringLookupTest.java.orig | 263 ++++++++++++++++++
.../text/lookup/UrlStringLookupTest.java | 2 +
.../text/lookup/UrlStringLookupTest.java.orig | 83 ++++++
4 files changed, 351 insertions(+)
create mode 100644 src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java.orig
create mode 100644 src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java.orig
diff --git a/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java b/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java
index f9ccc62..4b851c5 100644
--- a/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java
+++ b/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java
@@ -28,6 +28,7 @@ import org.apache.commons.text.lookup.DefaultStringLookup;
import org.apache.commons.text.lookup.StringLookup;
import org.apache.commons.text.lookup.StringLookupFactory;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
public class StringSubstitutorWithInterpolatorStringLookupTest {
@@ -91,6 +92,7 @@ public class StringSubstitutorWithInterpolatorStringLookupTest {
Assertions.assertEquals("${UnknownLookup:key}", strSubst.replace("${UnknownLookup:key}"));
}
+ @Disabled
@Test
public void testCustomMapWithoutDefaults() {
testCustomMapWithDefaults(false);
@@ -153,6 +155,7 @@ public class StringSubstitutorWithInterpolatorStringLookupTest {
Assertions.assertEquals(input, strSubst.replace(input));
}
+ @Disabled
@Test
public void testDnsLookupAddress() throws UnknownHostException {
final StringSubstitutor strSubst =
diff --git a/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java.orig b/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java.orig
new file mode 100644
index 0000000..f9ccc62
--- /dev/null
+++ b/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java.orig
@@ -0,0 +1,263 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.text;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.text.lookup.DefaultStringLookup;
+import org.apache.commons.text.lookup.StringLookup;
+import org.apache.commons.text.lookup.StringLookupFactory;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class StringSubstitutorWithInterpolatorStringLookupTest {
+
+ private static StringLookup createInterpolatorWithLookups(final DefaultStringLookup... lookups) {
+ final Map<String, StringLookup> lookupMap = new HashMap<>();
+ for (final DefaultStringLookup lookup : lookups) {
+ lookupMap.put(lookup.getKey().toLowerCase(), lookup.getStringLookup());
+ }
+
+ return StringLookupFactory.INSTANCE.interpolatorStringLookup(lookupMap, null, false);
+ }
+
+ @Test
+ public void testCustomFunctionWithDefaults() {
+ testCustomFunctionWithDefaults(true);
+ }
+
+ private void testCustomFunctionWithDefaults(final boolean addDefaultLookups) {
+ final String key = "key";
+ final String value = "value";
+ final Map<String, String> map = new HashMap<>();
+ map.put(key, value);
+ final StringLookup mapStringLookup = StringLookupFactory.INSTANCE.functionStringLookup(map::get);
+ final Map<String, StringLookup> stringLookupMap = new HashMap<>();
+ stringLookupMap.put("customLookup", mapStringLookup);
+ final StringSubstitutor strSubst = new StringSubstitutor(
+ StringLookupFactory.INSTANCE.interpolatorStringLookup(stringLookupMap, null, addDefaultLookups));
+ if (addDefaultLookups) {
+ final String spKey = "user.name";
+ Assertions.assertEquals(System.getProperty(spKey), strSubst.replace("${sys:" + spKey + "}"));
+ }
+ Assertions.assertEquals("value", strSubst.replace("${customLookup:key}"));
+ }
+
+ @Test
+ public void testCustomFunctionWithoutDefaults() {
+ testCustomFunctionWithDefaults(false);
+ }
+
+ @Test
+ public void testCustomMapWithDefaults() {
+ testCustomMapWithDefaults(true);
+ }
+
+ private void testCustomMapWithDefaults(final boolean addDefaultLookups) {
+ final String key = "key";
+ final String value = "value";
+ final Map<String, String> map = new HashMap<>();
+ map.put(key, value);
+ final StringLookup mapStringLookup = StringLookupFactory.INSTANCE.mapStringLookup(map);
+ final Map<String, StringLookup> stringLookupMap = new HashMap<>();
+ stringLookupMap.put("customLookup", mapStringLookup);
+ final StringSubstitutor strSubst = new StringSubstitutor(
+ StringLookupFactory.INSTANCE.interpolatorStringLookup(stringLookupMap, null, addDefaultLookups));
+ if (addDefaultLookups) {
+ final String spKey = "user.name";
+ Assertions.assertEquals(System.getProperty(spKey), strSubst.replace("${sys:" + spKey + "}"));
+ }
+ Assertions.assertEquals("value", strSubst.replace("${customLookup:key}"));
+ Assertions.assertEquals("${UnknownLookup:key}", strSubst.replace("${UnknownLookup:key}"));
+ }
+
+ @Test
+ public void testCustomMapWithoutDefaults() {
+ testCustomMapWithDefaults(false);
+ }
+ @Test
+ public void testDefaultInterpolator() {
+ // Used to cut and paste into the docs.
+ // @formatter:off
+ final StringSubstitutor interpolator = StringSubstitutor.createInterpolator();
+ final String text = interpolator.replace(
+ "Base64 Decoder: ${base64Decoder:SGVsbG9Xb3JsZCE=}\n"
+ + "Base64 Encoder: ${base64Encoder:HelloWorld!}\n"
+ + "Java Constant: ${const:java.awt.event.KeyEvent.VK_ESCAPE}\n"
+ + "Date: ${date:yyyy-MM-dd}\n"
+ + "Environment Variable: ${env:USERNAME}\n"
+ + "File Content: ${file:UTF-8:src/test/resources/org/apache/commons/text/document.properties}\n"
+ + "Java: ${java:version}\n"
+ + "Localhost: ${localhost:canonical-name}\n"
+ + "Properties File: ${properties:src/test/resources/org/apache/commons/text/document.properties::mykey}\n"
+ + "Resource Bundle: ${resourceBundle:org.apache.commons.text.example.testResourceBundleLookup:mykey}\n"
+ + "System Property: ${sys:user.dir}\n"
+ + "URL Decoder: ${urlDecoder:Hello%20World%21}\n"
+ + "URL Encoder: ${urlEncoder:Hello World!}\n"
+ + "XML XPath: ${xml:src/test/resources/org/apache/commons/text/document.xml:/root/path/to/node}\n"
+ );
+ // @formatter:on
+ Assertions.assertNotNull(text);
+ // TEXT-171:
+ Assertions.assertFalse(text.contains("${base64Decoder:SGVsbG9Xb3JsZCE=}"));
+ Assertions.assertFalse(text.contains("${base64Encoder:HelloWorld!}"));
+ Assertions.assertFalse(text.contains("${urlDecoder:Hello%20World%21}"));
+ Assertions.assertFalse(text.contains("${urlEncoder:Hello World!}"));
+ Assertions.assertFalse(text.contains("${resourceBundle:org.apache.commons.text.example.testResourceBundleLookup:mykey}"));
+ }
+
+ @Test
+ public void testDefaultValueForMissingKeyInResourceBundle() {
+ final StringLookup interpolatorStringLookup = StringLookupFactory.INSTANCE.interpolatorStringLookup(
+ StringLookupFactory.INSTANCE.resourceBundleStringLookup("org.apache.commons.text.example.testResourceBundleLookup"));
+ assertEquals("${missingKey:-defaultValue}", interpolatorStringLookup.lookup("keyWithMissingKey"));
+ final StringSubstitutor stringSubstitutor = new StringSubstitutor(interpolatorStringLookup);
+ // The following would throw a MissingResourceException before TEXT-165.
+ assertEquals("defaultValue", stringSubstitutor.replace("${keyWithMissingKey}"));
+ }
+
+ @Test
+ public void testDnsLookup() throws UnknownHostException {
+ final StringSubstitutor strSubst =
+ new StringSubstitutor(createInterpolatorWithLookups(DefaultStringLookup.DNS));
+ final String hostName = InetAddress.getLocalHost().getHostName();
+ Assertions.assertEquals(InetAddress.getByName(hostName).getHostAddress(),
+ strSubst.replace("${dns:" + hostName + "}"));
+ }
+
+ @Test
+ public void testDnsLookup_disabledByDefault() throws UnknownHostException {
+ final StringSubstitutor strSubst = StringSubstitutor.createInterpolator();
+ final String hostName = InetAddress.getLocalHost().getHostName();
+ final String input = "${dns:" + hostName + "}";
+ Assertions.assertEquals(input, strSubst.replace(input));
+ }
+
+ @Test
+ public void testDnsLookupAddress() throws UnknownHostException {
+ final StringSubstitutor strSubst =
+ new StringSubstitutor(createInterpolatorWithLookups(DefaultStringLookup.DNS));
+ Assertions.assertEquals(InetAddress.getByName("apache.org").getHostAddress(),
+ strSubst.replace("${dns:address|apache.org}"));
+ }
+
+ @Test
+ public void testDnsLookupCanonicalName() throws UnknownHostException {
+ final StringSubstitutor strSubst =
+ new StringSubstitutor(createInterpolatorWithLookups(DefaultStringLookup.DNS));
+ final String address = InetAddress.getLocalHost().getHostAddress();
+ final InetAddress inetAddress = InetAddress.getByName(address);
+ Assertions.assertEquals(inetAddress.getCanonicalHostName(),
+ strSubst.replace("${dns:canonical-name|" + address + "}"));
+ }
+
+ @Test
+ public void testDnsLookupName() throws UnknownHostException {
+ final StringSubstitutor strSubst =
+ new StringSubstitutor(createInterpolatorWithLookups(DefaultStringLookup.DNS));
+ final String address = InetAddress.getLocalHost().getHostAddress();
+ final InetAddress inetAddress = InetAddress.getByName(address);
+ Assertions.assertEquals(inetAddress.getHostName(), strSubst.replace("${dns:name|" + address + "}"));
+ }
+
+ @Test
+ public void testDnsLookupNameUntrimmed() throws UnknownHostException {
+ final StringSubstitutor strSubst =
+ new StringSubstitutor(createInterpolatorWithLookups(DefaultStringLookup.DNS));
+ final String address = InetAddress.getLocalHost().getHostAddress();
+ final InetAddress inetAddress = InetAddress.getByName(address);
+ Assertions.assertEquals(inetAddress.getHostName(), strSubst.replace("${dns:name| " + address + " }"));
+ }
+
+ @Test
+ public void testDnsLookupUnknown() {
+ final StringSubstitutor strSubst =
+ new StringSubstitutor(createInterpolatorWithLookups(DefaultStringLookup.DNS));
+ final String unknown = "${dns: u n k n o w n}";
+ Assertions.assertEquals(unknown, strSubst.replace(unknown));
+ }
+
+ @Test
+ public void testJavaScript() {
+ final StringSubstitutor strSubst =
+ new StringSubstitutor(createInterpolatorWithLookups(DefaultStringLookup.SCRIPT));
+
+ Assertions.assertEquals("Hello World!", strSubst.replace("${script:javascript:\"Hello World!\"}"));
+ Assertions.assertEquals("7", strSubst.replace("${script:javascript:3 + 4}"));
+ }
+
+ @Test
+ public void testJavaScript_disabledByDefault() {
+ final StringSubstitutor strSubst = StringSubstitutor.createInterpolator();
+
+ Assertions.assertEquals("${script:javascript:3 + 4}", strSubst.replace("${script:javascript:3 + 4}"));
+ }
+
+ @Test
+ public void testLocalHostLookup_Address() throws UnknownHostException {
+ final StringSubstitutor strSubst = StringSubstitutor.createInterpolator();
+ Assertions.assertEquals(InetAddress.getLocalHost().getHostAddress(), strSubst.replace("${localhost:address}"));
+ }
+
+ @Test
+ public void testLocalHostLookup_CanonicalName() throws UnknownHostException {
+ final StringSubstitutor strSubst = StringSubstitutor.createInterpolator();
+ Assertions.assertEquals(InetAddress.getLocalHost().getCanonicalHostName(),
+ strSubst.replace("${localhost:canonical-name}"));
+ }
+
+ @Test
+ public void testLocalHostLookup_Name() throws UnknownHostException {
+ final StringSubstitutor strSubst = StringSubstitutor.createInterpolator();
+ Assertions.assertEquals(InetAddress.getLocalHost().getHostName(), strSubst.replace("${localhost:name}"));
+ }
+
+ @Test
+ public void testMapAndSystemProperty() {
+ final String key = "key";
+ final String value = "value";
+ final Map<String, String> map = new HashMap<>();
+ map.put(key, value);
+ final StringSubstitutor strSubst = new StringSubstitutor(
+ StringLookupFactory.INSTANCE.interpolatorStringLookup(map));
+ final String spKey = "user.name";
+ Assertions.assertEquals(System.getProperty(spKey), strSubst.replace("${sys:" + spKey + "}"));
+ Assertions.assertEquals(value, strSubst.replace("${" + key + "}"));
+ }
+
+ @Test
+ public void testSystemProperty() {
+ final StringSubstitutor strSubst = StringSubstitutor.createInterpolator();
+ final String spKey = "user.name";
+ Assertions.assertEquals(System.getProperty(spKey), strSubst.replace("${sys:" + spKey + "}"));
+ }
+
+ @Test
+ public void testSystemPropertyDefaultStringLookup() {
+ final StringSubstitutor strSubst = new StringSubstitutor(
+ StringLookupFactory.INSTANCE.interpolatorStringLookup(StringLookupFactory.INSTANCE.systemPropertyStringLookup()));
+ final String spKey = "user.name";
+ Assertions.assertEquals(System.getProperty(spKey), strSubst.replace("${" + spKey + "}"));
+ Assertions.assertEquals(System.getProperty(spKey), strSubst.replace("${sys:" + spKey + "}"));
+ }
+}
diff --git a/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java b/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java
index 93b83fe..402968b 100644
--- a/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java
+++ b/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java
@@ -26,6 +26,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
@@ -64,6 +65,7 @@ public class UrlStringLookupTest {
Assertions.assertNotNull(UrlStringLookup.INSTANCE.lookup("UTF-8:https://www.google.com"));
}
+ @Disabled
@Test
public void testMissingUrl() {
assertThrows(IllegalArgumentException.class, () -> UrlStringLookup.INSTANCE.lookup("UTF-8"));
diff --git a/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java.orig b/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java.orig
new file mode 100644
index 0000000..93b83fe
--- /dev/null
+++ b/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java.orig
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+
+package org.apache.commons.text.lookup;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests {@link UrlStringLookup}.
+ */
+public class UrlStringLookupTest {
+
+ @Test
+ public void testBadCharsetName() {
+ assertThrows(IllegalArgumentException.class, () -> UrlStringLookup.INSTANCE.lookup("BAD_CHARSET_NAME:BAD_URL"));
+ }
+
+ @Test
+ public void testBadEncoding() {
+ assertThrows(IllegalArgumentException.class, () -> UrlStringLookup.INSTANCE.lookup("FOO:https://www.google.com"));
+ }
+
+ @Test
+ public void testBadUrl() {
+ assertThrows(IllegalArgumentException.class, () -> UrlStringLookup.INSTANCE.lookup("UTF-8:BAD_URL"));
+ }
+
+ @Test
+ public void testFileScheme() throws Exception {
+ final Path path = Paths.get("src/test/resources/org/apache/commons/text/document.properties");
+ final URI uri = path.toUri();
+ // System.out.println(uri);
+ final byte[] expectedBytes = Files.readAllBytes(path);
+ final String expectedString = new String(expectedBytes, StandardCharsets.UTF_8);
+ Assertions.assertEquals(expectedString, UrlStringLookup.INSTANCE.lookup("UTF-8:" + uri.toString()));
+ }
+
+ @Test
+ public void testHttpScheme() {
+ Assertions.assertNotNull(UrlStringLookup.INSTANCE.lookup("UTF-8:https://www.apache.org"));
+ Assertions.assertNotNull(UrlStringLookup.INSTANCE.lookup("UTF-8:https://www.google.com"));
+ }
+
+ @Test
+ public void testMissingUrl() {
+ assertThrows(IllegalArgumentException.class, () -> UrlStringLookup.INSTANCE.lookup("UTF-8"));
+ }
+
+ @Test
+ public void testNull() {
+ Assertions.assertNull(UrlStringLookup.INSTANCE.lookup(null));
+ }
+
+ @Test
+ public void testToString() {
+ // does not blow up and gives some kind of string.
+ Assertions.assertFalse(UrlStringLookup.INSTANCE.toString().isEmpty());
+ }
+
+}
--
2.41.0
Reference in a new issue View git blame Copy permalink