hanicz commented on code in PR #971: URL: https://github.com/apache/knox/pull/971#discussion_r1865779170
########## gateway-util-launcher/src/test/java/org/apache/knox/gateway/launcher/ExtenderTest.java: ########## @@ -0,0 +1,195 @@ +/* + * 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.knox.gateway.launcher; + + +import org.junit.Test; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Properties; + +import static org.junit.Assert.assertEquals; + +public class ExtenderTest { + + private Path tempDir; + private Path confDir; + private Path configFilePath; + + @Test + public void extendClassPathPropertyTest() throws IOException { + this.setupDirs(); + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + properties.setProperty("main.class", "org.apache.knox.gateway.GatewayServer"); + Extender extender = new Extender(confDir.toFile(), properties); + + String configContent = this.getConfigContent("/new/classp/*"); + Files.write(configFilePath, configContent.getBytes(StandardCharsets.UTF_8)); + extender.extendClassPathProperty(); + + assertEquals("/new/classp/*;classpath", properties.getProperty("class.path")); + this.cleanUpDirs(); + } + + @Test + public void extendClassPathPropertyDifferentMainClassTest() throws IOException { + this.setupDirs(); + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + properties.setProperty("main.class", "org.apache.knox.gateway.KnoxCLI"); + Extender extender = new Extender(confDir.toFile(), properties); + + String configContent = this.getConfigContent("/new/classp/*"); + Files.write(configFilePath, configContent.getBytes(StandardCharsets.UTF_8)); + extender.extendClassPathProperty(); + + assertEquals("classpath", properties.getProperty("class.path")); + this.cleanUpDirs(); + } + + @Test + public void extractExtensionPathIntoPropertyNoDelimTest() { + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + Extender extender = new Extender(null, properties); + + String configContent = this.getConfigContent("/new/classp/*"); + extender.extractExtensionPathIntoProperty(configContent); + + assertEquals("/new/classp/*;classpath", properties.getProperty("class.path")); + } + + @Test + public void extractExtensionPathIntoPropertyXMLFormatTest() { + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + Extender extender = new Extender(null, properties); + + String configContent = this.getConfigContent("/new/classp/*;"); + extender.extractExtensionPathIntoProperty(configContent); + + assertEquals("/new/classp/*;classpath", properties.getProperty("class.path")); + } + + @Test + public void extractExtensionPathIntoPropertyWhitespaceTest() { + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + Extender extender = new Extender(null, properties); + + String configContent = this.getConfigContent(" /new/classp/*; "); + extender.extractExtensionPathIntoProperty(configContent); + + assertEquals("/new/classp/*;classpath", properties.getProperty("class.path")); + } + + @Test + public void extractExtensionPathIntoPropertyMultipleTest() { + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + Extender extender = new Extender(null, properties); + + String configContent = this.getConfigContent("/new/classp/*,../classp"); + extender.extractExtensionPathIntoProperty(configContent); + + assertEquals("/new/classp/*,../classp;classpath", properties.getProperty("class.path")); + } + + @Test + public void extractExtensionPathIntoPropertyEmptyTest() { + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + Extender extender = new Extender(null, properties); + + String configContent = this.getConfigContent(""); + extender.extractExtensionPathIntoProperty(configContent); + + assertEquals("classpath", properties.getProperty("class.path")); + } + + @Test + public void extractExtensionPathIntoPropertyEmptyWhitespaceTest() { + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + Extender extender = new Extender(null, properties); + + String configContent = this.getConfigContent(" "); + extender.extractExtensionPathIntoProperty(configContent); + + assertEquals("classpath", properties.getProperty("class.path")); + } + + @Test + public void extractExtensionPathIntoPropertyNoConfigTest() { + Properties properties = new Properties(); + properties.setProperty("class.path", "classpath"); + Extender extender = new Extender(null, properties); + + String configContent = + "<configuration>\n" + + " <property>\n" + + " <name>gateway.webshell.read.buffer.size</name>\n" + + " <value>1024</value>\n" + + " <description>Web Shell buffer size for reading</description>\n" + + " </property>\n" + + "\n" + + " <!-- @since 2.0.0 websocket JWT validation configs -->\n" + + " <property>\n" + + " <name>gateway.websocket.JWT.validation.feature.enabled</name>\n" + + " <value>true</value>\n" + + " <description>Enable/Disable websocket JWT validation at websocket layer.</description>\n" + + " </property>\n" + + "\n" + + " <!-- @since 1.5.0 homepage logout -->\n" + + " <property>\n" + + " <name>knox.homepage.logout.enabled</name>\n" + + " <value>true</value>\n" + + " <description>Enable/disable logout from the Knox Homepage.</description>\n" + + " </property>\n" + + "</configuration>"; Review Comment: I moved the XML to the gateway-site-test.xml file in the test/resources folder. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@knox.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
