From 29d63a0a83b7399ba65bd07ff57bf28e5a770ffd Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 30 Jun 2023 11:57:09 +0200 Subject: [PATCH] final clean up --- .../java/org/cryptomator/common/SubstitutingProperties.java | 3 ++- .../org/cryptomator/common/SubstitutingPropertiesTest.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cryptomator/common/SubstitutingProperties.java b/src/main/java/org/cryptomator/common/SubstitutingProperties.java index bafab051e..8ba98a2b6 100644 --- a/src/main/java/org/cryptomator/common/SubstitutingProperties.java +++ b/src/main/java/org/cryptomator/common/SubstitutingProperties.java @@ -1,5 +1,6 @@ package org.cryptomator.common; +import org.jetbrains.annotations.VisibleForTesting; import org.slf4j.LoggerFactory; import java.util.Map; @@ -33,7 +34,7 @@ public class SubstitutingProperties extends PropertiesDecorator { return result != null ? result : defaultValue; } - //visible for testing + @VisibleForTesting String process(String value) { return TEMPLATE.matcher(value).replaceAll(match -> // switch (match.group(1)) { diff --git a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java index 723e01bcf..febffb020 100644 --- a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java +++ b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java @@ -30,7 +30,7 @@ public class SubstitutingPropertiesTest { public void test(String propertyValue, String expected) { SubstitutingProperties inTest = new SubstitutingProperties(Mockito.mock(Properties.class), Map.of("APPDIR", "foobar")); var result = inTest.process(propertyValue); - Assertions.assertEquals(result, expected); + Assertions.assertEquals(expected, result); } @Test @@ -41,7 +41,7 @@ public class SubstitutingPropertiesTest { inTest = new SubstitutingProperties(props, Map.of()); var result = inTest.process("@{userhome}"); - Assertions.assertEquals(result, "OneUponABit"); + Assertions.assertEquals("OneUponABit", result); } @DisplayName("Other keywords are replaced accordingly") @@ -50,7 +50,7 @@ public class SubstitutingPropertiesTest { public void testEnvSubstitutions(String token, String envName, String expected) { inTest = new SubstitutingProperties(new Properties(), Map.of(envName, expected)); var result = inTest.process("@{" + token + "}"); - Assertions.assertEquals(result, expected); + Assertions.assertEquals(expected, result); } }