diff options
author | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 21:27:31 +0000 |
---|---|---|
committer | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 21:27:31 +0000 |
commit | ce8b30ebac630542e8f2f56c9f81dc0116c9d534 (patch) | |
tree | 9ad6d8eaf7aa6164ac3abe75ffb1653cbbccd89f /ppapi | |
parent | c9253c2d2c0cc60f65d5a4728c9cb6a352c09131 (diff) | |
download | chromium_src-ce8b30ebac630542e8f2f56c9f81dc0116c9d534.zip chromium_src-ce8b30ebac630542e8f2f56c9f81dc0116c9d534.tar.gz chromium_src-ce8b30ebac630542e8f2f56c9f81dc0116c9d534.tar.bz2 |
Use PASS() everywhere in ppapi/tests.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4182010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/tests/test_buffer.cc | 6 | ||||
-rw-r--r-- | ppapi/tests/test_char_set.cc | 4 | ||||
-rw-r--r-- | ppapi/tests/test_file_io.cc | 6 | ||||
-rw-r--r-- | ppapi/tests/test_file_ref.cc | 16 | ||||
-rw-r--r-- | ppapi/tests/test_graphics_2d.cc | 18 | ||||
-rw-r--r-- | ppapi/tests/test_image_data.cc | 10 | ||||
-rw-r--r-- | ppapi/tests/test_instance_deprecated.cc | 2 | ||||
-rw-r--r-- | ppapi/tests/test_paint_aggregator.cc | 40 | ||||
-rw-r--r-- | ppapi/tests/test_transport.cc | 2 | ||||
-rw-r--r-- | ppapi/tests/test_url_loader.cc | 4 | ||||
-rw-r--r-- | ppapi/tests/test_url_util.cc | 10 | ||||
-rw-r--r-- | ppapi/tests/test_var_deprecated.cc | 16 |
12 files changed, 67 insertions, 67 deletions
diff --git a/ppapi/tests/test_buffer.cc b/ppapi/tests/test_buffer.cc index 9f1dc4b..3cb8030 100644 --- a/ppapi/tests/test_buffer.cc +++ b/ppapi/tests/test_buffer.cc @@ -30,7 +30,7 @@ std::string TestBuffer::TestInvalidSize() { if (!zero_size.is_null()) return "Zero size accepted"; - return ""; + PASS(); } std::string TestBuffer::TestInitToZero() { @@ -48,7 +48,7 @@ std::string TestBuffer::TestInitToZero() { return "Buffer isn't entirely zero"; } - return ""; + PASS(); } std::string TestBuffer::TestIsBuffer() { @@ -72,6 +72,6 @@ std::string TestBuffer::TestIsBuffer() { if (!buffer_interface_->IsBuffer(buffer.pp_resource())) return "Buffer should be identified as a buffer"; - return ""; + PASS(); } diff --git a/ppapi/tests/test_char_set.cc b/ppapi/tests/test_char_set.cc index e97804a..c760a01 100644 --- a/ppapi/tests/test_char_set.cc +++ b/ppapi/tests/test_char_set.cc @@ -96,7 +96,7 @@ std::string TestCharSet::TestUTF16ToCharSet() { ASSERT_TRUE(!utf8result); ASSERT_TRUE(utf8result_len == 0); - return std::string(); + PASS(); } std::string TestCharSet::TestCharSetToUTF16() { @@ -148,7 +148,7 @@ std::string TestCharSet::TestCharSetToUTF16() { ASSERT_TRUE(!utf16result); ASSERT_TRUE(utf16result_len == 0); - return std::string(); + PASS(); } std::vector<uint16_t> TestCharSet::UTF8ToUTF16(const std::string& utf8) { diff --git a/ppapi/tests/test_file_io.cc b/ppapi/tests/test_file_io.cc index 5ba571a..591d656 100644 --- a/ppapi/tests/test_file_io.cc +++ b/ppapi/tests/test_file_io.cc @@ -113,7 +113,7 @@ std::string TestFileIO::TestOpen() { if (rv != PP_ERROR_FILENOTFOUND) return ReportError("FileIO::Open", rv); - return ""; + PASS(); } std::string TestFileIO::TestReadWriteSetLength() { @@ -227,7 +227,7 @@ std::string TestFileIO::TestReadWriteSetLength() { return ReportMismatch("FileIO::Read", read_buffer, std::string("testtest\0\0\0\0", 12)); - return ""; + PASS(); } std::string TestFileIO::TestTouchQuery() { @@ -281,5 +281,5 @@ std::string TestFileIO::TestTouchQuery() { (info.last_modified_time != last_modified_time)) return "FileSystem::Query() has returned bad data."; - return ""; + PASS(); } diff --git a/ppapi/tests/test_file_ref.cc b/ppapi/tests/test_file_ref.cc index a81b8ed2..06cc9ec 100644 --- a/ppapi/tests/test_file_ref.cc +++ b/ppapi/tests/test_file_ref.cc @@ -92,7 +92,7 @@ std::string TestFileRef::TestGetFileSystemType() { if (file_ref_ext.GetFileSystemType() != PP_FILESYSTEMTYPE_EXTERNAL) return "file_ref_ext expected to be external."; - return ""; + PASS(); } std::string TestFileRef::TestGetName() { @@ -142,7 +142,7 @@ std::string TestFileRef::TestGetName() { if (name == "") return ReportMismatch("FileRef::GetName", name, "<a temp file>"); - return ""; + PASS(); } std::string TestFileRef::TestGetPath() { @@ -185,7 +185,7 @@ std::string TestFileRef::TestGetPath() { if (!file_ref_ext.GetPath().is_undefined()) return "The path of an external FileRef should be void."; - return ""; + PASS(); } std::string TestFileRef::TestGetParent() { @@ -240,7 +240,7 @@ std::string TestFileRef::TestGetParent() { if (!file_ref_ext.GetParent().is_null()) return "The parent of an external FileRef should be null."; - return ""; + PASS(); } std::string TestFileRef::TestMakeDirectory() { @@ -324,7 +324,7 @@ std::string TestFileRef::TestMakeDirectory() { "should have failed."; } - return ""; + PASS(); } std::string TestFileRef::TestQueryAndTouchFile() { @@ -408,7 +408,7 @@ std::string TestFileRef::TestQueryAndTouchFile() { return ReportError("FileSystem::Query", rv); } - return ""; + PASS(); } std::string TestFileRef::TestDeleteFileAndDirectory() { @@ -492,7 +492,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() { return ReportError("FileSystem::Delete", rv); } - return ""; + PASS(); } std::string TestFileRef::TestRenameFileAndDirectory() { @@ -574,5 +574,5 @@ std::string TestFileRef::TestRenameFileAndDirectory() { return ReportError("FileSystem::Rename", rv); } - return ""; + PASS(); } diff --git a/ppapi/tests/test_graphics_2d.cc b/ppapi/tests/test_graphics_2d.cc index d57ce48..b673b81 100644 --- a/ppapi/tests/test_graphics_2d.cc +++ b/ppapi/tests/test_graphics_2d.cc @@ -234,7 +234,7 @@ std::string TestGraphics2D::TestInvalidResource() { &zero_zero)) return "ReadImageData succeeded with a NULL resource"; - return ""; + PASS(); } std::string TestGraphics2D::TestInvalidSize() { @@ -258,14 +258,14 @@ std::string TestGraphics2D::TestInvalidSize() { ASSERT_FALSE(!!graphics_2d_interface_->Create( pp::Module::Get()->pp_module(), &size, PP_FALSE)); - return ""; + PASS(); } std::string TestGraphics2D::TestHumongous() { pp::Graphics2D a(instance_, pp::Size(100000, 100000), false); if (!a.is_null()) return "Humongous device created"; - return ""; + PASS(); } std::string TestGraphics2D::TestInitToZero() { @@ -288,7 +288,7 @@ std::string TestGraphics2D::TestInitToZero() { if (!IsSquareInImage(image, 0, pp::Rect(0, 0, w, h), 0)) return "Got a nonzero pixel"; - return ""; + PASS(); } std::string TestGraphics2D::TestDescribe() { @@ -307,7 +307,7 @@ std::string TestGraphics2D::TestDescribe() { if (size.width != w || size.height != h || is_always_opaque != PP_FALSE) return "Mismatch of data."; - return ""; + PASS(); } std::string TestGraphics2D::TestPaint() { @@ -386,7 +386,7 @@ std::string TestGraphics2D::TestPaint() { subset_color)) return "Subset paint failed."; - return ""; + PASS(); } std::string TestGraphics2D::TestScroll() { @@ -448,7 +448,7 @@ std::string TestGraphics2D::TestScroll() { if (!CompareImages(test_image, readback)) return "TC2, Read back image is not the same as test image."; - return ""; + PASS(); } std::string TestGraphics2D::TestReplace() { @@ -502,7 +502,7 @@ std::string TestGraphics2D::TestReplace() { if (!IsDCUniformColor(dc, swapped_color)) return "Flushed color incorrect (or failure in readback)."; - return ""; + PASS(); } std::string TestGraphics2D::TestFlush() { @@ -544,5 +544,5 @@ std::string TestGraphics2D::TestFlush() { return "Second flush succeeded before callback ran."; } - return ""; + PASS(); } diff --git a/ppapi/tests/test_image_data.cc b/ppapi/tests/test_image_data.cc index b841e4e..ab8894a 100644 --- a/ppapi/tests/test_image_data.cc +++ b/ppapi/tests/test_image_data.cc @@ -37,7 +37,7 @@ std::string TestImageData::TestInvalidFormat() { if (!b.is_null()) return "Negative image data format accepted"; - return ""; + PASS(); } std::string TestImageData::TestInvalidSize() { @@ -76,7 +76,7 @@ std::string TestImageData::TestInvalidSize() { if (rsrc) return "Negative width accepted"; - return ""; + PASS(); } std::string TestImageData::TestHugeSize() { @@ -84,7 +84,7 @@ std::string TestImageData::TestHugeSize() { pp::Size(100000000, 100000000), true); if (!huge_size.is_null()) return "31-bit overflow size accepted"; - return ""; + PASS(); } std::string TestImageData::TestInitToZero() { @@ -113,7 +113,7 @@ std::string TestImageData::TestInitToZero() { } } - return ""; + PASS(); } std::string TestImageData::TestIsImageData() { @@ -138,5 +138,5 @@ std::string TestImageData::TestIsImageData() { if (!image_data_interface_->IsImageData(img.pp_resource())) return "Image data should be identified as an image"; - return ""; + PASS(); } diff --git a/ppapi/tests/test_instance_deprecated.cc b/ppapi/tests/test_instance_deprecated.cc index 74e929a..9ff1e7e 100644 --- a/ppapi/tests/test_instance_deprecated.cc +++ b/ppapi/tests/test_instance_deprecated.cc @@ -118,5 +118,5 @@ std::string TestInstance::TestExecuteScript() { ASSERT_TRUE(ret.is_undefined()); ASSERT_TRUE(exception.is_string()); // Don't know exactly what it will say. - return std::string(); + PASS(); } diff --git a/ppapi/tests/test_paint_aggregator.cc b/ppapi/tests/test_paint_aggregator.cc index 7859a70..be3f19c 100644 --- a/ppapi/tests/test_paint_aggregator.cc +++ b/ppapi/tests/test_paint_aggregator.cc @@ -40,7 +40,7 @@ std::string TestPaintAggregator::TestInitialState() { pp::PaintAggregator greg; if (greg.HasPendingUpdate()) return "Pending update invalid"; - return std::string(); + PASS(); } std::string TestPaintAggregator::TestSingleInvalidation() { @@ -55,7 +55,7 @@ std::string TestPaintAggregator::TestSingleInvalidation() { ASSERT_TRUE(rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestDoubleDisjointInvalidation() { @@ -74,7 +74,7 @@ std::string TestPaintAggregator::TestDoubleDisjointInvalidation() { ASSERT_TRUE(2U == greg.GetPendingUpdate().paint_rects.size()); ASSERT_TRUE(expected_bounds == greg.GetPendingUpdate().paint_bounds); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestSingleScroll() { @@ -93,7 +93,7 @@ std::string TestPaintAggregator::TestSingleScroll() { ASSERT_TRUE(2U == greg.GetPendingUpdate().paint_rects.size()); ASSERT_TRUE(expected_bounds == greg.GetPendingUpdate().paint_bounds); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestDoubleOverlappingScroll() { @@ -119,7 +119,7 @@ std::string TestPaintAggregator::TestDoubleOverlappingScroll() { pp::Rect resulting_damage = greg.GetPendingUpdate().paint_rects[0]; pp::Rect expected_damage(1, 2, 2, 4); ASSERT_TRUE(expected_damage == resulting_damage); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestNegatingScroll() { @@ -135,7 +135,7 @@ std::string TestPaintAggregator::TestNegatingScroll() { greg.ScrollRect(rect, delta2); ASSERT_FALSE(greg.HasPendingUpdate()); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestDiagonalScroll() { @@ -153,7 +153,7 @@ std::string TestPaintAggregator::TestDiagonalScroll() { ASSERT_TRUE(1U == greg.GetPendingUpdate().paint_rects.size()); ASSERT_TRUE(rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestContainedPaintAfterScroll() { @@ -174,7 +174,7 @@ std::string TestPaintAggregator::TestContainedPaintAfterScroll() { ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); ASSERT_TRUE(paint_rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestContainedPaintBeforeScroll() { @@ -197,7 +197,7 @@ std::string TestPaintAggregator::TestContainedPaintBeforeScroll() { ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); ASSERT_TRUE(paint_rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestContainedPaintsBeforeAndAfterScroll() { @@ -222,7 +222,7 @@ std::string TestPaintAggregator::TestContainedPaintsBeforeAndAfterScroll() { ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); ASSERT_TRUE(expected_paint_rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestLargeContainedPaintAfterScroll() { @@ -240,7 +240,7 @@ std::string TestPaintAggregator::TestLargeContainedPaintAfterScroll() { ASSERT_TRUE(1U == greg.GetPendingUpdate().paint_rects.size()); ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestLargeContainedPaintBeforeScroll() { @@ -258,7 +258,7 @@ std::string TestPaintAggregator::TestLargeContainedPaintBeforeScroll() { ASSERT_TRUE(1U == greg.GetPendingUpdate().paint_rects.size()); ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestOverlappingPaintBeforeScroll() { @@ -278,7 +278,7 @@ std::string TestPaintAggregator::TestOverlappingPaintBeforeScroll() { ASSERT_TRUE(1U == greg.GetPendingUpdate().paint_rects.size()); ASSERT_TRUE(expected_paint_rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestOverlappingPaintAfterScroll() { @@ -298,7 +298,7 @@ std::string TestPaintAggregator::TestOverlappingPaintAfterScroll() { ASSERT_TRUE(1U == greg.GetPendingUpdate().paint_rects.size()); ASSERT_TRUE(expected_paint_rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestDisjointPaintBeforeScroll() { @@ -317,7 +317,7 @@ std::string TestPaintAggregator::TestDisjointPaintBeforeScroll() { ASSERT_TRUE(paint_rect == greg.GetPendingUpdate().paint_rects[0]); ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestDisjointPaintAfterScroll() { @@ -336,7 +336,7 @@ std::string TestPaintAggregator::TestDisjointPaintAfterScroll() { ASSERT_TRUE(paint_rect == greg.GetPendingUpdate().paint_rects[0]); ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestContainedPaintTrimmedByScroll() { @@ -358,7 +358,7 @@ std::string TestPaintAggregator::TestContainedPaintTrimmedByScroll() { ASSERT_TRUE(expected_paint_rect == greg.GetPendingUpdate().paint_rects[0]); ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); - return std::string(); + PASS(); } std::string TestPaintAggregator::TestContainedPaintEliminatedByScroll() { @@ -376,7 +376,7 @@ std::string TestPaintAggregator::TestContainedPaintEliminatedByScroll() { ASSERT_TRUE(1U == greg.GetPendingUpdate().paint_rects.size()); ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); - return std::string(); + PASS(); } std::string @@ -400,7 +400,7 @@ TestPaintAggregator::TestContainedPaintAfterScrollTrimmedByScrollDamage() { ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); ASSERT_TRUE(expected_scroll_damage == greg.GetPendingUpdate().paint_rects[1]); ASSERT_TRUE(expected_paint_rect == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } std::string @@ -422,5 +422,5 @@ TestPaintAggregator::TestContainedPaintAfterScrollEliminatedByScrollDamage() { ASSERT_TRUE(scroll_rect == greg.GetPendingUpdate().scroll_rect); ASSERT_TRUE(expected_scroll_damage == greg.GetPendingUpdate().paint_rects[0]); - return std::string(); + PASS(); } diff --git a/ppapi/tests/test_transport.cc b/ppapi/tests/test_transport.cc index 2f3c09f..bcb7552 100644 --- a/ppapi/tests/test_transport.cc +++ b/ppapi/tests/test_transport.cc @@ -32,5 +32,5 @@ void TestTransport::RunTest() { std::string TestTransport::TestFirstTransport() { // TODO(juberti): actual test - return ""; + PASS(); } diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc index 7d4b3b2..8b0dfc6 100644 --- a/ppapi/tests/test_url_loader.cc +++ b/ppapi/tests/test_url_loader.cc @@ -242,7 +242,7 @@ std::string TestURLLoader::TestStreamToFile() { if (file_descriptor < 0) return "FileIO::GetOSFileDescriptor() returned a bad file descriptor."; - return ""; + PASS(); } std::string TestURLLoader::TestSameOriginRestriction() { @@ -265,7 +265,7 @@ std::string TestURLLoader::TestSameOriginRestriction() { } } - return ""; + PASS(); } // This test should cause a redirect and ensure that the loader runs diff --git a/ppapi/tests/test_url_util.cc b/ppapi/tests/test_url_util.cc index ea91506..0f4e112 100644 --- a/ppapi/tests/test_url_util.cc +++ b/ppapi/tests/test_url_util.cc @@ -65,7 +65,7 @@ std::string TestUrlUtil::TestCanonicalize() { ASSERT_TRUE(ComponentEquals(c.query, 0, -1)); ASSERT_TRUE(ComponentEquals(c.ref, 0, -1)); - return std::string(); + PASS(); } std::string TestUrlUtil::TestResolveRelative() { @@ -92,7 +92,7 @@ std::string TestUrlUtil::TestResolveRelative() { ASSERT_TRUE(result.AsString() == test_cases[i].expected); } } - return std::string(); + PASS(); } std::string TestUrlUtil::TestIsSameSecurityOrigin() { @@ -100,18 +100,18 @@ std::string TestUrlUtil::TestIsSameSecurityOrigin() { "http://example.com/")); ASSERT_TRUE(util_->IsSameSecurityOrigin("http://google.com/foo", "http://google.com/bar")); - return std::string(); + PASS(); } std::string TestUrlUtil::TestDocumentCanRequest() { // This is hard to test, but we can at least verify we can't request // some random domain. ASSERT_FALSE(util_->DocumentCanRequest(*instance_, "http://evil.com/")); - return std::string(); + PASS(); } std::string TestUrlUtil::TestDocumentCanAccessDocument() { // This is hard to test, but we can at least verify we can access ourselves. ASSERT_TRUE(util_->DocumentCanAccessDocument(*instance_, *instance_)); - return std::string(); + PASS(); } diff --git a/ppapi/tests/test_var_deprecated.cc b/ppapi/tests/test_var_deprecated.cc index b4bdee9..724e914 100644 --- a/ppapi/tests/test_var_deprecated.cc +++ b/ppapi/tests/test_var_deprecated.cc @@ -73,7 +73,7 @@ std::string TestVarDeprecated::TestBasicString() { ASSERT_TRUE(testing_interface_->GetLiveObjectCount( pp::Module::Get()->pp_module()) == before_object); - return std::string(); + PASS(); } std::string TestVarDeprecated::TestInvalidAndEmpty() { @@ -101,7 +101,7 @@ std::string TestVarDeprecated::TestInvalidAndEmpty() { ASSERT_EQ(0, len); ASSERT_NE(NULL, result); - return std::string(); + PASS(); } std::string TestVarDeprecated::TestInvalidUtf8() { @@ -111,7 +111,7 @@ std::string TestVarDeprecated::TestInvalidUtf8() { if (!sjis.is_null()) return "Non-UTF8 string permitted."; - return ""; + PASS(); } std::string TestVarDeprecated::TestNullInputInUtf8Conversion() { @@ -145,7 +145,7 @@ std::string TestVarDeprecated::TestNullInputInUtf8Conversion() { return "Expected NULL input to make an empty string Var."; } - return ""; + PASS(); } std::string TestVarDeprecated::TestValidUtf8() { @@ -169,7 +169,7 @@ std::string TestVarDeprecated::TestValidUtf8() { return "String mismatches on conversion back from PP_Var."; } - return ""; + PASS(); } std::string TestVarDeprecated::TestUtf8WithEmbeddedNulls() { @@ -193,7 +193,7 @@ std::string TestVarDeprecated::TestUtf8WithEmbeddedNulls() { return "String mismatches on conversion back from PP_Var."; } - return ""; + PASS(); } std::string TestVarDeprecated::TestVarToUtf8ForWrongType() { @@ -247,7 +247,7 @@ std::string TestVarDeprecated::TestVarToUtf8ForWrongType() { return "Expected NULL on string conversion from Double var."; } - return ""; + PASS(); } std::string TestVarDeprecated::TestHasPropertyAndMethod() { @@ -324,6 +324,6 @@ std::string TestVarDeprecated::TestHasPropertyAndMethod() { ASSERT_TRUE(testing_interface_->GetLiveObjectCount( pp::Module::Get()->pp_module()) == before_objects); - return std::string(); + PASS(); } |