From 9151248ee03fae9814be5014082f5d021c888634 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 6 Mar 2014 13:53:14 +0000 Subject: [PATCH] Update the URL of the web site images used in the test. 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 --- tests/image/image.cpp | 4 ++-- tests/uris/url.cpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/image/image.cpp b/tests/image/image.cpp index b94cfec690..618a1b8395 100644 --- a/tests/image/image.cpp +++ b/tests/image/image.cpp @@ -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; iRead(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;