AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the URL of the web site images used in the test.

Browse Source 
The old images don't exist any more after web site redesign.

Also, the new favicon can't be loaded from an unseekable stream because it
contains multiple icons, so point to the old favicon instead.

Closes #16049.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-03-06 13:53:14 +00:00
parent 050fabe3b9
commit 9151248ee0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/image/image.cpp
View File

@ -147,8 +147,8 @@ void ImageTestCase::LoadFromSocketStream()
wxBitmapType type;
} testData[] =
{
{ "http://www.wxwidgets.org/logo9.jpg", wxBITMAP_TYPE_JPEG },
{ "http://www.wxwidgets.org/favicon.ico", wxBITMAP_TYPE_ICO }
{ "http://www.wxwidgets.org/assets/img/header-logo.png", wxBITMAP_TYPE_PNG },
{ "http://www.wxwidgets.org/assets/ico/favicon-1.ico", wxBITMAP_TYPE_ICO }
};
for (unsigned int i=0; i<WXSIZEOF(testData); i++)

5
tests/uris/url.cpp
View File

@ -70,7 +70,7 @@ void URLTestCase::GetInputStream()
return;
}
wxURL url("http://wxwidgets.org/logo9.jpg");
wxURL url("http://www.wxwidgets.org/assets/img/header-logo.png");
CPPUNIT_ASSERT_EQUAL(wxURL_NOERR, url.GetError());
wxInputStream *in_stream = url.GetInputStream();
@ -79,8 +79,7 @@ void URLTestCase::GetInputStream()
wxMemoryOutputStream ostream;
CPPUNIT_ASSERT(in_stream->Read(ostream).GetLastError() == wxSTREAM_EOF);
// wx logo image currently is 13219 bytes
CPPUNIT_ASSERT(ostream.GetSize() == 13219);
CPPUNIT_ASSERT_EQUAL(13677, ostream.GetSize());
// we have to delete the object created by GetInputStream()
delete in_stream;