From eb10239db3bccba8da2a74e725155fb1aedbc626 Mon Sep 17 00:00:00 2001
From: Johannes Pohl
Date: Wed, 10 May 2017 18:18:15 +0200
Subject: [PATCH] test participants in compare frame controller
---
src/urh/ui/ui_analysis_frame.py | 26 +++++++++++++-------------
tests/test_project_manager.py | 5 +++++
ui/analysis_frame.ui | 4 ++--
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/urh/ui/ui_analysis_frame.py b/src/urh/ui/ui_analysis_frame.py
index 4d421470..288a140f 100644
--- a/src/urh/ui/ui_analysis_frame.py
+++ b/src/urh/ui/ui_analysis_frame.py
@@ -59,12 +59,12 @@ class Ui_FAnalysis(object):
self.verticalLayout.setObjectName("verticalLayout")
self.tabWidget = QtWidgets.QTabWidget(self.frame_4)
self.tabWidget.setObjectName("tabWidget")
- self.tab = QtWidgets.QWidget()
- self.tab.setObjectName("tab")
- self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.tab)
+ self.tab_protocols = QtWidgets.QWidget()
+ self.tab_protocols.setObjectName("tab_protocols")
+ self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.tab_protocols)
self.verticalLayout_10.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_10.setObjectName("verticalLayout_10")
- self.treeViewProtocols = ProtocolTreeView(self.tab)
+ self.treeViewProtocols = ProtocolTreeView(self.tab_protocols)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -81,7 +81,7 @@ class Ui_FAnalysis(object):
self.treeViewProtocols.setObjectName("treeViewProtocols")
self.treeViewProtocols.header().setVisible(False)
self.verticalLayout_10.addWidget(self.treeViewProtocols)
- self.btnSaveProto = QtWidgets.QToolButton(self.tab)
+ self.btnSaveProto = QtWidgets.QToolButton(self.tab_protocols)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -94,13 +94,13 @@ class Ui_FAnalysis(object):
self.btnSaveProto.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
self.btnSaveProto.setObjectName("btnSaveProto")
self.verticalLayout_10.addWidget(self.btnSaveProto)
- self.tabWidget.addTab(self.tab, "")
- self.tab_2 = QtWidgets.QWidget()
- self.tab_2.setObjectName("tab_2")
- self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.tab_2)
+ self.tabWidget.addTab(self.tab_protocols, "")
+ self.tab_participants = QtWidgets.QWidget()
+ self.tab_participants.setObjectName("tab_participants")
+ self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.tab_participants)
self.verticalLayout_11.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_11.setObjectName("verticalLayout_11")
- self.listViewParticipants = QtWidgets.QListView(self.tab_2)
+ self.listViewParticipants = QtWidgets.QListView(self.tab_participants)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -108,7 +108,7 @@ class Ui_FAnalysis(object):
self.listViewParticipants.setSizePolicy(sizePolicy)
self.listViewParticipants.setObjectName("listViewParticipants")
self.verticalLayout_11.addWidget(self.listViewParticipants)
- self.tabWidget.addTab(self.tab_2, "")
+ self.tabWidget.addTab(self.tab_participants, "")
self.verticalLayout.addWidget(self.tabWidget)
self.cbProtoView = QtWidgets.QComboBox(self.frame_4)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
@@ -510,8 +510,8 @@ class Ui_FAnalysis(object):
_translate = QtCore.QCoreApplication.translate
FAnalysis.setWindowTitle(_translate("FAnalysis", "Frame"))
self.btnSaveProto.setText(_translate("FAnalysis", "Save current protocol..."))
- self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("FAnalysis", "Protocols"))
- self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("FAnalysis", "Participants"))
+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_protocols), _translate("FAnalysis", "Protocols"))
+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_participants), _translate("FAnalysis", "Participants"))
self.cbProtoView.setToolTip(_translate("FAnalysis", "
Set the desired view here.
"))
self.cbProtoView.setItemText(0, _translate("FAnalysis", "Bits"))
self.cbProtoView.setItemText(1, _translate("FAnalysis", "Hex"))
diff --git a/tests/test_project_manager.py b/tests/test_project_manager.py
index 5f0d5060..657f82b8 100644
--- a/tests/test_project_manager.py
+++ b/tests/test_project_manager.py
@@ -123,6 +123,10 @@ class TestProjectManager(QtTestCase):
self.assertEqual(dialog.path, test_path)
dialog.ui.btnOK.click()
+ self.form.ui.tabWidget.setCurrentWidget(self.form.ui.tab_protocol)
+ self.form.compare_frame_controller.ui.tabWidget.setCurrentWidget(self.form.compare_frame_controller.ui.tab_participants)
+ self.assertGreater(self.form.compare_frame_controller.participant_list_model.rowCount(), 0)
+
self.assertTrue(os.path.isdir(test_path))
self.form.project_manager.from_dialog(dialog)
@@ -134,3 +138,4 @@ class TestProjectManager(QtTestCase):
self.assertEqual(dialog.ui.spinBoxGain.value(), gain)
self.assertEqual(dialog.ui.txtEdDescription.toPlainText(), descr)
self.assertFalse(dialog.ui.lineEdit_Path.isEnabled())
+
diff --git a/ui/analysis_frame.ui b/ui/analysis_frame.ui
index a9fceb39..bf383945 100644
--- a/ui/analysis_frame.ui
+++ b/ui/analysis_frame.ui
@@ -96,7 +96,7 @@
0
-
+
Protocols
@@ -172,7 +172,7 @@
-
+
Participants