Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vararg function in wxXml unit test broken by recent changes.

Browse Source 
The changes in r67345 changed CheckXml() vararg function to take a reference
as the first argument but this doesn't work with va_start(), so revert to
using a pointer here.

This fixes the current unit test failures in the XML tests.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-04-06 16:37:24 +00:00
parent 3672f9d04d
commit 02c9435466
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/xml/xmltest.cpp
View File

@@ -34,7 +34,7 @@
namespace namespace
{ {
void CheckXml(const wxScopedPtr<wxXmlNode>& n, ...) void CheckXml(const wxXmlNode *n, ...)
{ {
va_list args; va_list args;
va_start(args, n); va_start(args, n);
@@ -50,7 +50,7 @@ void CheckXml(const wxScopedPtr<wxXmlNode>& n, ...)
CPPUNIT_ASSERT( child ); CPPUNIT_ASSERT( child );
CPPUNIT_ASSERT_EQUAL( childName, child->GetName() ); CPPUNIT_ASSERT_EQUAL( childName, child->GetName() );
CPPUNIT_ASSERT( child->GetChildren() == NULL ); CPPUNIT_ASSERT( child->GetChildren() == NULL );
CPPUNIT_ASSERT( child->GetParent() == n.get() ); CPPUNIT_ASSERT( child->GetParent() == n );
child = child->GetNext(); child = child->GetNext();
} }
@@ -108,17 +108,17 @@ void XmlTestCase::InsertChild()
wxXmlNode *two = new wxXmlNode(wxXML_ELEMENT_NODE, "2"); wxXmlNode *two = new wxXmlNode(wxXML_ELEMENT_NODE, "2");
root->AddChild(two); root->AddChild(two);
root->AddChild(new wxXmlNode(wxXML_ELEMENT_NODE, "3")); root->AddChild(new wxXmlNode(wxXML_ELEMENT_NODE, "3"));
CheckXml(root, "1", "2", "3", NULL); CheckXml(root.get(), "1", "2", "3", NULL);
// check inserting in front: // check inserting in front:
root->InsertChild(new wxXmlNode(wxXML_ELEMENT_NODE, "A"), NULL); root->InsertChild(new wxXmlNode(wxXML_ELEMENT_NODE, "A"), NULL);
CheckXml(root, "A", "1", "2", "3", NULL); CheckXml(root.get(), "A", "1", "2", "3", NULL);
root->InsertChild(new wxXmlNode(wxXML_ELEMENT_NODE, "B"), root->GetChildren()); root->InsertChild(new wxXmlNode(wxXML_ELEMENT_NODE, "B"), root->GetChildren());
CheckXml(root, "B", "A", "1", "2", "3", NULL); CheckXml(root.get(), "B", "A", "1", "2", "3", NULL);
// and in the middle: // and in the middle:
root->InsertChild(new wxXmlNode(wxXML_ELEMENT_NODE, "C"), two); root->InsertChild(new wxXmlNode(wxXML_ELEMENT_NODE, "C"), two);
CheckXml(root, "B", "A", "1", "C", "2", "3", NULL); CheckXml(root.get(), "B", "A", "1", "C", "2", "3", NULL);
} }
void XmlTestCase::InsertChildAfter() void XmlTestCase::InsertChildAfter()
@@ -126,23 +126,23 @@ void XmlTestCase::InsertChildAfter()
wxScopedPtr<wxXmlNode> root(new wxXmlNode(wxXML_ELEMENT_NODE, "root")); wxScopedPtr<wxXmlNode> root(new wxXmlNode(wxXML_ELEMENT_NODE, "root"));
root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "1"), NULL); root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "1"), NULL);
CheckXml(root, "1", NULL); CheckXml(root.get(), "1", NULL);
wxXmlNode *two = new wxXmlNode(wxXML_ELEMENT_NODE, "2"); wxXmlNode *two = new wxXmlNode(wxXML_ELEMENT_NODE, "2");
root->AddChild(two); root->AddChild(two);
wxXmlNode *three = new wxXmlNode(wxXML_ELEMENT_NODE, "3"); wxXmlNode *three = new wxXmlNode(wxXML_ELEMENT_NODE, "3");
root->AddChild(three); root->AddChild(three);
CheckXml(root, "1", "2", "3", NULL); CheckXml(root.get(), "1", "2", "3", NULL);
// check inserting in the middle: // check inserting in the middle:
root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "A"), root->GetChildren()); root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "A"), root->GetChildren());
CheckXml(root, "1", "A", "2", "3", NULL); CheckXml(root.get(), "1", "A", "2", "3", NULL);
root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "B"), two); root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "B"), two);
CheckXml(root, "1", "A", "2", "B", "3", NULL); CheckXml(root.get(), "1", "A", "2", "B", "3", NULL);
// and at the end: // and at the end:
root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "C"), three); root->InsertChildAfter(new wxXmlNode(wxXML_ELEMENT_NODE, "C"), three);
CheckXml(root, "1", "A", "2", "B", "3", "C", NULL); CheckXml(root.get(), "1", "A", "2", "B", "3", "C", NULL);
} }
void XmlTestCase::LoadSave() void XmlTestCase::LoadSave()