Nikolay Sivov : dwrite/tests: Test that soft hyphen is not marked as a whitespace.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 20b5cdb1d4758c923cdc500ee2dcb96c69f5eff6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=20b5cdb1d4758c923cdc500ee2...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Tue Feb  2 01:41:13 2016 +0300

dwrite/tests: Test that soft hyphen is not marked as a whitespace.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dwrite/tests/analyzer.c | 3 +++
 dlls/dwrite/tests/layout.c   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c
index d60b977..b5437c5 100644
--- a/dlls/dwrite/tests/analyzer.c
+++ b/dlls/dwrite/tests/analyzer.c
@@ -1028,6 +1028,9 @@ static void compare_breakpoints(const struct linebreaks_test *test, DWRITE_LINE_
                 conditions[test->bp[i].breakConditionAfter],
                 test->bp[i].isWhitespace ? "WS"  : "0",
                 test->bp[i].isSoftHyphen ? "SHY" : "0");
+            if (g_actual_bp[i].isSoftHyphen)
+                ok(!g_actual_bp[i].isWhitespace, "%s: soft hyphen marked as a whitespace\n",
+                    wine_dbgstr_wn(&test->text[i], 1));
             text++;
             i++;
         }
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index bc49b2f..bf46df8 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -2025,6 +2025,8 @@ todo_wine
     for (i = 0; i < count; i++) {
         ok(metrics[i].length == 1, "%d: got %d\n", i, metrics[i].length);
         ok(metrics[i].isSoftHyphen == (i == count - 2), "%d: got %d\n", i, metrics[i].isSoftHyphen);
+        if (metrics[i].isSoftHyphen)
+            ok(!metrics[i].isWhitespace, "%u: got %d\n", i, metrics[i].isWhitespace);
         if (metrics[i].isNewline) {
             if (i == 17 || i == 19)
                 todo_wine ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width);