|
@@ -89,12 +89,12 @@ void TSplitIteratorTest::TestTail() {
|
|
|
}
|
|
|
|
|
|
void TSplitIteratorTest::TestScreenedDelimitersSplit() {
|
|
|
- {
|
|
|
+ {
|
|
|
const TString s = "77.88.58.91 - - [28/Aug/2008:00:08:07 +0400] \"GET /export/mordashka.tgz HTTP/1.1\" 304 - \"-\" \"libwww-perl/5.805\" \"news.yandex.ru,80\" \"-\" \"-\" 1219867687 \"0\" 3283 2";
|
|
|
- const TSplitDelimiters delims(" ");
|
|
|
- const TSplitDelimiters screens("\"[]");
|
|
|
- const TScreenedDelimitersSplit splitter(s, delims, screens);
|
|
|
- TScreenedDelimitersSplit::TIterator it = splitter.Iterator();
|
|
|
+ const TSplitDelimiters delims(" ");
|
|
|
+ const TSplitDelimiters screens("\"[]");
|
|
|
+ const TScreenedDelimitersSplit splitter(s, delims, screens);
|
|
|
+ TScreenedDelimitersSplit::TIterator it = splitter.Iterator();
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "77.88.58.91");
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "-");
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "-");
|
|
@@ -111,13 +111,13 @@ void TSplitIteratorTest::TestScreenedDelimitersSplit() {
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "\"0\"");
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "3283");
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "2");
|
|
|
- }
|
|
|
- {
|
|
|
+ }
|
|
|
+ {
|
|
|
const TString s = "77.88.58.91 - - [28/Aug/2008:00:08:07 +0400] \"GET /export/mordashka.tgz HTTP/1.1\" 304 - \"-\" \"libwww-perl/5.805\" \"news.yandex.ru,80\" \"-\" \"-\" 1219867687 \"0\" 3283 2";
|
|
|
- const TSplitDelimiters delims(" ");
|
|
|
- const TSplitDelimiters screens("\"[]");
|
|
|
- const TScreenedDelimitersSplit splitter(s.Data(), s.Size(), delims, screens);
|
|
|
- TScreenedDelimitersSplit::TIterator it = splitter.Iterator();
|
|
|
+ const TSplitDelimiters delims(" ");
|
|
|
+ const TSplitDelimiters screens("\"[]");
|
|
|
+ const TScreenedDelimitersSplit splitter(s.Data(), s.Size(), delims, screens);
|
|
|
+ TScreenedDelimitersSplit::TIterator it = splitter.Iterator();
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "77.88.58.91");
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "-");
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "-");
|
|
@@ -134,7 +134,7 @@ void TSplitIteratorTest::TestScreenedDelimitersSplit() {
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "\"0\"");
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "3283");
|
|
|
UNIT_ASSERT_EQUAL(it.NextString(), "2");
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
void TSplitIteratorTest::TestSubstringDelimiter() {
|