[Scummvm-cvs-logs] SF.net SVN: scummvm:[48614] scummvm/trunk/test/common/tokenizer.h
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Apr 11 01:13:18 CEST 2010
Revision: 48614
http://scummvm.svn.sourceforge.net/scummvm/?rev=48614&view=rev
Author: fingolfin
Date: 2010-04-10 23:13:18 +0000 (Sat, 10 Apr 2010)
Log Message:
-----------
Slightly tweak Common::StringTokenizer tests, cleanup
Modified Paths:
--------------
scummvm/trunk/test/common/tokenizer.h
Modified: scummvm/trunk/test/common/tokenizer.h
===================================================================
--- scummvm/trunk/test/common/tokenizer.h 2010-04-10 23:12:22 UTC (rev 48613)
+++ scummvm/trunk/test/common/tokenizer.h 2010-04-10 23:13:18 UTC (rev 48614)
@@ -6,33 +6,32 @@
public:
void test_nextToken() {
- // test Common::StringTokenizer class
-
// test normal behavior
Common::StringTokenizer strTokenizer("Now, this is a test!", " ,!");
Common::String tokenArray[] = {"Now", "this", "is", "a", "test"};
- for (int i = 0; i < ARRAYSIZE(tokenArray); i++ ) {
+ for (int i = 0; i < ARRAYSIZE(tokenArray); ++i) {
// make sure nextToken works correctly
TS_ASSERT_EQUALS(tokenArray[i], strTokenizer.nextToken());
}
+ TS_ASSERT(strTokenizer.empty());
- // test edgy conditions:
+ // Test edge cases:
- // Empty String
+ // empty string
Common::StringTokenizer s1("");
TS_ASSERT_EQUALS("", s1.nextToken());
-
- // Empty Delimiter
+ TS_ASSERT(s1.empty());
+
+ // empty delimiter
Common::StringTokenizer s2("test String", "");
TS_ASSERT_EQUALS("test String", s2.nextToken());
-
- // String is the delimiter
+
+ // string is the delimiter
Common::StringTokenizer s3("abc", "abc");
TS_ASSERT_EQUALS("", s3.nextToken());
- // Tokenizer should be empty
TS_ASSERT(s3.empty());
-
+
// consecutive delimiters in the string
Common::StringTokenizer s4("strstr,after all!!", "str, !");
TS_ASSERT_EQUALS("af", s4.nextToken());
@@ -43,11 +42,11 @@
// test reset()
Common::String token1 = strTokenizer.nextToken(); //Just
+ TS_ASSERT_EQUALS(token1, "Just");
strTokenizer.reset();
Common::String token2 = strTokenizer.nextToken(); //Just
+ TS_ASSERT_EQUALS(token2, "Just");
- TS_ASSERT_EQUALS(token1,token2);
-
// test empty()
TS_ASSERT(!strTokenizer.empty());
strTokenizer.nextToken(); //another
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list