diff --git a/src/main/java/com/moandjiezana/toml/TomlParser.java b/src/main/java/com/moandjiezana/toml/TomlParser.java index 5b1f459..0a27744 100644 --- a/src/main/java/com/moandjiezana/toml/TomlParser.java +++ b/src/main/java/com/moandjiezana/toml/TomlParser.java @@ -114,7 +114,7 @@ class TomlParser extends BaseParser { } Rule AnyCharacter() { - return Sequence(ANY, pushCharacter(match())); + return Sequence(TestNot(NewLine()), ANY, pushCharacter(match())); } @SuppressNode diff --git a/src/test/java/com/moandjiezana/toml/EmptyStringTest.java b/src/test/java/com/moandjiezana/toml/EmptyStringTest.java deleted file mode 100644 index 83bd823..0000000 --- a/src/test/java/com/moandjiezana/toml/EmptyStringTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.moandjiezana.toml; - -import static org.junit.Assert.assertEquals; -import org.junit.Test; - -import java.io.File; - -public class EmptyStringTest { - @Test - public void should_parse_multiple_sections() { - Toml toml = new Toml().parse("str1 = \"\"\nstr2 = \"Hello, world!\""); - assertEquals("", toml.getString("str1")); - assertEquals("Hello, world!", toml.getString("str2")); - } -} diff --git a/src/test/java/com/moandjiezana/toml/TomlTest.java b/src/test/java/com/moandjiezana/toml/TomlTest.java index 55f0e0b..170b0ef 100644 --- a/src/test/java/com/moandjiezana/toml/TomlTest.java +++ b/src/test/java/com/moandjiezana/toml/TomlTest.java @@ -25,6 +25,18 @@ public class TomlTest { assertEquals("a", toml.getString("a")); } + @Test + public void should_get_empty_string() { + Toml toml = new Toml().parse("a = \"\""); + assertEquals("", toml.getString("a")); + } + + @Test + public void should_get_empty_string_with_trailing_new_line() { + Toml toml = new Toml().parse("a = \"\"\n"); + assertEquals("", toml.getString("a")); + } + @Test public void should_get_number() throws Exception { Toml toml = new Toml().parse("b = 1001"); @@ -226,7 +238,7 @@ public class TomlTest { @Test public void should_support_unicode_characters_in_strings() throws Exception { - Toml toml = new Toml().parse("key=\"\\u00B1\""); + Toml toml = new Toml().parse("key=\"\\u00B1\"\n"); assertEquals("±", toml.getString("key")); }