rife2/bld-property-file
rife2/bld-property-file
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleaned up tests

Browse source
This commit is contained in:
Erik C. Thauvin 2023-04-03 02:18:19 -07:00
parent 29ccd1cbdf
commit 93c1738364
1 changed files with 42 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

97
src/test/java/rife/bld/extension/propertyFile/PropertyFileUtilsTest.java → src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package rife.bld.extension.propertyFile; package rife.bld.extension.propertyfile;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import rife.tools.Localization; import rife.tools.Localization;
@ -36,65 +36,52 @@ import static org.assertj.core.api.Assertions.assertThatCode;
*/ */
class PropertyFileUtilsTest { class PropertyFileUtilsTest {
final Properties p = new Properties(); final Properties p = new Properties();
final String t = "test";
@Test @Test
void currentValueTest() { void currentValueTest() {
String prev; String prev = "previous";
String value; String value = "value";
String defaultValue = null; String defaultValue = "defaultValue";
var operation = Entry.Operations.SET; var operation = Entry.Operations.SET;
// If only value is specified, the property is set to it regardless of its previous value. // If only value is specified, the property is set to it regardless of its previous value.
prev = "previous"; assertThat(PropertyFileUtils.currentValue(prev, value, null, operation))
value = "value"; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(value);
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo(value);
// If only defaultValue is specified and the property previously existed, it is unchanged. // If only defaultValue is specified and the property previously existed, it is unchanged.
prev = "previous"; assertThat(PropertyFileUtils.currentValue(prev, null, defaultValue, operation))
value = null; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(prev);
defaultValue = "defaultValue";
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo(prev);
// If only defaultValue is specified and the property did not exist, the property is set to defaultValue. // If only defaultValue is specified and the property did not exist, the property is set to defaultValue.
prev = null; assertThat(PropertyFileUtils.currentValue(null, null, defaultValue, operation))
defaultValue = "defaultValue"; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(defaultValue);
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo(defaultValue);
// If value and defaultValue are both specified and the property previously existed, the property is set to value. // If value and defaultValue are both specified and the property previously existed, the property is set to value.
prev = "previous"; assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation))
value = "value"; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(value);
defaultValue = "defaultValue";
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo(value);
// If value and defaultValue are both specified and the property did not exist, the property is set to defaultValue. // If value and defaultValue are both specified and the property did not exist, the property is set to defaultValue.
prev = null; assertThat(PropertyFileUtils.currentValue(null, value, defaultValue, operation))
value = "value"; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(defaultValue);
defaultValue = "defaultValue";
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo(defaultValue);
// ADD // ADD
operation = Entry.Operations.ADD; operation = Entry.Operations.ADD;
value = "value"; assertThat(PropertyFileUtils.currentValue(null, value, defaultValue, operation))
defaultValue = "defaultValue"; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(defaultValue);
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo(defaultValue);
prev = "prev"; assertThat(PropertyFileUtils.currentValue(prev, value, null, operation))
value = "value"; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(prev);
defaultValue = null;
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo(prev);
prev = null; assertThat(PropertyFileUtils.currentValue(null, value, null, operation))
value = "value"; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo("");
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo("");
value = "value"; assertThat(PropertyFileUtils.currentValue(null, value, defaultValue, operation))
defaultValue = "defaultValue"; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(defaultValue);
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo(defaultValue);
value = null; assertThat(PropertyFileUtils.currentValue(null, null, null, operation))
defaultValue = null; .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo("");
assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation)).as("currentValue(prev,value,defaultValue,operation)").isEqualTo("");
} }
@Test @Test
@ -115,38 +102,38 @@ class PropertyFileUtilsTest {
@Test @Test
void processIntTest() { void processIntTest() {
var entry = new Entry("version.patch").value("a").type(Entry.Types.INT); var entry = new Entry("version.patch").value("a").type(Entry.Types.INT);
assertThat(PropertyFileUtils.processInt(p, entry, false)).as("parseInt(entry.getKey(), a)"); assertThat(PropertyFileUtils.processInt(t, p, entry, false)).as("parseInt(entry.getKey(), a)");
// ADD // ADD
entry.setOperation(Entry.Operations.ADD); entry.setOperation(Entry.Operations.ADD);
entry.setValue("1"); entry.setValue("1");
entry.setDefaultValue("-1"); entry.setDefaultValue("-1");
PropertyFileUtils.processInt(p, entry, true); PropertyFileUtils.processInt(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0)").isEqualTo("0"); assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0)").isEqualTo("0");
entry.setKey("anint"); entry.setKey("anint");
entry.setValue(null); entry.setValue(null);
entry.setDefaultValue("0"); entry.setDefaultValue("0");
PropertyFileUtils.processInt(p, entry, true); PropertyFileUtils.processInt(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 1)").isEqualTo("1"); assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 1)").isEqualTo("1");
PropertyFileUtils.processInt(p, entry, true); PropertyFileUtils.processInt(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 2)").isEqualTo("2"); assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 2)").isEqualTo("2");
entry.setKey("formated.int"); entry.setKey("formated.int");
entry.setValue(null); entry.setValue(null);
entry.setDefaultValue("0013"); entry.setDefaultValue("0013");
entry.setPattern("0000"); entry.setPattern("0000");
PropertyFileUtils.processInt(p, entry, true); PropertyFileUtils.processInt(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0014)").isEqualTo("0014"); assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0014)").isEqualTo("0014");
PropertyFileUtils.processInt(p, entry, true); PropertyFileUtils.processInt(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0015)").isEqualTo("0015"); assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0015)").isEqualTo("0015");
entry.setKey("formated.int"); entry.setKey("formated.int");
entry.setValue("2"); entry.setValue("2");
entry.setDefaultValue("0013"); entry.setDefaultValue("0013");
entry.setPattern("0000"); entry.setPattern("0000");
PropertyFileUtils.processInt(p, entry, true); PropertyFileUtils.processInt(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0017)").isEqualTo("0017"); assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0017)").isEqualTo("0017");
// SUBTRACT // SUBTRACT
@ -154,7 +141,7 @@ class PropertyFileUtilsTest {
entry.setValue(null); entry.setValue(null);
entry.setDefaultValue("0013"); entry.setDefaultValue("0013");
entry.setPattern("0000"); entry.setPattern("0000");
PropertyFileUtils.processInt(p, entry, true); PropertyFileUtils.processInt(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0016)").isEqualTo("0016"); assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0016)").isEqualTo("0016");
} }
@ -165,36 +152,36 @@ class PropertyFileUtilsTest {
var dayInt = Integer.parseInt(day); var dayInt = Integer.parseInt(day);
entry.setValue("a"); entry.setValue("a");
assertThat(PropertyFileUtils.processDate(p, entry, false)).as("processDate(entry.getKey(), a)").isFalse(); assertThat(PropertyFileUtils.processDate(t, p, entry, false)).as("processDate(entry.getKey(), a)").isFalse();
entry.setValue("99"); entry.setValue("99");
PropertyFileUtils.processDate(p, entry, true); PropertyFileUtils.processDate(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), 99)").isEqualTo("99"); assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), 99)").isEqualTo("99");
entry.setValue("now"); entry.setValue("now");
PropertyFileUtils.processDate(p, entry, true); PropertyFileUtils.processDate(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now)").isEqualTo(day); assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now)").isEqualTo(day);
// ADD // ADD
entry.setOperation(Entry.Operations.ADD); entry.setOperation(Entry.Operations.ADD);
entry.setValue("1"); entry.setValue("1");
PropertyFileUtils.processDate(p, entry, true); PropertyFileUtils.processDate(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now+1)").isEqualTo(String.valueOf(dayInt + 1)); assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now+1)").isEqualTo(String.valueOf(dayInt + 1));
entry.setValue("2"); entry.setValue("2");
PropertyFileUtils.processDate(p, entry, true); PropertyFileUtils.processDate(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now+3)").isEqualTo(String.valueOf(dayInt + 3)); assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now+3)").isEqualTo(String.valueOf(dayInt + 3));
// SUBTRACT // SUBTRACT
entry.setOperation(Entry.Operations.SUBTRACT); entry.setOperation(Entry.Operations.SUBTRACT);
entry.setValue("3"); entry.setValue("3");
PropertyFileUtils.processDate(p, entry, true); PropertyFileUtils.processDate(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now-3)").isEqualTo(String.valueOf(dayInt)); assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now-3)").isEqualTo(String.valueOf(dayInt));
entry.setOperation(Entry.Operations.SUBTRACT); entry.setOperation(Entry.Operations.SUBTRACT);
entry.setValue("2"); entry.setValue("2");
PropertyFileUtils.processDate(p, entry, true); PropertyFileUtils.processDate(t, p, entry, true);
assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now-2)").isEqualTo(String.valueOf(dayInt - 2)); assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now-2)").isEqualTo(String.valueOf(dayInt - 2));
} }
@ -210,10 +197,10 @@ class PropertyFileUtilsTest {
assertThatCode(() -> PropertyFileUtils.saveProperties(tmp, "Generated file - do not modify!", p)) assertThatCode(() -> PropertyFileUtils.saveProperties(tmp, "Generated file - do not modify!", p))
.as("save properties").doesNotThrowAnyException(); .as("save properties").doesNotThrowAnyException();
assertThat(PropertyFileUtils.loadProperties(tmp, p)).as("load properties").isTrue(); assertThat(PropertyFileUtils.loadProperties(t, tmp, p)).as("load properties").isTrue();
assertThat(p.getProperty(test)).as("read property").isEqualTo(test); assertThat(p.getProperty(test)).as("read property").isEqualTo(test);
tmp.deleteOnExit(); tmp.deleteOnExit();
} }
} }