← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdebase/maverick-updates

« back to all changes in this revision

Viewing changes to apps/lib/konq/tests/favicontest.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Debian Qt/KDE Maintainers, Martin Alfke, Modestas Vainius
  • Date: 2010-05-01 23:37:50 UTC
  • mfrom: (0.7.4 upstream) (0.4.4 experimental)
  • mto: This revision was merged to the branch mainline in revision 285.
  • Revision ID: james.westby@ubuntu.com-20100501233750-maq4i4sh8ymjbneb
Tags: 4:4.4.3-1
http://bugs.debian.org/555831
http://bugs.debian.org/441298
* New upstream release:
  - Konsole does not crash when closing a broken restored session.
    (Closes: #555831)
  - Konqueror does not crash when closing fast a tab. (Closes: #441298)

[Martin Alfke]
* Update of debian/copyright for kde 4.4

[ Modestas Vainius ]
* Bump kde-sc-dev-latest build dependency to 4.4.3.
* Confirm symbol files for 4.4.2 on hurd-i386 i386 ia64 kfreebsd-amd64
  kfreebsd-i386 mips powerpc s390 sparc.
* Release KDE SC 4.4.3 to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/lib/konq/tests/favicontest.cpp
29
29
 
30
30
QTEST_KDEMAIN( FavIconTest, NoGUI )
31
31
 
32
 
static const char* s_hostUrl = "http://wiki.kde.org";
33
 
static const char* s_iconUrl = "http://wiki.kde.org/favicon.ico";
 
32
static const char* s_hostUrl = "http://www.google.com";
 
33
static const char* s_iconUrl = "http://www.google.com/favicon.ico";
34
34
static const char* s_altIconUrl = "http://www.ibm.com/favicon.ico";
35
35
 
36
36
static int s_downloadTime; // in ms
116
116
    QCOMPARE( spy.count(), 2 );
117
117
    QCOMPARE( spy[1][0].toBool(), false );
118
118
    QCOMPARE( spy[1][1].toString(), QString( s_hostUrl ) );
119
 
    QCOMPARE( spy[1][2].toString(), QString( "favicons/wiki.kde.org" ) );
 
119
    QCOMPARE( spy[1][2].toString(), QString( "favicons/www.google.com" ) );
120
120
 
121
121
    disconnect(&m_favIconModule, SIGNAL( iconChanged(bool,QString,QString) ), &m_eventLoop, SLOT(quit()));
122
122
}
127
127
    if ( icon.isEmpty() && !checkNetworkAccess() )
128
128
        QSKIP( "no network access", SkipAll );
129
129
 
130
 
    QCOMPARE( icon, QString( "favicons/wiki.kde.org" ) );
 
130
    QCOMPARE( icon, QString( "favicons/www.google.com" ) );
131
131
}
132
132
 
133
133
#if 0