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

Use wxXmlResource::LoadDocument() in XRC unit tests

Browse Source 
This is simpler and better than creating a temporary file unnecessarily
and also serves as a test of the just added function.
This commit is contained in:
Vadim Zeitlin
2021-04-15 00:01:44 +01:00
parent c16082edfe
commit ebedd023f5
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/xml/xrctest.cpp
View File

@@ -21,6 +21,7 @@
#include "wx/fs_inet.h" #include "wx/fs_inet.h"
#include "wx/xml/xml.h" #include "wx/xml/xml.h"
#include "wx/scopedptr.h"
#include "wx/sstream.h" #include "wx/sstream.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
@@ -36,9 +37,19 @@ namespace
static const char *TEST_XRC_FILE = "test.xrc"; static const char *TEST_XRC_FILE = "test.xrc";
void LoadXrcFrom(const wxString& xrcText)
{
wxStringInputStream sis(xrcText);
wxScopedPtr<wxXmlDocument> xmlDoc(new wxXmlDocument(sis, "UTF-8"));
REQUIRE( xmlDoc->IsOk() );
// Load the xrc we've just created
REQUIRE( wxXmlResource::Get()->LoadDocument(xmlDoc.release(), TEST_XRC_FILE) );
}
// I'm hard-wiring the xrc into this function for now // I'm hard-wiring the xrc into this function for now
// If different xrcs are wanted for future tests, it'll be easy to refactor // If different xrcs are wanted for future tests, it'll be easy to refactor
void CreateXrc() void LoadTestXrc()
{ {
const char *xrcText = const char *xrcText =
"<?xml version=\"1.0\" ?>" "<?xml version=\"1.0\" ?>"
@@ -116,13 +127,7 @@ void CreateXrc()
"</resource>" "</resource>"
; ;
// afaict there's no elegant way to load xrc direct from a string LoadXrcFrom(wxString::FromAscii(xrcText));
// So save it as a file, from which it can be loaded
wxStringInputStream sis(xrcText);
wxFFileOutputStream fos(TEST_XRC_FILE);
REQUIRE(fos.IsOk());
fos.Write(sis);
REQUIRE(fos.Close());
} }
} // anon namespace } // anon namespace
@@ -135,8 +140,7 @@ void CreateXrc()
class XrcTestCase class XrcTestCase
{ {
public: public:
XrcTestCase() { CreateXrc(); } XrcTestCase() { }
~XrcTestCase() { wxRemoveFile(TEST_XRC_FILE); }
private: private:
wxDECLARE_NO_COPY_CLASS(XrcTestCase); wxDECLARE_NO_COPY_CLASS(XrcTestCase);
@@ -148,8 +152,7 @@ TEST_CASE_METHOD(XrcTestCase, "XRC::ObjectReferences", "[xrc]")
for ( int n = 0; n < 2; ++n ) for ( int n = 0; n < 2; ++n )
{ {
// Load the xrc file we're just created LoadTestXrc();
REQUIRE( wxXmlResource::Get()->Load(TEST_XRC_FILE) );
// In xrc there's now a dialog containing two panels, one an object // In xrc there's now a dialog containing two panels, one an object
// reference of the other // reference of the other
@@ -171,8 +174,7 @@ TEST_CASE_METHOD(XrcTestCase, "XRC::IDRanges", "[xrc]")
// Tests ID ranges // Tests ID ranges
for ( int n = 0; n < 2; ++n ) for ( int n = 0; n < 2; ++n )
{ {
// Load the xrc file we're just created LoadTestXrc();
REQUIRE( wxXmlResource::Get()->Load(TEST_XRC_FILE) );
// foo[start] should == foo[0] // foo[start] should == foo[0]
CHECK( XRCID("SecondCol[start]") == XRCID("SecondCol[0]") ); CHECK( XRCID("SecondCol[start]") == XRCID("SecondCol[0]") );
@@ -205,6 +207,19 @@ TEST_CASE_METHOD(XrcTestCase, "XRC::IDRanges", "[xrc]")
} }
} }
TEST_CASE("XRC::PathWithFragment", "[xrc][uri]")
{
LoadXrcFrom
(
"<?xml version=\"1.0\" ?>"
"<resource>"
" <object class=\"wxBitmap\" name=\"bitmap\">bitmap#1.png</object>"
"</resource>"
);
CHECK( wxXmlResource::Get()->LoadBitmap("bitmap").IsOk() );
}
// This test is disabled by default as it requires the environment variable // This test is disabled by default as it requires the environment variable
// below to be defined to point to a HTTP URL with the file to load. // below to be defined to point to a HTTP URL with the file to load.
// //