Enable several layout tests again
Several layout test have been disabled because surrogate pair support is not enabled by default on Windows XP En.
Now that we no longer care about Windows XP, we can safely enable those tests.
No behavior change is intended in production binaries.
BUG=none
TEST=unittest
git-svn-id: https://mozc.googlecode.com/svn/trunk@529 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 43d9737..753884e 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=2045
+BUILD=2046
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
diff --git a/src/renderer/win32/win32_renderer_util_test.cc b/src/renderer/win32/win32_renderer_util_test.cc
index be951c4..eaaf943 100644
--- a/src/renderer/win32/win32_renderer_util_test.cc
+++ b/src/renderer/win32/win32_renderer_util_test.cc
@@ -3871,11 +3871,8 @@
// Check if LayoutManager can handle preedits which contains surrogate pair.
// See b/4159275 for details.
-// Temporarily disabled to support Windows XP En, where surrogate pair is
-// disabled by default.
-// TODO(yukawa): Enable this test.
TEST_F(Win32RendererUtilTest,
- DISABLED_CheckSurrogatePairInHorizontalComposition_Issue4159275) {
+ CheckSurrogatePairInHorizontalComposition_Issue4159275) {
const int kCursorOffsetX = 150;
HWND hwnd = nullptr;
@@ -3934,11 +3931,8 @@
// Check if LayoutManager can handle preedits which contains surrogate pair.
// See b/4159275 for details.
-// Temporarily disabled to support Windows XP En, where surrogate pair is
-// disabled by default.
-// TODO(yukawa): Enable this test.
TEST_F(Win32RendererUtilTest,
- DISABLED_CheckSurrogatePairInVerticalComposition_Issue4159275) {
+ CheckSurrogatePairInVerticalComposition_Issue4159275) {
const int kCursorOffsetY = 175;
HWND hwnd = nullptr;
