util/SplitString: new utility class

Replaces GLib's g_strsplit().
This commit is contained in:
Max Kellermann
2014-12-03 21:39:45 +01:00
parent c1c0fc79bc
commit e69bef3ce3
8 changed files with 185 additions and 34 deletions

65
test/SplitStringTest.hxx Normal file
View File

@@ -0,0 +1,65 @@
/*
* Unit tests for src/util/
*/
#include "check.h"
#include "util/SplitString.hxx"
#include "util/Macros.hxx"
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <string.h>
class SplitStringTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(SplitStringTest);
CPPUNIT_TEST(TestBasic);
CPPUNIT_TEST(TestStrip);
CPPUNIT_TEST(TestNoStrip);
CPPUNIT_TEST(TestEmpty);
CPPUNIT_TEST_SUITE_END();
public:
void TestBasic() {
constexpr char input[] = "foo.bar";
const char *const output[] = { "foo", "bar" };
size_t i = 0;
for (auto p : SplitString(input, '.')) {
CPPUNIT_ASSERT(i < ARRAY_SIZE(output));
CPPUNIT_ASSERT(p == output[i]);
++i;
}
CPPUNIT_ASSERT_EQUAL(ARRAY_SIZE(output), i);
}
void TestStrip() {
constexpr char input[] = " foo\t.\r\nbar\r\n2";
const char *const output[] = { "foo", "bar\r\n2" };
size_t i = 0;
for (auto p : SplitString(input, '.')) {
CPPUNIT_ASSERT(i < ARRAY_SIZE(output));
CPPUNIT_ASSERT(p == output[i]);
++i;
}
CPPUNIT_ASSERT_EQUAL(ARRAY_SIZE(output), i);
}
void TestNoStrip() {
constexpr char input[] = " foo\t.\r\nbar\r\n2";
const char *const output[] = { " foo\t", "\r\nbar\r\n2" };
size_t i = 0;
for (auto p : SplitString(input, '.', false)) {
CPPUNIT_ASSERT(i < ARRAY_SIZE(output));
CPPUNIT_ASSERT(p == output[i]);
++i;
}
CPPUNIT_ASSERT_EQUAL(ARRAY_SIZE(output), i);
}
void TestEmpty() {
CPPUNIT_ASSERT(SplitString("", '.').empty());
}
};

View File

@@ -4,6 +4,7 @@
#include "config.h"
#include "DivideStringTest.hxx"
#include "SplitStringTest.hxx"
#include "UriUtilTest.hxx"
#include "TestCircularBuffer.hxx"
@@ -15,6 +16,7 @@
#include <stdlib.h>
CPPUNIT_TEST_SUITE_REGISTRATION(DivideStringTest);
CPPUNIT_TEST_SUITE_REGISTRATION(SplitStringTest);
CPPUNIT_TEST_SUITE_REGISTRATION(UriUtilTest);
CPPUNIT_TEST_SUITE_REGISTRATION(TestCircularBuffer);