From ff952fc053b10b8e2dd2f9295a59b97238dc7095 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 16 Nov 2018 12:33:38 +0100 Subject: [PATCH] Fixed VersionHelperTest --- .../contributions/VersionHelperTest.java | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/app/test/cc/arduino/contributions/VersionHelperTest.java b/app/test/cc/arduino/contributions/VersionHelperTest.java index fecbcb8a8..de7463da1 100644 --- a/app/test/cc/arduino/contributions/VersionHelperTest.java +++ b/app/test/cc/arduino/contributions/VersionHelperTest.java @@ -30,28 +30,38 @@ package cc.arduino.contributions; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.Optional; import org.junit.Test; +import com.github.zafarkhaja.semver.Version; + public class VersionHelperTest { + public void assertOptionalEquals(String expected, Optional value) { + assertTrue(value.isPresent()); + assertEquals(expected, value.get().toString()); + } + @Test public void testVersions() throws Exception { - assertEquals("1.0.0", VersionHelper.valueOf("1.0.0").toString()); - assertEquals("1.0.0", VersionHelper.valueOf("1.0").toString()); - assertEquals("1.0.0", VersionHelper.valueOf("1").toString()); - assertEquals("1.0.0-abc", VersionHelper.valueOf("1.0.0-abc").toString()); - assertEquals("1.0.0-abc", VersionHelper.valueOf("1.0-abc").toString()); - assertEquals("1.0.0-abc", VersionHelper.valueOf("1-abc").toString()); - assertEquals("1.0.0+abc", VersionHelper.valueOf("1.0.0+abc").toString()); - assertEquals("1.0.0+abc", VersionHelper.valueOf("1.0+abc").toString()); - assertEquals("1.0.0+abc", VersionHelper.valueOf("1+abc").toString()); - assertEquals("1.0.0-def+abc", VersionHelper.valueOf("1.0.0-def+abc").toString()); - assertEquals("1.0.0-def+abc", VersionHelper.valueOf("1.0-def+abc").toString()); - assertEquals("1.0.0-def+abc", VersionHelper.valueOf("1-def+abc").toString()); - assertEquals("1.0.0+def-abc", VersionHelper.valueOf("1.0.0+def-abc").toString()); - assertEquals("1.0.0+def-abc", VersionHelper.valueOf("1.0+def-abc").toString()); - assertEquals("1.0.0+def-abc", VersionHelper.valueOf("1+def-abc").toString()); + assertOptionalEquals("1.0.0", VersionHelper.valueOf("1.0.0")); + assertOptionalEquals("1.0.0", VersionHelper.valueOf("1.0")); + assertOptionalEquals("1.0.0", VersionHelper.valueOf("1")); + assertOptionalEquals("1.0.0-abc", VersionHelper.valueOf("1.0.0-abc")); + assertOptionalEquals("1.0.0-abc", VersionHelper.valueOf("1.0-abc")); + assertOptionalEquals("1.0.0-abc", VersionHelper.valueOf("1-abc")); + assertOptionalEquals("1.0.0+abc", VersionHelper.valueOf("1.0.0+abc")); + assertOptionalEquals("1.0.0+abc", VersionHelper.valueOf("1.0+abc")); + assertOptionalEquals("1.0.0+abc", VersionHelper.valueOf("1+abc")); + assertOptionalEquals("1.0.0-def+abc", VersionHelper.valueOf("1.0.0-def+abc")); + assertOptionalEquals("1.0.0-def+abc", VersionHelper.valueOf("1.0-def+abc")); + assertOptionalEquals("1.0.0-def+abc", VersionHelper.valueOf("1-def+abc")); + assertOptionalEquals("1.0.0+def-abc", VersionHelper.valueOf("1.0.0+def-abc")); + assertOptionalEquals("1.0.0+def-abc", VersionHelper.valueOf("1.0+def-abc")); + assertOptionalEquals("1.0.0+def-abc", VersionHelper.valueOf("1+def-abc")); } }