Skip to content

W
wine-winehq
Commit c633a517 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

msxml3/tests: Fixed some test failures.

parent 5b43c42c
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 18 deletions
dlls/msxml3/tests/saxreader.c
View file @ c633a517
...@@ -2124,6 +2124,7 @@ static void test_saxreader(void) ...@@ -2124,6 +2124,7 @@ static void test_saxreader(void)
static const CHAR testXmlA[] = "test.xml"; static const CHAR testXmlA[] = "test.xml";
static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0};
IXMLDOMDocument *doc; IXMLDOMDocument *doc;
char seqname[50];
VARIANT_BOOL v; VARIANT_BOOL v;
while (table->clsid) while (table->clsid)
...@@ -2453,7 +2454,8 @@ static void test_saxreader(void) ...@@ -2453,7 +2454,8 @@ static void test_saxreader(void)
V_VT(&var) = VT_UNKNOWN; V_VT(&var) = VT_UNKNOWN;
V_UNKNOWN(&var) = (IUnknown*)stream; V_UNKNOWN(&var) = (IUnknown*)stream;
if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60) ||
IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40))
test_seq = cdata_test_alt; test_seq = cdata_test_alt;
else else
test_seq = cdata_test; test_seq = cdata_test;
...@@ -2461,14 +2463,16 @@ static void test_saxreader(void) ...@@ -2461,14 +2463,16 @@ static void test_saxreader(void)
set_expected_seq(test_seq); set_expected_seq(test_seq);
hr = ISAXXMLReader_parse(reader, var); hr = ISAXXMLReader_parse(reader, var);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test", TRUE); sprintf(seqname, "%s: cdata test", table->name);
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE);
/* 2. CDATA sections */ /* 2. CDATA sections */
stream = create_test_stream(test2_cdata_xml, -1); stream = create_test_stream(test2_cdata_xml, -1);
V_VT(&var) = VT_UNKNOWN; V_VT(&var) = VT_UNKNOWN;
V_UNKNOWN(&var) = (IUnknown*)stream; V_UNKNOWN(&var) = (IUnknown*)stream;
if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60) ||
IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40))
test_seq = cdata_test2_alt; test_seq = cdata_test2_alt;
else else
test_seq = cdata_test2; test_seq = cdata_test2;
...@@ -2476,7 +2480,8 @@ static void test_saxreader(void) ...@@ -2476,7 +2480,8 @@ static void test_saxreader(void)
set_expected_seq(test_seq); set_expected_seq(test_seq);
hr = ISAXXMLReader_parse(reader, var); hr = ISAXXMLReader_parse(reader, var);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test 2", TRUE); sprintf(seqname, "%s: cdata test 2", table->name);
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE);
IStream_Release(stream); IStream_Release(stream);
...@@ -2485,7 +2490,8 @@ static void test_saxreader(void) ...@@ -2485,7 +2490,8 @@ static void test_saxreader(void)
V_VT(&var) = VT_UNKNOWN; V_VT(&var) = VT_UNKNOWN;
V_UNKNOWN(&var) = (IUnknown*)stream; V_UNKNOWN(&var) = (IUnknown*)stream;
if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60) ||
IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40))
test_seq = cdata_test3_alt; test_seq = cdata_test3_alt;
else else
test_seq = cdata_test3; test_seq = cdata_test3;
...@@ -2493,7 +2499,8 @@ static void test_saxreader(void) ...@@ -2493,7 +2499,8 @@ static void test_saxreader(void)
set_expected_seq(test_seq); set_expected_seq(test_seq);
hr = ISAXXMLReader_parse(reader, var); hr = ISAXXMLReader_parse(reader, var);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test 3", TRUE); sprintf(seqname, "%s: cdata test 3", table->name);
ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE);
IStream_Release(stream); IStream_Release(stream);
...@@ -5071,25 +5078,25 @@ static void test_mxattr_addAttribute(void) ...@@ -5071,25 +5078,25 @@ static void test_mxattr_addAttribute(void)
EXPECT_HR(hr, E_INVALIDARG); EXPECT_HR(hr, E_INVALIDARG);
hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len); hr = ISAXAttributes_getValue(saxattr, 0, NULL, &len);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL); hr = ISAXAttributes_getValue(saxattr, 0, &value, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL); hr = ISAXAttributes_getValue(saxattr, 0, NULL, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getType(saxattr, 0, &value, &len); hr = ISAXAttributes_getType(saxattr, 0, &value, &len);
EXPECT_HR(hr, E_INVALIDARG); EXPECT_HR(hr, E_INVALIDARG);
hr = ISAXAttributes_getType(saxattr, 0, NULL, &len); hr = ISAXAttributes_getType(saxattr, 0, NULL, &len);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getType(saxattr, 0, &value, NULL); hr = ISAXAttributes_getType(saxattr, 0, &value, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getType(saxattr, 0, NULL, NULL); hr = ISAXAttributes_getType(saxattr, 0, NULL, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local), hr = IMXAttributes_addAttribute(mxattr, _bstr_(table->uri), _bstr_(table->local),
_bstr_(table->qname), _bstr_(table->type), _bstr_(table->value)); _bstr_(table->qname), _bstr_(table->type), _bstr_(table->value));
...@@ -5180,22 +5187,22 @@ static void test_mxattr_addAttribute(void) ...@@ -5180,22 +5187,22 @@ static void test_mxattr_addAttribute(void)
IsEqualGUID(table->clsid, &CLSID_SAXAttributes60)) IsEqualGUID(table->clsid, &CLSID_SAXAttributes60))
{ {
hr = ISAXAttributes_getValueFromQName(saxattr, NULL, 0, NULL, NULL); hr = ISAXAttributes_getValueFromQName(saxattr, NULL, 0, NULL, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, NULL, NULL); hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, NULL, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL); hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getValueFromName(saxattr, NULL, 0, NULL, 0, NULL, NULL); hr = ISAXAttributes_getValueFromName(saxattr, NULL, 0, NULL, 0, NULL, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, NULL, NULL); hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, NULL, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, &value, NULL); hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, &value, NULL);
EXPECT_HR(hr, E_INVALIDARG); ok(hr == E_POINTER /* win8 */ || hr == E_INVALIDARG, "got 0x%08x\n", hr);
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment