[PATCH v3 3/6] xmllite/tests: For DTD, test that qualified and local names match.

[Jeff Smith]

Signed-off-by: Jeff Smith 
---
 dlls/xmllite/tests/reader.c | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index e421178c4e..2a6d8a053c 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -1270,11 +1270,10 @@ static const char test_public_dtd[] =

static void test_read_public_dtd(void)
 {
-    static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0};
     IXmlReader *reader;
-    const WCHAR *str;
+    const WCHAR *name, *qname;
     XmlNodeType type;
-    UINT len, count;
+    UINT count;
     HRESULT hr;

hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
@@ -1314,14 +1313,10 @@ static void test_read_public_dtd(void)
     reader_value(reader, "externalid uri");

move_to_element(reader);
-    reader_name(reader, "testdtd");
-
-    len = 0;
-    str = NULL;
-    hr = IXmlReader_GetQualifiedName(reader, &str, &len);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
-    ok(len == lstrlenW(dtdnameW), "got %u\n", len);
-    ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str));
+    name = reader_name(reader, "testdtd");
+    qname = reader_qname(reader, "testdtd");
+todo_wine
+    ok(name == qname, "name != qname\n");

IXmlReader_Release(reader);
 }
@@ -1332,11 +1327,10 @@ static const char test_system_dtd[] =

static void test_read_system_dtd(void)
 {
-    static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0};
     IXmlReader *reader;
-    const WCHAR *str;
+    const WCHAR *name, *qname;
     XmlNodeType type;
-    UINT len, count;
+    UINT count;
     HRESULT hr;

hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL);
@@ -1366,14 +1360,10 @@ static void test_read_system_dtd(void)
     reader_value(reader, "externalid uri");

move_to_element(reader);
-    reader_name(reader, "testdtd");
-
-    len = 0;
-    str = NULL;
-    hr = IXmlReader_GetQualifiedName(reader, &str, &len);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
-    ok(len == lstrlenW(dtdnameW), "got %u\n", len);
-    ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str));
+    name = reader_name(reader, "testdtd");
+    qname = reader_qname(reader, "testdtd");
+todo_wine
+    ok(name == qname, "name != qname\n");

read_node(reader, XmlNodeType_Comment);