summaryrefslogtreecommitdiff
path: root/indra/test/llstreamtools_tut.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-01-17 03:20:12 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-01-17 03:20:12 +0200
commit57a99273ed023bd71c54399969e66ffc23eebc57 (patch)
treed8569d41eaf78348e458f550f382375cac47924d /indra/test/llstreamtools_tut.cpp
parent6ac2b2bb4f569b6663607894034b4ec64804e905 (diff)
parent7acbd8ed8d73c507675d45360df07d232c431a8b (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/test/llstreamtools_tut.cpp')
-rw-r--r--indra/test/llstreamtools_tut.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp
index 0f6436f0f4..2f027b688f 100644
--- a/indra/test/llstreamtools_tut.cpp
+++ b/indra/test/llstreamtools_tut.cpp
@@ -149,10 +149,9 @@ namespace tut
is.clear();
is.str(str = "# \r\n # SecondLife is a 3D World. ##");
- skip_comments_and_emptyspace(is);
- is.get(arr, 255, '\0');
- expected_result = "";
- ensure_equals("skip_comments_and_emptyspace: skip comment - 2", arr, expected_result);
+ ensure("should not be good()", ! skip_comments_and_emptyspace(is));
+ ensure("should be at eof()", is.eof());
+ // don't get(): given bad state, we can't rely on results
is.clear();
is.str(str = " \r\n SecondLife is a 3D World. ##");
@@ -164,14 +163,12 @@ namespace tut
is.clear();
is.str(str = "");
ret = skip_comments_and_emptyspace(is);
- is.get(arr, 255, '\0');
- ensure("skip_comments_and_emptyspace: empty string", ret == false);
+ ensure("skip_comments_and_emptyspace: empty string", ! ret);
is.clear();
is.str(str = " \r\n \t # SecondLife is a 3D World");
ret = skip_comments_and_emptyspace(is);
- is.get(arr, 255, '\0');
- ensure("skip_comments_and_emptyspace: space newline comment empty", ret == false);
+ ensure("skip_comments_and_emptyspace: space newline comment empty", ! ret);
}
//testcases for skip_line()