diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 04:17:27 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 04:17:27 +0000 |
| commit | 2d9f52faebf6b197f7b4896aac1631f6079d2df5 (patch) | |
| tree | 3e26a26fb96777584efa5712396ad9a28831caa5 | |
| parent | a35fbf3ce4efa27135f2a1ecf6c0482e301ed92d (diff) | |
| download | chromium_src-2d9f52faebf6b197f7b4896aac1631f6079d2df5.zip chromium_src-2d9f52faebf6b197f7b4896aac1631f6079d2df5.tar.gz chromium_src-2d9f52faebf6b197f7b4896aac1631f6079d2df5.tar.bz2 | |
Post-scrubbing fix-up of the UniscribeHelper unit test.
R=eseidel.
Review URL: http://codereview.chromium.org/18246
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8078 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp | 26 |
2 files changed, 14 insertions, 14 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@8053", + "/trunk/deps/third_party/WebKit@8077", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", diff --git a/webkit/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp b/webkit/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp index 17a9f91..6410828 100644 --- a/webkit/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp +++ b/webkit/tools/webcore_unit_tests/UniscribeHelper_unittest.cpp @@ -90,13 +90,13 @@ TEST_F(UniscribeTest, TooBig) UniscribeHelper uniscribe( input.characters(), static_cast<int>(input.length()), false, hfont, scriptCache, &m_properties); - uniscribe.InitWithOptionalLengthProtection(false); + uniscribe.initWithOptionalLengthProtection(false); // There should be one shaping entry, with nothing in it. ASSERT_EQ(1, uniscribe.m_shapes.size()); EXPECT_EQ(0, uniscribe.m_shapes[0].m_glyphs.size()); EXPECT_EQ(0, uniscribe.m_shapes[0].m_logs.size()); - EXPECT_EQ(0, uniscribe.m_shapes[0].m_visattr.size()); + EXPECT_EQ(0, uniscribe.m_shapes[0].m_visualAttributes.size()); EXPECT_EQ(0, uniscribe.m_shapes[0].m_advance.size()); EXPECT_EQ(0, uniscribe.m_shapes[0].m_offsets.size()); EXPECT_EQ(0, uniscribe.m_shapes[0].m_justify.size()); @@ -110,11 +110,11 @@ TEST_F(UniscribeTest, TooBig) // Check that the various querying functions handle the empty case // properly. - EXPECT_EQ(0, uniscribe.Width()); - EXPECT_EQ(0, uniscribe.FirstGlyphForCharacter(0)); - EXPECT_EQ(0, uniscribe.FirstGlyphForCharacter(1000)); - EXPECT_EQ(0, uniscribe.XToCharacter(0)); - EXPECT_EQ(0, uniscribe.XToCharacter(1000)); + EXPECT_EQ(0, uniscribe.width()); + EXPECT_EQ(0, uniscribe.firstGlyphForCharacter(0)); + EXPECT_EQ(0, uniscribe.firstGlyphForCharacter(1000)); + EXPECT_EQ(0, uniscribe.xToCharacter(0)); + EXPECT_EQ(0, uniscribe.xToCharacter(1000)); } // Now test the very large string and make sure it is handled properly by @@ -123,17 +123,17 @@ TEST_F(UniscribeTest, TooBig) UniscribeHelper uniscribe( input.characters(), static_cast<int>(input.length()), false, hfont, scriptCache, &m_properties); - uniscribe.InitWithOptionalLengthProtection(true); + uniscribe.initWithOptionalLengthProtection(true); // There should be 0 runs and shapes. EXPECT_EQ(0, uniscribe.m_runs.size()); EXPECT_EQ(0, uniscribe.m_shapes.size()); EXPECT_EQ(0, uniscribe.m_screenOrder.size()); - EXPECT_EQ(0, uniscribe.Width()); - EXPECT_EQ(0, uniscribe.FirstGlyphForCharacter(0)); - EXPECT_EQ(0, uniscribe.FirstGlyphForCharacter(1000)); - EXPECT_EQ(0, uniscribe.XToCharacter(0)); - EXPECT_EQ(0, uniscribe.XToCharacter(1000)); + EXPECT_EQ(0, uniscribe.width()); + EXPECT_EQ(0, uniscribe.firstGlyphForCharacter(0)); + EXPECT_EQ(0, uniscribe.firstGlyphForCharacter(1000)); + EXPECT_EQ(0, uniscribe.xToCharacter(0)); + EXPECT_EQ(0, uniscribe.xToCharacter(1000)); } }
\ No newline at end of file |