diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
| commit | be69197e0d3af1832a22c6d2475e3e1178a88a31 (patch) | |
| tree | de9abd1dfc12d6da7e11e385c7dbbb53e631353a /indra/test | |
| parent | 04c7a7a64ac40f471dcec0019a2c7235ad22bd3d (diff) | |
| parent | e9f5ed6591fb5d2513b5065622b9e7dac6737913 (diff) | |
merge changes from project trunk
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/llstreamtools_tut.cpp | 13 |
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() |