diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2015-11-21 21:05:30 -0500 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2015-11-21 21:05:30 -0500 |
| commit | 29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d (patch) | |
| tree | b13568df19333f7b21dedf739677c67b6c0bb904 /src/ast/npc_test.cpp | |
| parent | f7c99c70de0f5bd77939966d085ad0da61bfd739 (diff) | |
| parent | f6b949498ddb7a3738405f76cb300134d2653247 (diff) | |
| download | tmwa-29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d.tar.gz tmwa-29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d.tar.bz2 tmwa-29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d.tar.xz tmwa-29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d.zip | |
Merge pull request #182 from mekolat/warps
do not require a name for warps
Diffstat (limited to 'src/ast/npc_test.cpp')
| -rw-r--r-- | src/ast/npc_test.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/ast/npc_test.cpp b/src/ast/npc_test.cpp index dadeba7..2ffff5e 100644 --- a/src/ast/npc_test.cpp +++ b/src/ast/npc_test.cpp @@ -89,9 +89,9 @@ namespace npc { // 1 2 3 4 //234567890123456789012345678901234567890123456789 - "map.gat,1,2|warp|To Other Map|3,4,other.gat,7,8"_s, - "map.gat,1,2|warp|To Other Map|3,4,other.gat,7,8\n"_s, - "map.gat,1,2|warp|To Other Map|3,4,other.gat,7,8{"_s, + "map.gat,1,2|warp|3,4,other.gat,7,8"_s, + "map.gat,1,2|warp|3,4,other.gat,7,8\n"_s, + "map.gat,1,2|warp|3,4,other.gat,7,8{"_s, // no optional fields in warp }; for (auto input : inputs) @@ -100,7 +100,7 @@ namespace npc auto res = TRY_UNWRAP(parse_top(lr), FAIL()); EXPECT_TRUE(res.get_success().is_some()); auto top = TRY_UNWRAP(std::move(res.get_success()), FAIL()); - EXPECT_SPAN(top.span, 1,1, 1,47); + EXPECT_SPAN(top.span, 1,1, 1,34); auto p = top.get_if<Warp>(); EXPECT_TRUE(p); if (p) @@ -112,17 +112,15 @@ namespace npc EXPECT_SPAN(p->y.span, 1,11, 1,11); EXPECT_EQ(p->y.data, 2); EXPECT_SPAN(p->key_span, 1,13, 1,16); - EXPECT_SPAN(p->name.span, 1,18, 1,29); - EXPECT_EQ(p->name.data, stringish<NpcName>("To Other Map"_s)); - EXPECT_SPAN(p->xs.span, 1,31, 1,31); + EXPECT_SPAN(p->xs.span, 1,18, 1,18); EXPECT_EQ(p->xs.data, 5); - EXPECT_SPAN(p->ys.span, 1,33, 1,33); + EXPECT_SPAN(p->ys.span, 1,20, 1,20); EXPECT_EQ(p->ys.data, 6); - EXPECT_SPAN(p->to_m.span, 1,35, 1,43); + EXPECT_SPAN(p->to_m.span, 1,22, 1,30); EXPECT_EQ(p->to_m.data, stringish<MapName>("other"_s)); - EXPECT_SPAN(p->to_x.span, 1,45, 1,45); + EXPECT_SPAN(p->to_x.span, 1,32, 1,32); EXPECT_EQ(p->to_x.data, 7); - EXPECT_SPAN(p->to_y.span, 1,47, 1,47); + EXPECT_SPAN(p->to_y.span, 1,34, 1,34); EXPECT_EQ(p->to_y.data, 8); } } |