diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-29 14:54:15 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-29 14:54:15 +0200 |
commit | 4b53d0d135fcacc5964b2720678642f182fd15d1 (patch) | |
tree | 020d6fa01180c42bde940787cffd9ae4892cf33b /configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java | |
parent | 9e02699ef6451d6e5f8a329fdc0001a1624d0787 (diff) |
Convert configgen to junit5
Diffstat (limited to 'configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java')
-rw-r--r-- | configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java index 9cf363376cc..53d02689fed 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java @@ -1,12 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.codegen; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * Tests parsing of a single line of a .def file @@ -16,13 +13,15 @@ import static org.junit.Assert.assertTrue; */ public class DefLineParsingTest { - @Test(expected = IllegalArgumentException.class) - public void require_that_null_default_is_not_allowed() { - new DefLine("s string default=null"); + @Test + void require_that_null_default_is_not_allowed() { + assertThrows(IllegalArgumentException.class, () -> { + new DefLine("s string default=null"); + }); } @Test - public void testParseIntArray() { + void testParseIntArray() { DefLine l = new DefLine("foo[] int"); assertEquals("foo[]", l.getName()); @@ -31,7 +30,7 @@ public class DefLineParsingTest { } @Test - public void testParseIntMap() { + void testParseIntMap() { DefLine l = new DefLine("foo{} int"); assertEquals("foo{}", l.getName()); @@ -40,7 +39,7 @@ public class DefLineParsingTest { } @Test - public void testParseInnerMap() { + void testParseInnerMap() { DefLine l = new DefLine("foo{}.i int"); assertEquals("foo{}.i", l.getName()); @@ -49,7 +48,7 @@ public class DefLineParsingTest { } @Test - public void testParseEnum() { + void testParseEnum() { DefLine l = new DefLine("idtype enum { us_east, US_WEST, EMEA } default=EMEA"); assertEquals("idtype", l.getName()); @@ -62,7 +61,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultReference() { + void testParseDefaultReference() { DefLine l = new DefLine("foo.bar reference default=\"value\""); assertEquals("foo.bar", l.getName()); @@ -72,7 +71,7 @@ public class DefLineParsingTest { } @Test - public void testParseNoDefaultReference() { + void testParseNoDefaultReference() { DefLine l = new DefLine("foo.bar reference"); assertEquals("foo.bar", l.getName()); @@ -85,7 +84,7 @@ public class DefLineParsingTest { * the future, so the test is included to verify that value and name can be retrieved. */ @Test - public void testParseDefaultFile() { + void testParseDefaultFile() { DefLine l = new DefLine("fileWithDef file default=\"value\""); assertEquals("fileWithDef", l.getName()); @@ -95,7 +94,7 @@ public class DefLineParsingTest { } @Test - public void testParseNoDefaultFile() { + void testParseNoDefaultFile() { DefLine l = new DefLine("fileVal file"); assertEquals("fileVal", l.getName()); @@ -104,7 +103,7 @@ public class DefLineParsingTest { } @Test - public void testParseUrls() { + void testParseUrls() { DefLine l = new DefLine("urlVal url"); assertEquals("urlVal", l.getName()); @@ -113,7 +112,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultUrls() { + void testParseDefaultUrls() { DefLine l = new DefLine("urlVal url default=\"http://docs.vespa.ai\""); assertEquals("urlVal", l.getName()); @@ -124,7 +123,7 @@ public class DefLineParsingTest { @Test - public void testParseDefaultInt() { + void testParseDefaultInt() { DefLine l = new DefLine("foo int default=1000"); assertEquals("foo", l.getName()); @@ -134,7 +133,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultLong() { + void testParseDefaultLong() { DefLine l = new DefLine("foo long default=9223372036854775807"); assertEquals("foo", l.getName()); @@ -144,7 +143,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultDouble() { + void testParseDefaultDouble() { DefLine l = new DefLine("foo double default=5.37"); assertEquals("foo", l.getName()); @@ -154,7 +153,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultFalseBoolean() { + void testParseDefaultFalseBoolean() { DefLine l = new DefLine("foo bool default=false"); assertEquals("foo", l.getName()); @@ -164,7 +163,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultTrueBoolean() { + void testParseDefaultTrueBoolean() { DefLine l = new DefLine("foo bool default=true"); assertEquals("foo", l.getName()); @@ -174,7 +173,7 @@ public class DefLineParsingTest { } @Test - public void testParseNoDefaultString() { + void testParseNoDefaultString() { DefLine l = new DefLine("foo.bar string"); assertEquals("foo.bar", l.getName()); @@ -183,7 +182,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultString() { + void testParseDefaultString() { DefLine l = new DefLine("foo.bar string default=\"value\""); assertEquals("foo.bar", l.getName()); @@ -193,7 +192,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultEmptyString() { + void testParseDefaultEmptyString() { DefLine l = new DefLine("foo.bar string default=\"\""); assertEquals("foo.bar", l.getName()); @@ -203,7 +202,7 @@ public class DefLineParsingTest { } @Test - public void testParseDefaultStringUnquoted() { + void testParseDefaultStringUnquoted() { DefLine l = new DefLine("foo.bar string default=value"); assertEquals("foo.bar", l.getName()); @@ -213,7 +212,7 @@ public class DefLineParsingTest { } @Test - public void testParseStringnullDefaultString() { + void testParseStringnullDefaultString() { DefLine l = new DefLine("foo.bar string default=\"null\""); assertEquals("foo.bar", l.getName()); @@ -223,7 +222,7 @@ public class DefLineParsingTest { } @Test - public void testRanges() { + void testRanges() { DefLine i = new DefLine("i int range=[0, 100]"); DefLine l = new DefLine("l long range=[-1e10, 0]"); DefLine d = new DefLine("d double range=[0, 1.0]"); @@ -233,7 +232,7 @@ public class DefLineParsingTest { } @Test - public void testRestartSpecification() { + void testRestartSpecification() { DefLine r0 = new DefLine("i int"); DefLine r1 = new DefLine("i int restart"); assertFalse(r0.getRestart()); |