onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-10 23:22:33 +02:00
Code Issues Releases Wiki Activity

correct way to deal with object clipboard in unit tests; another patch from persgray@gmail.com

Browse Source
This commit is contained in:
Vadim Kurland
2011-07-06 18:42:14 -07:00
parent 758e96a7bb
commit d98250b272
9 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.cpp
+4 -4
View File
@@ -182,10 +182,10 @@ void CustomServiceDialogTest::testDialog()
selectComboItem(platform, "iptables");
dialog->platformChanged();
QTest::mouseClick(ipv6, Qt::LeftButton, Qt::NoModifier, QPoint(10,10));
QVERIFY(service->getAddressFamily() == 10);
QVERIFY(service->getAddressFamily() == AF_INET6);
selectComboItem(platform, "PF");
dialog->platformChanged();
QVERIFY(service->getAddressFamily() == 10);
QVERIFY(service->getAddressFamily() == AF_INET6);
// testing that changing address family does not change platform code
foreach (QString key, platforms.keys())
@@ -193,11 +193,11 @@ void CustomServiceDialogTest::testDialog()
string oldcode = service->getCodeForPlatform(key.toStdString().c_str());
string oldprotocol = service->getProtocol();
QTest::mouseClick(ipv4, Qt::LeftButton, Qt::NoModifier, QPoint(10,10));
QVERIFY(service->getAddressFamily() == 2);
QVERIFY(service->getAddressFamily() == AF_INET);
QVERIFY(oldcode == service->getCodeForPlatform(key.toStdString().c_str()));
QVERIFY(oldprotocol == service->getProtocol());
QTest::mouseClick(ipv6, Qt::LeftButton, Qt::NoModifier, QPoint(10,10));
QVERIFY(service->getAddressFamily() == 10);
QVERIFY(service->getAddressFamily() == AF_INET6);
QVERIFY(oldcode == service->getCodeForPlatform(key.toStdString().c_str()));
QVERIFY(oldprotocol == service->getProtocol());
}
src/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.cpp
+1 -1
View File
@@ -52,6 +52,7 @@ using namespace libfwbuilder;
void RuleSetViewContextMenuTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
mw->show();
mw->move(0,0);
@@ -60,7 +61,6 @@ void RuleSetViewContextMenuTest::initTestCase()
else
mw->resize(1024, 768);
mw->startupLoad();
new FWObjectClipboard();
StartTipDialog *d = mw->findChild<StartTipDialog*>();
if (d!=NULL) d->close();
om = dynamic_cast<ObjectManipulator*>(mw->getCurrentObjectTree()->parent()->parent());
src/unit_tests/RuleSetViewTest/RuleSetViewTest.cpp
+1 -1
View File
@@ -49,11 +49,11 @@ using namespace libfwbuilder;
void RuleSetViewTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
mw->show();
mw->resize(QSize(800,600));
mw->startupLoad();
new FWObjectClipboard();
StartTipDialog *d = mw->findChild<StartTipDialog*>();
if (d) if (d!=NULL) d->close();
om = dynamic_cast<ObjectManipulator*>(mw->getCurrentObjectTree()->parent()->parent());
src/unit_tests/instDialogClusterTest/instDialogClusterTest.cpp
+1 -1
View File
@@ -77,11 +77,11 @@ using namespace libfwbuilder;
void instDialogClusterTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
wfl = new UserWorkflow();
mw->show();
mw->loadFile("test_work.fwb", false);
new FWObjectClipboard();
}
void instDialogClusterTest::openPolicy(QString fwname)
src/unit_tests/instDialogCompileTest/instDialogCompileTest.cpp
+1 -1
View File
@@ -54,10 +54,10 @@ using namespace libfwbuilder;
void instDialogCompileTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
mw->show();
mw->loadFile("test_work.fwb", false);
new FWObjectClipboard();
}
bool checkProgress(QTreeWidget *list)
src/unit_tests/instDialogInspectTest/instDialogInspectTest.cpp
+1 -1
View File
@@ -57,10 +57,10 @@ bool checkProgress(QTreeWidget *list)
void instDialogInspectTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
mw->show();
mw->loadFile("test_work.fwb", false);
new FWObjectClipboard();
dialogClosed = false;
om = mw->findChild<ObjectManipulator*>("om");
tree = mw->activeProject()->getCurrentObjectTree();
src/unit_tests/instDialogInstallTest/instDialogInstallTest.cpp
+1 -1
View File
@@ -128,10 +128,10 @@ bool checkProgress(QTreeWidget *list)
void instDialogInstallTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
mw->show();
mw->loadFile("test_work.fwb", false);
new FWObjectClipboard();
ssh_auth_sock = getenv("SSH_AUTH_SOCK");
}
src/unit_tests/instDialogObjectListTest/instDialogObjectListTest.cpp
+1 -1
View File
@@ -105,10 +105,10 @@ using namespace libfwbuilder;
void instDialogObjectListTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
mw->show();
mw->loadFile("test_work.fwb", false);
new FWObjectClipboard();
}
void instDialogObjectListTest::openPolicy(QString fwname)
src/unit_tests/main/main.cpp
-2
View File
@@ -78,6 +78,4 @@ void build_app(int argc, char** argv,
qt_translator.load(QLatin1String("qt_") + QLocale::system().name(),
qt_resource_dir);
(*app)->installTranslator (&qt_translator);
new FWObjectClipboard();
}