diff options
Diffstat (limited to 'component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java')
-rw-r--r-- | component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java b/component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java index c4f0e0f7439..45c94591b11 100644 --- a/component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java +++ b/component/src/test/java/com/yahoo/component/VersionCompatibilityTest.java @@ -1,14 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.component; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Locale; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author jonmv @@ -16,7 +16,7 @@ import static org.junit.Assert.fail; public class VersionCompatibilityTest { @Test - public void testNoIncompatibilities() { + void testNoIncompatibilities() { List<String> versions = List.of(); VersionCompatibility compatibility = VersionCompatibility.fromVersionList(versions); assertTrue(compatibility.accept(new Version(0, 0, 0), new Version(0, 0, 0))); @@ -26,36 +26,36 @@ public class VersionCompatibilityTest { } @Test - public void testValidIncompatibilities() { + void testValidIncompatibilities() { List<String> versions = List.of("1.2.*", "2", "3.*", "4.0.0", "4.0.1", "4.0.3", "4.1.0", "5"); VersionCompatibility compatibility = VersionCompatibility.fromVersionList(versions); - assertTrue (compatibility.accept(new Version(0, 0, 0), new Version(0, 0, 0))); - assertTrue (compatibility.accept(new Version(0, 0, 0), new Version(1, 1, 1))); + assertTrue(compatibility.accept(new Version(0, 0, 0), new Version(0, 0, 0))); + assertTrue(compatibility.accept(new Version(0, 0, 0), new Version(1, 1, 1))); assertFalse(compatibility.accept(new Version(0, 0, 0), new Version(1, 2, 3))); assertFalse(compatibility.accept(new Version(1, 1, 0), new Version(1, 2, 0))); assertFalse(compatibility.accept(new Version(1, 2, 1), new Version(1, 2, 0))); assertFalse(compatibility.accept(new Version(1, 1, 0), new Version(1, 3, 0))); - assertTrue (compatibility.accept(new Version(1, 2, 3), new Version(1, 2, 3))); - assertTrue (compatibility.accept(new Version(1, 3, 0), new Version(1, 9, 9))); + assertTrue(compatibility.accept(new Version(1, 2, 3), new Version(1, 2, 3))); + assertTrue(compatibility.accept(new Version(1, 3, 0), new Version(1, 9, 9))); assertFalse(compatibility.accept(new Version(1, 3, 0), new Version(2, 0, 0))); - assertTrue (compatibility.accept(new Version(2, 0, 0), new Version(2, 2, 2))); + assertTrue(compatibility.accept(new Version(2, 0, 0), new Version(2, 2, 2))); assertFalse(compatibility.accept(new Version(2, 0, 0), new Version(3, 0, 0))); - assertTrue (compatibility.accept(new Version(3, 0, 0), new Version(3, 0, 0))); + assertTrue(compatibility.accept(new Version(3, 0, 0), new Version(3, 0, 0))); assertFalse(compatibility.accept(new Version(3, 0, 0), new Version(3, 1, 0))); - assertTrue (compatibility.accept(new Version(3, 0, 0), new Version(3, 0, 1))); + assertTrue(compatibility.accept(new Version(3, 0, 0), new Version(3, 0, 1))); assertFalse(compatibility.accept(new Version(3, 0, 0), new Version(4, 0, 0))); assertFalse(compatibility.accept(new Version(4, 0, 0), new Version(4, 0, 1))); - assertTrue (compatibility.accept(new Version(4, 0, 1), new Version(4, 0, 2))); + assertTrue(compatibility.accept(new Version(4, 0, 1), new Version(4, 0, 2))); assertFalse(compatibility.accept(new Version(4, 0, 2), new Version(4, 0, 3))); assertFalse(compatibility.accept(new Version(4, 0, 3), new Version(4, 1, 0))); assertFalse(compatibility.accept(new Version(4, 1, 0), new Version(5, 0, 0))); - assertTrue (compatibility.accept(new Version(5, 0, 0), new Version(6, 0, 0))); + assertTrue(compatibility.accept(new Version(5, 0, 0), new Version(6, 0, 0))); assertFalse(compatibility.accept(new Version(0, 0, 0), new Version(2, 0, 0))); assertFalse(compatibility.accept(new Version(0, 0, 0), new Version(6, 0, 0))); } @Test - public void testIllegalIncompatibilities() { + void testIllegalIncompatibilities() { assertThrows(List.of("1", "*"), IllegalArgumentException.class, "may not have siblings"); assertThrows(List.of("*", "*.*"), IllegalArgumentException.class, "may not have siblings"); assertThrows(List.of("*", "*"), IllegalArgumentException.class, "may not have siblings"); |