From 9286390af2f57c9f4e6a8fc72198d0818a25a9ed Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 6 Mar 2014 13:49:47 +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/branches/WX_3_0_BRANCH@76088 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 66023ff544..4e8ab69d0d 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; i<WXSIZEOF(testData); i++)
diff --git a/tests/uris/url.cpp b/tests/uris/url.cpp
index 32978fbc81..abc33dee1d 100644
--- a/tests/uris/url.cpp
+++ b/tests/uris/url.cpp
@@ -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;