Jacek Caban : xmllite/tests: Added move_to_element helper.
Alexandre Julliard
julliard at winehq.org
Fri Mar 31 14:26:29 CDT 2017
Module: wine
Branch: master
Commit: def55873793a4640dcef7bb81a215edfcc579687
URL: http://source.winehq.org/git/wine.git/?a=commit;h=def55873793a4640dcef7bb81a215edfcc579687
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Mar 31 15:57:27 2017 +0200
xmllite/tests: Added move_to_element helper.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/xmllite/tests/reader.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c
index 666432e..731c7b8 100644
--- a/dlls/xmllite/tests/reader.c
+++ b/dlls/xmllite/tests/reader.c
@@ -256,6 +256,14 @@ static void _next_attribute(unsigned line, IXmlReader *reader)
ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr);
}
+#define move_to_element(a) _move_to_element(__LINE__,a)
+static void _move_to_element(unsigned line, IXmlReader *reader)
+{
+ HRESULT hr;
+ hr = IXmlReader_MoveToElement(reader);
+ ok_(__FILE__,line)(hr == S_OK, "MoveToElement failed: %08x\n", hr);
+}
+
static void test_read_state(IXmlReader *reader, XmlReadState expected,
XmlReadState exp_broken, int line)
{
@@ -943,8 +951,7 @@ static void test_read_xmldeclaration(void)
TEST_DEPTH(reader, 1);
- hr = IXmlReader_MoveToElement(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ move_to_element(reader);
TEST_READER_POSITION2(reader, 1, 3, ~0u, 55);
type = XmlNodeType_None;
@@ -1302,8 +1309,7 @@ static void test_read_public_dtd(void)
reader_name(reader, "SYSTEM");
reader_value(reader, "externalid uri");
- hr = IXmlReader_MoveToElement(reader);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ move_to_element(reader);
len = 0;
str = NULL;
@@ -1367,8 +1373,7 @@ static void test_read_system_dtd(void)
reader_name(reader, "SYSTEM");
reader_value(reader, "externalid uri");
- hr = IXmlReader_MoveToElement(reader);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ move_to_element(reader);
len = 0;
str = NULL;
@@ -1539,9 +1544,7 @@ static void test_read_element(void)
ok(hr == S_OK, "got %08x\n", hr);
ok(depth == depths[i] + 1, "%u: got depth %u, expected %u\n", i, depth, depths[i] + 1);
- hr = IXmlReader_MoveToElement(reader);
- ok(hr == S_OK, "got %08x\n", hr);
-
+ move_to_element(reader);
reader_value(reader, "");
depth = 123;
@@ -2045,9 +2048,7 @@ static void test_prefix(void)
reader_prefix(reader, prefix_tests[i].prefix3);
/* back to the element, check prefix */
- hr = IXmlReader_MoveToElement(reader);
- ok(hr == S_OK, "MoveToElement() failed, %#x.\n", hr);
-
+ move_to_element(reader);
reader_prefix(reader, prefix_tests[i].prefix1);
IStream_Release(stream);
@@ -2473,8 +2474,7 @@ static void test_reader_position(void)
next_attribute(reader);
TEST_READER_POSITION2(reader, 1, 24, ~0u, 34);
- hr = IXmlReader_MoveToElement(reader);
- ok(hr == S_OK, "got %08x\n", hr);
+ move_to_element(reader);
TEST_READER_POSITION2(reader, 1, 2, ~0u, 34);
hr = IXmlReader_Read(reader, &type);
More information about the wine-cvs
mailing list