elharo commented on code in PR #78:
URL: https://github.com/apache/maven-filtering/pull/78#discussion_r1368496934
##########
src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java:
##########
@@ -39,40 +38,40 @@ public class PropertyUtilsTest extends TestSupport {
private static File testDirectory = new File(getBasedir(),
"target/test-classes/");
public void testBasic() throws Exception {
- File basicProp = new File(testDirectory, "basic.properties");
+ File basicProp = File.createTempFile("basic", ".properties");
- if (basicProp.exists()) {
+ try {
+ try (Writer writer = new OutputStreamWriter(new
FileOutputStream(basicProp), StandardCharsets.UTF_8)) {
+ writer.write("ghost=${non_existent}\n");
+ writer.write("key=${untat_na_damgo}\n");
+ writer.write("untat_na_damgo=gani_man\n");
+ writer.flush();
+ }
+
+ Logger logger = mock(Logger.class);
+ Properties prop = PropertyUtils.loadPropertyFile(basicProp, false,
false, logger);
Review Comment:
prop --> properties
##########
src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java:
##########
@@ -39,40 +38,40 @@ public class PropertyUtilsTest extends TestSupport {
private static File testDirectory = new File(getBasedir(),
"target/test-classes/");
public void testBasic() throws Exception {
- File basicProp = new File(testDirectory, "basic.properties");
+ File basicProp = File.createTempFile("basic", ".properties");
- if (basicProp.exists()) {
+ try {
+ try (Writer writer = new OutputStreamWriter(new
FileOutputStream(basicProp), StandardCharsets.UTF_8)) {
+ writer.write("ghost=${non_existent}\n");
+ writer.write("key=${untat_na_damgo}\n");
+ writer.write("untat_na_damgo=gani_man\n");
+ writer.flush();
+ }
+
+ Logger logger = mock(Logger.class);
+ Properties prop = PropertyUtils.loadPropertyFile(basicProp, false,
false, logger);
+ assertTrue(prop.getProperty("key").equals("gani_man"));
+ assertTrue(prop.getProperty("ghost").equals("${non_existent}"));
+ } finally {
basicProp.delete();
}
-
- basicProp.createNewFile();
- try (FileWriter writer = new FileWriter(basicProp)) {
- writer.write("ghost=${non_existent}\n");
- writer.write("key=${untat_na_damgo}\n");
- writer.write("untat_na_damgo=gani_man\n");
- writer.flush();
- }
-
- Properties prop = PropertyUtils.loadPropertyFile(basicProp, false,
false);
- assertTrue(prop.getProperty("key").equals("gani_man"));
- assertTrue(prop.getProperty("ghost").equals("${non_existent}"));
}
public void testSystemProperties() throws Exception {
- File systemProp = new File(testDirectory, "system.properties");
+ File systemProp = File.createTempFile("system", ".properties");
- if (systemProp.exists()) {
+ try {
+ try (Writer writer = new OutputStreamWriter(new
FileOutputStream(systemProp), StandardCharsets.UTF_8)) {
+ writer.write("key=${user.dir}");
+ writer.flush();
+ }
+
+ Logger logger = mock(Logger.class);
+ Properties prop = PropertyUtils.loadPropertyFile(systemProp,
false, true, logger);
+
assertTrue(prop.getProperty("key").equals(System.getProperty("user.dir")));
Review Comment:
assertEquals
##########
src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java:
##########
@@ -39,40 +38,40 @@ public class PropertyUtilsTest extends TestSupport {
private static File testDirectory = new File(getBasedir(),
"target/test-classes/");
public void testBasic() throws Exception {
- File basicProp = new File(testDirectory, "basic.properties");
+ File basicProp = File.createTempFile("basic", ".properties");
- if (basicProp.exists()) {
+ try {
+ try (Writer writer = new OutputStreamWriter(new
FileOutputStream(basicProp), StandardCharsets.UTF_8)) {
+ writer.write("ghost=${non_existent}\n");
+ writer.write("key=${untat_na_damgo}\n");
+ writer.write("untat_na_damgo=gani_man\n");
+ writer.flush();
+ }
+
+ Logger logger = mock(Logger.class);
+ Properties prop = PropertyUtils.loadPropertyFile(basicProp, false,
false, logger);
+ assertTrue(prop.getProperty("key").equals("gani_man"));
Review Comment:
assertEquals
##########
src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java:
##########
@@ -39,40 +38,40 @@ public class PropertyUtilsTest extends TestSupport {
private static File testDirectory = new File(getBasedir(),
"target/test-classes/");
public void testBasic() throws Exception {
- File basicProp = new File(testDirectory, "basic.properties");
+ File basicProp = File.createTempFile("basic", ".properties");
- if (basicProp.exists()) {
+ try {
+ try (Writer writer = new OutputStreamWriter(new
FileOutputStream(basicProp), StandardCharsets.UTF_8)) {
+ writer.write("ghost=${non_existent}\n");
+ writer.write("key=${untat_na_damgo}\n");
+ writer.write("untat_na_damgo=gani_man\n");
+ writer.flush();
+ }
+
+ Logger logger = mock(Logger.class);
+ Properties prop = PropertyUtils.loadPropertyFile(basicProp, false,
false, logger);
+ assertTrue(prop.getProperty("key").equals("gani_man"));
+ assertTrue(prop.getProperty("ghost").equals("${non_existent}"));
+ } finally {
basicProp.delete();
}
-
- basicProp.createNewFile();
- try (FileWriter writer = new FileWriter(basicProp)) {
- writer.write("ghost=${non_existent}\n");
- writer.write("key=${untat_na_damgo}\n");
- writer.write("untat_na_damgo=gani_man\n");
- writer.flush();
- }
-
- Properties prop = PropertyUtils.loadPropertyFile(basicProp, false,
false);
- assertTrue(prop.getProperty("key").equals("gani_man"));
- assertTrue(prop.getProperty("ghost").equals("${non_existent}"));
}
public void testSystemProperties() throws Exception {
- File systemProp = new File(testDirectory, "system.properties");
+ File systemProp = File.createTempFile("system", ".properties");
- if (systemProp.exists()) {
+ try {
+ try (Writer writer = new OutputStreamWriter(new
FileOutputStream(systemProp), StandardCharsets.UTF_8)) {
+ writer.write("key=${user.dir}");
+ writer.flush();
+ }
+
+ Logger logger = mock(Logger.class);
+ Properties prop = PropertyUtils.loadPropertyFile(systemProp,
false, true, logger);
Review Comment:
properties
##########
src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java:
##########
@@ -39,40 +38,40 @@ public class PropertyUtilsTest extends TestSupport {
private static File testDirectory = new File(getBasedir(),
"target/test-classes/");
public void testBasic() throws Exception {
- File basicProp = new File(testDirectory, "basic.properties");
+ File basicProp = File.createTempFile("basic", ".properties");
- if (basicProp.exists()) {
+ try {
+ try (Writer writer = new OutputStreamWriter(new
FileOutputStream(basicProp), StandardCharsets.UTF_8)) {
+ writer.write("ghost=${non_existent}\n");
+ writer.write("key=${untat_na_damgo}\n");
+ writer.write("untat_na_damgo=gani_man\n");
+ writer.flush();
+ }
+
+ Logger logger = mock(Logger.class);
+ Properties prop = PropertyUtils.loadPropertyFile(basicProp, false,
false, logger);
+ assertTrue(prop.getProperty("key").equals("gani_man"));
+ assertTrue(prop.getProperty("ghost").equals("${non_existent}"));
+ } finally {
basicProp.delete();
}
-
- basicProp.createNewFile();
- try (FileWriter writer = new FileWriter(basicProp)) {
- writer.write("ghost=${non_existent}\n");
- writer.write("key=${untat_na_damgo}\n");
- writer.write("untat_na_damgo=gani_man\n");
- writer.flush();
- }
-
- Properties prop = PropertyUtils.loadPropertyFile(basicProp, false,
false);
- assertTrue(prop.getProperty("key").equals("gani_man"));
- assertTrue(prop.getProperty("ghost").equals("${non_existent}"));
}
public void testSystemProperties() throws Exception {
- File systemProp = new File(testDirectory, "system.properties");
+ File systemProp = File.createTempFile("system", ".properties");
- if (systemProp.exists()) {
+ try {
+ try (Writer writer = new OutputStreamWriter(new
FileOutputStream(systemProp), StandardCharsets.UTF_8)) {
+ writer.write("key=${user.dir}");
+ writer.flush();
+ }
+
+ Logger logger = mock(Logger.class);
+ Properties prop = PropertyUtils.loadPropertyFile(systemProp,
false, true, logger);
+
assertTrue(prop.getProperty("key").equals(System.getProperty("user.dir")));
+ } finally {
Review Comment:
perhaps just set deleteOnExit instead to avoid IOExceptions here failing the
test
--
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: issues-unsubscr...@maven.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
