sparsick commented on code in PR #447:
URL:
https://github.com/apache/maven-resources-plugin/pull/447#discussion_r2580002395
##########
pom.xml:
##########
@@ -136,12 +136,28 @@ under the License.
<version>3.4.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
Review Comment:
Can the JUnit dependency also be deleted? If not, we should add a comment.
Without comment, it is confusing because JUnit Vintage is also declared as a
dependency.
##########
src/test/java/org/apache/maven/plugins/resources/PropertyUtilsTest.java:
##########
@@ -0,0 +1,146 @@
+/*
+ * 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.maven.plugins.resources;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import org.apache.maven.shared.filtering.PropertyUtils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class PropertyUtilsTest {
+
+ private File propertyFile;
+
+ private Properties validationProp;
+
+ @BeforeEach
+ protected void setUp() throws Exception {
+
+ // load data
+
+ propertyFile = new File(getBasedir(),
"/target/test-classes/unit/propertiesutils-test/test.properties");
+ assertNotNull(propertyFile);
+
+ File validationFile =
+ new File(getBasedir(),
"/target/test-classes/unit/propertiesutils-test/test_validation.properties");
+ assertNotNull(validationFile);
+
+ loadValidationProperties(validationFile);
+ }
+
+ /**
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
+ *
+ * @throws Exception
+ */
+ @Test
+ void testBasicLoadPropertyFF() throws Exception {
+ Properties prop = PropertyUtils.loadPropertyFile(propertyFile, false,
false);
+
+ assertNotNull(prop);
+ validateProperties(prop);
+ }
+
+ /**
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
+ *
+ * @throws Exception
+ */
+ @Test
+ void testBasicLoadPropertyTF() throws Exception {
+ Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true,
false);
+
+ assertNotNull(prop);
+ validateProperties(prop);
+ }
+
+ /**
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
+ *
+ * @throws Exception
+ */
+ @Test
+ void testBasicLoadPropertyTT() throws Exception {
+ Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true,
true);
+
+ validationProp.putAll(System.getProperties());
+ assertNotNull(prop);
+ validateProperties(prop);
+ }
+
+ /**
+ * load property test case can be adjusted by modifying the
basic.properties and basic_validation properties
+ *
+ * @throws Exception
+ */
+ @Test
+ void testNonExistentProperty() throws Exception {
+ Properties prop = PropertyUtils.loadPropertyFile(propertyFile, true,
true);
+
+ validationProp.putAll(System.getProperties());
+ assertNotNull(prop);
+ assertNull(prop.getProperty("does_not_exist"));
+ }
+
+ @Test
+ public void loadPropertyFileShouldFailWithFileNotFoundException() {
+
+ assertThrows(
+ FileNotFoundException.class,
+ () -> PropertyUtils.loadPropertyFile(new
File("NON_EXISTENT_FILE"), true, true));
+ }
+
+ protected void validateProperties(Properties prop) {
Review Comment:
If this method is only used in this class, then it can be private. If it is
needed also outside this class, it should be moved into a separate class.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
