From 38b07db929042b099588c0746c3a75aa1cb2e66b Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Wed, 3 Apr 2024 15:37:28 +0200 Subject: [PATCH 1/4] SdkVersionTest: Add a few more tests --- .../eu/europa/ted/eforms/sdk/SdkVersionTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/java/eu/europa/ted/eforms/sdk/SdkVersionTest.java b/src/test/java/eu/europa/ted/eforms/sdk/SdkVersionTest.java index e707893..15b221e 100644 --- a/src/test/java/eu/europa/ted/eforms/sdk/SdkVersionTest.java +++ b/src/test/java/eu/europa/ted/eforms/sdk/SdkVersionTest.java @@ -1,6 +1,8 @@ package eu.europa.ted.eforms.sdk; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; @@ -30,6 +32,20 @@ void testGetNextMinor() { assertEquals("1.3.3", new SdkVersion("1.2.3").getNextMinor()); } + @Test + void testIsMajor() { + // SdkVersion always has a minor version number, so isMajor can never be true + assertFalse(new SdkVersion("1.0").isMajor()); + assertFalse(new SdkVersion("1.2").isMajor()); + } + + @Test + void testIsMinor() { + assertTrue(new SdkVersion("2.0").isMinor()); + + assertFalse(new SdkVersion("1.2.3").isMinor()); + } + @Test void testIsPatch() { assertEquals(false, new SdkVersion("1.2").isPatch()); From 93228eeb4d11025e5c988d9e3cbad4f5caad0b2f Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Wed, 3 Apr 2024 15:38:30 +0200 Subject: [PATCH 2/4] Add unit tests for SdkResourceLoader --- .../sdk/resource/SdkResourceLoaderTest.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/test/java/eu/europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java diff --git a/src/test/java/eu/europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java b/src/test/java/eu/europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java new file mode 100644 index 0000000..50b06cd --- /dev/null +++ b/src/test/java/eu/europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java @@ -0,0 +1,39 @@ +package eu.europa.ted.eforms.sdk.resource; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Path; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import eu.europa.ted.MavenTestSetup; +import eu.europa.ted.eforms.sdk.SdkConstants; + +public class SdkResourceLoaderTest extends MavenTestSetup { + private static final Path SDK_ROOT_DIR = Path.of("target/eforms-sdk"); + + @BeforeAll + static void downloadSdk() throws IOException { + SdkDownloader.downloadSdk("1.1", SDK_ROOT_DIR); + } + + @Test + void testGetResourceAsPath() { + Path path = SdkResourceLoader.getResourceAsPath("1.1.3", + SdkConstants.SdkResource.FIELDS_JSON, SDK_ROOT_DIR); + + assertTrue(path.endsWith("fields/fields.json")); + } + + @Test + void testGetResourceAsStream() throws IOException { + InputStream is = SdkResourceLoader.getResourceAsStream("1.1.3", + SdkConstants.SdkResource.FIELDS, "fields.json", SDK_ROOT_DIR); + + assertTrue(is.read() >= 0); + is.close(); + } +} From 536282475453915ca584684c6b9cc8eee4a833c9 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Wed, 3 Apr 2024 15:52:33 +0200 Subject: [PATCH 3/4] SdkVersionTest: Fix indentation to use spaces To be consistent with all other files. --- .../europa/ted/eforms/sdk/SdkVersionTest.java | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/test/java/eu/europa/ted/eforms/sdk/SdkVersionTest.java b/src/test/java/eu/europa/ted/eforms/sdk/SdkVersionTest.java index 15b221e..07a21a6 100644 --- a/src/test/java/eu/europa/ted/eforms/sdk/SdkVersionTest.java +++ b/src/test/java/eu/europa/ted/eforms/sdk/SdkVersionTest.java @@ -7,73 +7,73 @@ import org.junit.jupiter.api.Test; public class SdkVersionTest { - @Test - void testGetMajor() { - assertEquals("1", new SdkVersion("1.2.3").getMajor()); - } + @Test + void testGetMajor() { + assertEquals("1", new SdkVersion("1.2.3").getMajor()); + } - @Test - void testGetMinor() { - assertEquals("2", new SdkVersion("1.2.3").getMinor()); - } + @Test + void testGetMinor() { + assertEquals("2", new SdkVersion("1.2.3").getMinor()); + } - @Test - void testGetPatch() { - assertEquals("3", new SdkVersion("1.2.3").getPatch()); - } + @Test + void testGetPatch() { + assertEquals("3", new SdkVersion("1.2.3").getPatch()); + } - @Test - void testGetNextMajor() { - assertEquals("2.2.3", new SdkVersion("1.2.3").getNextMajor()); - } + @Test + void testGetNextMajor() { + assertEquals("2.2.3", new SdkVersion("1.2.3").getNextMajor()); + } - @Test - void testGetNextMinor() { - assertEquals("1.3.3", new SdkVersion("1.2.3").getNextMinor()); - } + @Test + void testGetNextMinor() { + assertEquals("1.3.3", new SdkVersion("1.2.3").getNextMinor()); + } - @Test - void testIsMajor() { - // SdkVersion always has a minor version number, so isMajor can never be true - assertFalse(new SdkVersion("1.0").isMajor()); - assertFalse(new SdkVersion("1.2").isMajor()); - } + @Test + void testIsMajor() { + // SdkVersion always has a minor version number, so isMajor can never be true + assertFalse(new SdkVersion("1.0").isMajor()); + assertFalse(new SdkVersion("1.2").isMajor()); + } - @Test - void testIsMinor() { - assertTrue(new SdkVersion("2.0").isMinor()); + @Test + void testIsMinor() { + assertTrue(new SdkVersion("2.0").isMinor()); - assertFalse(new SdkVersion("1.2.3").isMinor()); - } + assertFalse(new SdkVersion("1.2.3").isMinor()); + } - @Test - void testIsPatch() { - assertEquals(false, new SdkVersion("1.2").isPatch()); - - assertEquals(true, new SdkVersion("1.2.3").isPatch()); - assertEquals(true, new SdkVersion("1.2.3-rc.4").isPatch()); - } + @Test + void testIsPatch() { + assertEquals(false, new SdkVersion("1.2").isPatch()); + + assertEquals(true, new SdkVersion("1.2.3").isPatch()); + assertEquals(true, new SdkVersion("1.2.3-rc.4").isPatch()); + } - @Test - void testToNormalisedStringWithPatch() { - assertEquals("1.2.3", new SdkVersion("1.2.3").toNormalisedString(true)); - assertEquals("1.2.3", new SdkVersion("1.2.3-SNAPSHOT").toNormalisedString(true)); - assertEquals("1.2.3", new SdkVersion("1.2.3-rc.4").toNormalisedString(true)); - } + @Test + void testToNormalisedStringWithPatch() { + assertEquals("1.2.3", new SdkVersion("1.2.3").toNormalisedString(true)); + assertEquals("1.2.3", new SdkVersion("1.2.3-SNAPSHOT").toNormalisedString(true)); + assertEquals("1.2.3", new SdkVersion("1.2.3-rc.4").toNormalisedString(true)); + } - @Test - void testToStringWithoutPatch() { - assertEquals("1.2", new SdkVersion("1.2.3").toStringWithoutPatch()); - assertEquals("1.2", new SdkVersion("1.2.3-SNAPSHOT").toStringWithoutPatch()); - assertEquals("1.2", new SdkVersion("1.2.3-rc.4").toStringWithoutPatch()); - } + @Test + void testToStringWithoutPatch() { + assertEquals("1.2", new SdkVersion("1.2.3").toStringWithoutPatch()); + assertEquals("1.2", new SdkVersion("1.2.3-SNAPSHOT").toStringWithoutPatch()); + assertEquals("1.2", new SdkVersion("1.2.3-rc.4").toStringWithoutPatch()); + } - @Test - void testCompare() { - assert(new SdkVersion("1.2.3").compareTo(new SdkVersion("1.2.2")) > 0); - assert(new SdkVersion("1.2.3").compareTo(new SdkVersion("1.2")) > 0); - assert(new SdkVersion("1.2.3").compareTo(new SdkVersion("1.2.3-SNAPSHOT")) > 0); - assert(new SdkVersion("1.2.3").compareTo(new SdkVersion("1.2.3-rc.3")) > 0); - assert(new SdkVersion("2.0.0").compareTo(new SdkVersion("2.0.0-alpha.1")) > 0); - } + @Test + void testCompare() { + assert(new SdkVersion("1.2.3").compareTo(new SdkVersion("1.2.2")) > 0); + assert(new SdkVersion("1.2.3").compareTo(new SdkVersion("1.2")) > 0); + assert(new SdkVersion("1.2.3").compareTo(new SdkVersion("1.2.3-SNAPSHOT")) > 0); + assert(new SdkVersion("1.2.3").compareTo(new SdkVersion("1.2.3-rc.3")) > 0); + assert(new SdkVersion("2.0.0").compareTo(new SdkVersion("2.0.0-alpha.1")) > 0); + } } From 02388b645a3f0945af3ba6c6670168f31c0cf526 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Wed, 3 Apr 2024 16:14:50 +0200 Subject: [PATCH 4/4] SdkResourceLoaderTest: Fix SDK version number in tests --- .../europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/eu/europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java b/src/test/java/eu/europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java index 50b06cd..876fde7 100644 --- a/src/test/java/eu/europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java +++ b/src/test/java/eu/europa/ted/eforms/sdk/resource/SdkResourceLoaderTest.java @@ -22,7 +22,7 @@ static void downloadSdk() throws IOException { @Test void testGetResourceAsPath() { - Path path = SdkResourceLoader.getResourceAsPath("1.1.3", + Path path = SdkResourceLoader.getResourceAsPath("1.1", SdkConstants.SdkResource.FIELDS_JSON, SDK_ROOT_DIR); assertTrue(path.endsWith("fields/fields.json")); @@ -30,7 +30,7 @@ void testGetResourceAsPath() { @Test void testGetResourceAsStream() throws IOException { - InputStream is = SdkResourceLoader.getResourceAsStream("1.1.3", + InputStream is = SdkResourceLoader.getResourceAsStream("1.1", SdkConstants.SdkResource.FIELDS, "fields.json", SDK_ROOT_DIR); assertTrue(is.read() >= 0);