livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-418: Fix streamtools test. 

When std::istream::good() returns false, presumably we can no longer rely on
get() returning valid data. Certain streamtools tests were assuming that get()
would return the empty string at EOF, but in fact it appears that it left the
previous buffer contents unmodified.
meow-7.2.2
Nat Goodspeed 2016-12-19 15:58:52 -05:00
parent fd79bb9c7d
commit 1df282efa1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/test/llstreamtools_tut.cpp
View File

@ -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()