AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix StringTest for VS2015

Browse Source 
TBR=reed@google.com

Review URL: https://codereview.chromium.org/1280853002
This commit is contained in:
bsalomon 2015-08-06 17:56:13 -07:00 committed by Commit bot
parent ebc1c10fe1
commit 9bca52629c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/StringTest.cpp
View File

@ -156,7 +156,7 @@ DEF_TEST(String, reporter) {
{ SK_Scalar1, "1" }, { SK_Scalar1, "1" },
{ -SK_Scalar1, "-1" }, { -SK_Scalar1, "-1" },
{ SK_Scalar1/2, "0.5" }, { SK_Scalar1/2, "0.5" },
#ifdef SK_BUILD_FOR_WIN #if defined(SK_BUILD_FOR_WIN) && (_MSC_VER < 1900)
{ 3.4028234e38f, "3.4028235e+038" }, { 3.4028234e38f, "3.4028235e+038" },
{ -3.4028234e38f, "-3.4028235e+038" }, { -3.4028234e38f, "-3.4028235e+038" },
#else #else
@ -168,8 +168,9 @@ DEF_TEST(String, reporter) {
a.reset(); a.reset();
a.appendScalar(gRec[i].fValue); a.appendScalar(gRec[i].fValue);
REPORTER_ASSERT(reporter, a.size() <= SkStrAppendScalar_MaxSize); REPORTER_ASSERT(reporter, a.size() <= SkStrAppendScalar_MaxSize);
// SkDebugf(" received <%s> expected <%s>\n", a.c_str(), gRec[i].fString); if (!a.equals(gRec[i].fString)) {
REPORTER_ASSERT(reporter, a.equals(gRec[i].fString)); ERRORF(reporter, "received <%s> expected <%s>\n", a.c_str(), gRec[i].fString);
}
} }
REPORTER_ASSERT(reporter, SkStringPrintf("%i", 0).equals("0")); REPORTER_ASSERT(reporter, SkStringPrintf("%i", 0).equals("0"));