aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-08-11 21:35:52 +0200
committerMax Kellermann <max@duempel.org>2015-08-11 22:43:10 +0200
commitcbdc3194cc20aa5abcce8b53c44d46a96002ad3a (patch)
tree04164bedb2ca82200ebcb4f4a01f658a4f79b016 /test
parent993df0fd289d4426c633fd6e6d12bffe6061599d (diff)
downloadmpd-cbdc3194cc20aa5abcce8b53c44d46a96002ad3a.tar.gz
mpd-cbdc3194cc20aa5abcce8b53c44d46a96002ad3a.tar.xz
mpd-cbdc3194cc20aa5abcce8b53c44d46a96002ad3a.zip
protocol/ArgParser: add struct RangeArg
Diffstat (limited to 'test')
-rw-r--r--test/test_protocol.cxx23
1 files changed, 12 insertions, 11 deletions
diff --git a/test/test_protocol.cxx b/test/test_protocol.cxx
index fb35cbc66..d5b60323a 100644
--- a/test/test_protocol.cxx
+++ b/test/test_protocol.cxx
@@ -32,21 +32,22 @@ void
ArgParserTest::TestRange()
{
Client &client = *(Client *)nullptr;
- unsigned a, b;
- CPPUNIT_ASSERT(check_range(client, &a, &b, "1"));
- CPPUNIT_ASSERT_EQUAL(1u, a);
- CPPUNIT_ASSERT_EQUAL(2u, b);
+ RangeArg range;
- CPPUNIT_ASSERT(check_range(client, &a, &b, "1:5"));
- CPPUNIT_ASSERT_EQUAL(1u, a);
- CPPUNIT_ASSERT_EQUAL(5u, b);
+ CPPUNIT_ASSERT(ParseCommandArg(client, range, "1"));
+ CPPUNIT_ASSERT_EQUAL(1u, range.start);
+ CPPUNIT_ASSERT_EQUAL(2u, range.end);
- CPPUNIT_ASSERT(check_range(client, &a, &b, "1:"));
- CPPUNIT_ASSERT_EQUAL(1u, a);
- CPPUNIT_ASSERT(b >= 999999u);
+ CPPUNIT_ASSERT(ParseCommandArg(client, range, "1:5"));
+ CPPUNIT_ASSERT_EQUAL(1u, range.start);
+ CPPUNIT_ASSERT_EQUAL(5u, range.end);
- CPPUNIT_ASSERT(!check_range(client, &a, &b, "-2"));
+ CPPUNIT_ASSERT(ParseCommandArg(client, range, "1:"));
+ CPPUNIT_ASSERT_EQUAL(1u, range.start);
+ CPPUNIT_ASSERT(range.end >= 999999u);
+
+ CPPUNIT_ASSERT(!ParseCommandArg(client, range, "-2"));
CPPUNIT_ASSERT_EQUAL(ACK_ERROR_ARG, last_error);
}