equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the test suite of the Qt Toolkit. |
7 ** This file is part of the test suite of the Qt Toolkit. |
8 ** |
8 ** |
55 #include <QNetworkProxy> |
55 #include <QNetworkProxy> |
56 #ifndef QT_NO_OPENSSL |
56 #ifndef QT_NO_OPENSSL |
57 # include <qsslsocket.h> |
57 # include <qsslsocket.h> |
58 #endif |
58 #endif |
59 |
59 |
60 #ifndef TEST_QNETWORK_PROXY |
|
61 #define TEST_QNETWORK_PROXY |
|
62 #endif |
|
63 #include "../network-settings.h" |
60 #include "../network-settings.h" |
64 |
61 |
65 //TESTED_CLASS= |
62 //TESTED_CLASS= |
66 //TESTED_FILES= |
63 //TESTED_FILES= |
67 |
64 |
196 { |
193 { |
197 QTest::addColumn<bool>("setProxy"); |
194 QTest::addColumn<bool>("setProxy"); |
198 QTest::addColumn<int>("proxyType"); |
195 QTest::addColumn<int>("proxyType"); |
199 |
196 |
200 QTest::newRow("WithoutProxy") << false << 0; |
197 QTest::newRow("WithoutProxy") << false << 0; |
201 #ifdef TEST_QNETWORK_PROXY |
|
202 QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy); |
198 QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy); |
203 #endif |
|
204 } |
199 } |
205 |
200 |
206 void tst_QHttp::initTestCase() |
201 void tst_QHttp::initTestCase() |
207 { |
202 { |
208 } |
203 } |