From eb6004a373a633a752e366fb983ffe9b74efd116 Mon Sep 17 00:00:00 2001 From: Sascha Bartl Date: Sat, 16 Dec 2023 20:01:21 +0100 Subject: [PATCH 1/2] run tests on build --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 85d9e59..c78852e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,16 @@ + + maven-surefire-plugin + 2.22.2 + + + + maven-failsafe-plugin + 2.22.2 + + maven-shade-plugin From 82872c4a00938e1f447491bd55a426a50a4f647e Mon Sep 17 00:00:00 2001 From: Sascha Bartl Date: Sat, 16 Dec 2023 20:01:35 +0100 Subject: [PATCH 2/2] fix existing tests --- .../storage/internal/editor/toml/TomlManager.java | 3 ++- src/test/java/de/leonhard/storage/ConfigTest.java | 12 +++--------- src/test/java/de/leonhard/storage/JsonTest.java | 7 +++---- src/test/java/de/leonhard/storage/TomlTest.java | 7 +++---- src/test/java/de/leonhard/storage/YamlTest.java | 5 ++--- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/main/java/de/leonhard/storage/internal/editor/toml/TomlManager.java b/src/main/java/de/leonhard/storage/internal/editor/toml/TomlManager.java index 8fe5a67..f1be6ff 100644 --- a/src/main/java/de/leonhard/storage/internal/editor/toml/TomlManager.java +++ b/src/main/java/de/leonhard/storage/internal/editor/toml/TomlManager.java @@ -4,6 +4,7 @@ import de.leonhard.storage.util.FastStringWriter; import java.io.*; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.util.Map; @@ -159,7 +160,7 @@ public Map read(final File file) throws IOException, TomlExcepti */ public Map read(final File file, final boolean strictAsciiBareKeys) throws IOException, TomlException { - return read(new FileInputStream(file), strictAsciiBareKeys); + return read(Files.newInputStream(file.toPath()), strictAsciiBareKeys); } /** diff --git a/src/test/java/de/leonhard/storage/ConfigTest.java b/src/test/java/de/leonhard/storage/ConfigTest.java index 625219d..039d371 100644 --- a/src/test/java/de/leonhard/storage/ConfigTest.java +++ b/src/test/java/de/leonhard/storage/ConfigTest.java @@ -3,6 +3,7 @@ import de.leonhard.storage.annotation.ConfigPath; import de.leonhard.storage.internal.exceptions.SimplixValidationException; import de.leonhard.storage.internal.settings.DataType; +import lombok.Getter; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -89,25 +90,18 @@ void testAnnotations() { } @AfterAll - @Test static void tearDown() { config.clear(); Assertions.assertTrue(config.getFile().delete()); } + @Getter static class AnnotationTests { @ConfigPath("annotation-test") public String annotationTest; + @ConfigPath("section.annotations") public Integer annotationTest2; - - public String getAnnotationTest() { - return annotationTest; - } - - public int getAnnotationTest2() { - return annotationTest2; - } } } diff --git a/src/test/java/de/leonhard/storage/JsonTest.java b/src/test/java/de/leonhard/storage/JsonTest.java index 1dd55f4..aeb1819 100644 --- a/src/test/java/de/leonhard/storage/JsonTest.java +++ b/src/test/java/de/leonhard/storage/JsonTest.java @@ -17,12 +17,12 @@ public class JsonTest { @Test void setUp() { json = new Json("Example", ""); - Assertions.assertEquals("Example.yml", json.getName()); + Assertions.assertEquals("Example.json", json.getName()); } @Test void testGetDataType() { - Assertions.assertEquals(json.getDataType(), DataType.SORTED); + Assertions.assertEquals(json.getDataType(), DataType.UNSORTED); } @Test @@ -68,8 +68,7 @@ void testSet() { } @AfterAll - @Test - void tearDown() { + static void tearDown() { json.clear(); Assertions.assertTrue(json.getFile().delete()); } diff --git a/src/test/java/de/leonhard/storage/TomlTest.java b/src/test/java/de/leonhard/storage/TomlTest.java index 0f3ba51..cb10c63 100644 --- a/src/test/java/de/leonhard/storage/TomlTest.java +++ b/src/test/java/de/leonhard/storage/TomlTest.java @@ -17,12 +17,12 @@ public class TomlTest { @Test void setUp() { toml = new Toml("Example", ""); - Assertions.assertEquals("Example.yml", toml.getName()); + Assertions.assertEquals("Example.toml", toml.getName()); } @Test void testGetDataType() { - Assertions.assertEquals(DataType.SORTED, toml.getDataType()); + Assertions.assertEquals(DataType.UNSORTED, toml.getDataType()); } @Test @@ -68,8 +68,7 @@ void testSet() { } @AfterAll - @Test - void tearDown() { + static void tearDown() { toml.clear(); Assertions.assertTrue(toml.getFile().delete()); } diff --git a/src/test/java/de/leonhard/storage/YamlTest.java b/src/test/java/de/leonhard/storage/YamlTest.java index 489d7ef..3b8d012 100644 --- a/src/test/java/de/leonhard/storage/YamlTest.java +++ b/src/test/java/de/leonhard/storage/YamlTest.java @@ -26,7 +26,7 @@ void setUp() { @Test void testGetDataType() { - Assertions.assertEquals(DataType.SORTED, yaml.getDataType()); + Assertions.assertEquals(DataType.UNSORTED, yaml.getDataType()); } @Test @@ -78,8 +78,7 @@ void testSet() { } @AfterAll - @Test - void tearDown() { + static void tearDown() { yaml.clear(); Assertions.assertTrue(yaml.getFile().delete()); }