summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/corelib/kernel/qeventdispatcher_symbian.cpp1
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp6
-rw-r--r--tests/auto/network-settings.h50
-rw-r--r--tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp26
-rw-r--r--tests/auto/qsslsocket/tst_qsslsocket.cpp36
5 files changed, 72 insertions, 47 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 3110e63..6c47c7b 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -505,7 +505,6 @@ void QEventDispatcherSymbian::closingDown()
delete m_wakeUpAO;
if (m_activeScheduler) {
- CActiveScheduler::Install(NULL);
delete m_activeScheduler;
}
}
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index bf50383..1ae3d79 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -207,7 +207,11 @@ QString QCoeFepInputContext::language()
bool QCoeFepInputContext::filterEvent(const QEvent *event)
{
- Q_ASSERT(focusWidget());
+ // The CloseSoftwareInputPanel event is not handled here, because the VK will automatically
+ // close when it discovers that the underlying widget does not have input capabilities.
+
+ if (!focusWidget())
+ return false;
if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 952ab89..5b671bf 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -137,35 +137,51 @@ public:
return serverIp.data();
}
#endif
- //return "10.10.0.147";
return "10.10.14.172";
- //return "10.3.7.2";
- //return "10.3.3.69";
}
static QByteArray expectedReplyIMAP()
{
- //QByteArray expected( "* OK esparsett Cyrus IMAP4 v2.2.8 server ready\r\n" );
-
-
- QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " );
- expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
- expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+#ifdef Q_OS_SYMBIAN
+ loadTestSettings();
+
+ if(QtNetworkSettings::entries.contains("imap.expectedreply")) {
+ QtNetworkSettingsRecord* entry = entries["imap.expectedreply"];
+ if(imapExpectedReply.isNull()) {
+ imapExpectedReply = entry->recordValue().toAscii();
+ imapExpectedReply.append('\r').append('\n');
+ }
+ return imapExpectedReply.data();
+ }
+#endif
+ /*QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " );
+ expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
+ expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");*/
- /*
QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4REV1] " );
expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
- */
+
return expected;
}
static QByteArray expectedReplySSL()
{
- QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " );
- expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
- expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
- return expected;
+ loadTestSettings();
+
+ if(QtNetworkSettings::entries.contains("imap.expectedreplyssl")) {
+ QtNetworkSettingsRecord* entry = entries["imap.expectedreplyssl"];
+ if(imapExpectedReplySsl.isNull()) {
+ imapExpectedReplySsl = entry->recordValue().toAscii();
+ imapExpectedReplySsl.append('\r').append('\n');
+ }
+ return imapExpectedReplySsl.data();
+ } else {
+ QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " );
+ expected = expected.append(QtNetworkSettings::serverLocalName().toAscii());
+ expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
+ return expected;
+ }
}
static QByteArray expectedReplyFtp()
@@ -205,6 +221,8 @@ private:
static bool bTestSettingsLoaded;
static QString iapFileFullPath;
static QByteArray serverIp;
+ static QByteArray imapExpectedReply;
+ static QByteArray imapExpectedReplySsl;
static bool loadDefaultIap() {
if(bDefaultIapLoaded)
@@ -296,6 +314,8 @@ bool QtNetworkSettings::bDefaultIapLoaded = false;
bool QtNetworkSettings::bTestSettingsLoaded = false;
QString QtNetworkSettings::iapFileFullPath = QString("C:\\Data\\iap.txt");
QByteArray QtNetworkSettings::serverIp;
+QByteArray QtNetworkSettings::imapExpectedReply;
+QByteArray QtNetworkSettings::imapExpectedReplySsl;
#endif
#ifdef Q_OS_SYMBIAN
diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
index 629285f..bb88f42 100644
--- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -70,9 +70,10 @@ tst_QSocketNotifier::~tst_QSocketNotifier()
class UnexpectedDisconnectTester : public QObject
{
Q_OBJECT
+ int sequence;
+
public:
QNativeSocketEngine *readEnd1, *readEnd2;
- int sequence;
UnexpectedDisconnectTester(QNativeSocketEngine *s1, QNativeSocketEngine *s2)
: readEnd1(s1), readEnd2(s2), sequence(0)
@@ -85,17 +86,25 @@ public:
connect(notifier2, SIGNAL(activated(int)), SLOT(handleActivated()));
}
+ const int getSequence() {
+ return sequence;
+ }
+
+ void incSequence() {
+ ++sequence;
+ }
+
public slots:
void handleActivated()
{
char data1[1], data2[1];
- ++sequence;
- if (sequence == 1) {
+ incSequence();
+ if (getSequence() == 1) {
// read from both ends
(void) readEnd1->read(data1, sizeof(data1));
(void) readEnd2->read(data2, sizeof(data2));
emit finished();
- } else if (sequence == 2) {
+ } else if (getSequence() == 2) {
QCOMPARE(readEnd2->read(data2, sizeof(data2)), qint64(-2));
QVERIFY(readEnd2->isValid());
}
@@ -155,7 +164,12 @@ void tst_QSocketNotifier::unexpectedDisconnection()
writeEnd2->flush();
UnexpectedDisconnectTester tester(&readEnd1, &readEnd2);
- QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
+
+ do {
+ // we have to wait until sequence value changes
+ // as any event can make us jump out processing
+ QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
+ } while(tester.getSequence() <= 0);
QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState);
QVERIFY(readEnd2.state() == QAbstractSocket::ConnectedState);
@@ -163,7 +177,7 @@ void tst_QSocketNotifier::unexpectedDisconnection()
qWarning("### Windows returns 1 activation, Unix returns 2.");
QCOMPARE(tester.sequence, 1);
#else
- QCOMPARE(tester.sequence, 2);
+ QCOMPARE(tester.getSequence(), 2);
#endif
readEnd1.close();
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 0ff6692..c9f9cbd 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -238,13 +238,13 @@ void tst_QSslSocket::initTestCase_data()
QTest::addColumn<bool>("setProxy");
QTest::addColumn<int>("proxyType");
- QTest::newRow("WithoutProxy") << false << 0;
+ //QTest::newRow("WithoutProxy") << false << 0;
#ifdef TEST_QNETWORK_PROXY
QTest::newRow("WithSocks5Proxy") << true << int(Socks5Proxy);
- QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic);
+ //QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic);
- QTest::newRow("WithHttpProxy") << true << int(HttpProxy);
- QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic);
+ //QTest::newRow("WithHttpProxy") << true << int(HttpProxy);
+ //QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic);
// uncomment the line below when NTLM works
// QTest::newRow("WithHttpProxyNtlmAuth") << true << int(HttpProxy | AuthNtlm);
#endif
@@ -508,30 +508,19 @@ void tst_QSslSocket::sslErrors_data()
QTest::addColumn<int>("port");
QTest::addColumn<SslErrorList>("errors");
-#if defined(Q_OS_SYMBIAN)
-
QTest::newRow(QtNetworkSettings::serverName().toAscii() + " port443") << QtNetworkSettings::serverName() << 443
<< (SslErrorList()
- << QSslError::SelfSignedCertificate
+ << QSslError::UnableToGetLocalIssuerCertificate
+ << QSslError::CertificateUntrusted
+ << QSslError::UnableToVerifyFirstCertificate
);
QTest::newRow(QtNetworkSettings::serverName().toAscii() + " port993") << QtNetworkSettings::serverName() << 993
<< (SslErrorList()
<< QSslError::HostNameMismatch
<< QSslError::SelfSignedCertificate
);
- // TODO: Should we have QtNetworkSettings::serverName alias
- // in order that we could test with different host name
-
-#else
- QTest::newRow("imap.troll.no") << "imap.troll.no" << 993
- << (SslErrorList()
- << QSslError::HostNameMismatch
- << QSslError::SelfSignedCertificateInChain);
- QTest::newRow("imap.trolltech.com") << "imap.trolltech.com" << 993
- << (SslErrorList()
- << QSslError::SelfSignedCertificateInChain);
-
-#endif //Q_OS_SYMBIAN
+ // TODO: Should we have QtNetworkSettings::serverName alias
+ // in order that we could test with different host name
}
void tst_QSslSocket::sslErrors()
@@ -1424,10 +1413,9 @@ void tst_QSslSocket::verifyMode()
QVERIFY(!socket.waitForEncrypted());
QList<QSslError> expectedErrors = QList<QSslError>()
- << QSslError(QSslError::SelfSignedCertificate, socket.peerCertificate());
-/* << QSslError(QSslError::UnableToGetLocalIssuerCertificate, socket.peerCertificate())
+ << QSslError(QSslError::UnableToGetLocalIssuerCertificate, socket.peerCertificate())
<< QSslError(QSslError::CertificateUntrusted, socket.peerCertificate())
- << QSslError(QSslError::UnableToVerifyFirstCertificate, socket.peerCertificate());*/
+ << QSslError(QSslError::UnableToVerifyFirstCertificate, socket.peerCertificate());
QCOMPARE(socket.sslErrors(), expectedErrors);
socket.abort();
@@ -1554,7 +1542,7 @@ void tst_QSslSocket::resetProxy()
// dont forget to login
QCOMPARE((int) socket.write("USER ftptest\r\n"), 14);
- QCOMPARE((int) socket.write("PASS ftP2Ptf\r\n"), 14);
+ QCOMPARE((int) socket.write("PASS password\r\n"), 15);
enterLoop(10);
generated by cgit v0.12 at 2025-08-13 21:00:48 (GMT)