From 72f3dca451f4739e20be0b4b198813677339205c Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 17 Aug 2012 13:32:06 +0000 Subject: [PATCH] Modify Read/WritePixelTests to print one pixel failure for each test case rather than every pixel Review URL: http://codereview.appspot.com/6450154/ git-svn-id: http://skia.googlecode.com/svn/trunk@5147 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/ReadPixelsTest.cpp | 7 +++---- tests/WritePixelsTest.cpp | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index a0eee04e5a..67bb65929b 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -181,7 +181,6 @@ bool checkRead(skiatest::Reporter* reporter, if (!clippedSrcRect.intersect(srcRect)) { clippedSrcRect.setEmpty(); } - bool failed = false; SkAutoLockPixels alp(bitmap); intptr_t pixels = reinterpret_cast(bitmap.getPixels()); for (int by = 0; by < bh; ++by) { @@ -199,18 +198,18 @@ bool checkRead(skiatest::Reporter* reporter, bool check; REPORTER_ASSERT(reporter, check = checkPixel(pmPixel, canvasPixel, didPremul)); if (!check) { - failed = true; + return false; } } } else if (checkBitmapPixels) { REPORTER_ASSERT(reporter, getBitmapColor(bx, by, bw, bh) == pixel); if (getBitmapColor(bx, by, bw, bh) != pixel) { - failed = true; + return false; } } } } - return !failed; + return true; } enum BitmapInit { diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index 5911b800bc..d5ce8af573 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -241,7 +241,6 @@ bool checkWrite(skiatest::Reporter* reporter, intptr_t canvasPixels = reinterpret_cast(devBmp.getPixels()); size_t canvasRowBytes = devBmp.rowBytes(); SkIRect writeRect = SkIRect::MakeXYWH(writeX, writeY, bitmap.width(), bitmap.height()); - bool success = true; for (int cy = 0; cy < DEV_H; ++cy) { const SkPMColor* canvasRow = reinterpret_cast(canvasPixels); for (int cx = 0; cx < DEV_W; ++cx) { @@ -255,14 +254,14 @@ bool checkWrite(skiatest::Reporter* reporter, bool check; REPORTER_ASSERT(reporter, check = checkPixel(bmpPMColor, canvasPixel, mul)); if (!check) { - success = false; + return false; } } else { bool check; SkPMColor testColor = getCanvasColor(cx, cy); REPORTER_ASSERT(reporter, check = (canvasPixel == testColor)); if (!check) { - success = false; + return false; } } } @@ -272,14 +271,14 @@ bool checkWrite(skiatest::Reporter* reporter, bool check; REPORTER_ASSERT(reporter, check = (pad[px] == static_cast(DEV_PAD))); if (!check) { - success = false; + return false; } } } canvasPixels += canvasRowBytes; } - return success; + return true; } enum DevType {