From 40e5adfd2ef9527b5fcdc61ac98aa5257998b07a Mon Sep 17 00:00:00 2001 From: "moandji.ezana" Date: Sun, 6 Apr 2014 21:11:52 +0200 Subject: [PATCH] Test uses Toml object --- .../com/moandjiezana/toml/RealWorldTest.java | 58 +++++++------------ 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/src/test/java/com/moandjiezana/toml/RealWorldTest.java b/src/test/java/com/moandjiezana/toml/RealWorldTest.java index bc8c6a9..086c519 100644 --- a/src/test/java/com/moandjiezana/toml/RealWorldTest.java +++ b/src/test/java/com/moandjiezana/toml/RealWorldTest.java @@ -8,58 +8,49 @@ import java.io.File; import java.util.Arrays; import java.util.Calendar; import java.util.Map; -import java.util.Scanner; import java.util.TimeZone; import org.junit.Test; -import org.parboiled.Parboiled; -import org.parboiled.parserunners.RecoveringParseRunner; -import org.parboiled.support.ParsingResult; public class RealWorldTest { @SuppressWarnings("unchecked") @Test public void should_parse_example() throws Exception { - TomlParser parser = Parboiled.createParser(TomlParser.class); - - String toml = new Scanner(new File(getClass().getResource("example.toml").getFile())).useDelimiter("\\Z").next(); - ParsingResult result = new RecoveringParseRunner(parser.Toml()).run(toml); - - Map root = (Map) result.valueStack.peek(result.valueStack.size() - 2); + Toml toml = new Toml().parse(new File(getClass().getResource("example.toml").getFile())); // printMap(root); - assertEquals("TOML Example", root.get("title")); + assertEquals("TOML Example", toml.getString("title")); - Map owner = get(root, "owner"); - assertEquals("Tom Preston-Werner", owner.get("name")); - assertEquals("GitHub", owner.get("organization")); - assertEquals("GitHub Cofounder & CEO\nLikes tater tots and beer.", owner.get("bio")); + Toml owner = toml.getKeyGroup("owner"); + assertEquals("Tom Preston-Werner", owner.getString("name")); + assertEquals("GitHub", owner.getString("organization")); + assertEquals("GitHub Cofounder & CEO\nLikes tater tots and beer.", owner.getString("bio")); Calendar dob = Calendar.getInstance(); dob.set(1979, Calendar.MAY, 27, 7, 32, 0); dob.set(Calendar.MILLISECOND, 0); dob.setTimeZone(TimeZone.getTimeZone("UTC")); - assertEquals(dob.getTime(), owner.get("dob")); + assertEquals(dob.getTime(), owner.getDate("dob")); - Map database = get(root, "database"); - assertEquals("192.168.1.1", database.get("server")); - assertEquals(5000L, database.get("connection_max")); - assertTrue((Boolean) database.get("enabled")); - assertEquals(Arrays.asList(8001L, 8001L, 8002L), database.get("ports")); + Toml database = toml.getKeyGroup("database"); + assertEquals("192.168.1.1", database.getString("server")); + assertEquals(5000L, database.getLong("connection_max").longValue()); + assertTrue(database.getBoolean("enabled")); + assertEquals(Arrays.asList(8001L, 8001L, 8002L), database.getList("ports", Long.class)); - Map servers = get(root, "servers"); - Map alphaServers = get(servers, "alpha"); - assertEquals("10.0.0.1", alphaServers.get("ip")); - assertEquals("eqdc10", alphaServers.get("dc")); - Map betaServers = get(servers, "beta"); - assertEquals("10.0.0.2", betaServers.get("ip")); - assertEquals("eqdc10", betaServers.get("dc")); + Toml servers = toml.getKeyGroup("servers"); + Toml alphaServers = servers.getKeyGroup("alpha"); + assertEquals("10.0.0.1", alphaServers.getString("ip")); + assertEquals("eqdc10", alphaServers.getString("dc")); + Toml betaServers = servers.getKeyGroup("beta"); + assertEquals("10.0.0.2", betaServers.getString("ip")); + assertEquals("eqdc10", betaServers.getString("dc")); - Map clients = get(root, "clients"); - assertEquals(asList(asList("gamma", "delta"), asList(1L, 2L)), clients.get("data")); - assertEquals(asList("alpha", "omega"), clients.get("hosts")); + Toml clients = toml.getKeyGroup("clients"); + assertEquals(asList(asList("gamma", "delta"), asList(1L, 2L)), clients.getList("data", String.class)); + assertEquals(asList("alpha", "omega"), clients.getList("hosts", String.class)); } @Test @@ -88,9 +79,4 @@ public class RealWorldTest { } } } - - @SuppressWarnings("unchecked") - private Map get(Map map, String key) { - return (Map) map.get(key); - } }