From 5d3dbbb6d74353e25ec2382b5584ff218e9e0a65 Mon Sep 17 00:00:00 2001
From: Dmitry Degtyarev <kevl@altlinux.org>
Date: Wed, 30 Jun 2021 13:58:28 +0400
Subject: [PATCH] fix membership tab tests

---
 tests/admc_test.cpp               | 22 ++++++++++++++++++++++
 tests/admc_test.h                 |  5 +++++
 tests/admc_test_member_of_tab.cpp |  5 +----
 tests/admc_test_members_tab.cpp   |  5 +----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/tests/admc_test.cpp b/tests/admc_test.cpp
index beb65c98..14fcf938 100644
--- a/tests/admc_test.cpp
+++ b/tests/admc_test.cpp
@@ -236,6 +236,28 @@ void ADMCTest::select_in_select_dialog(SelectObjectDialog *select_dialog, const
     find_select_dialog->accept();
 }
 
+void ADMCTest::select_object_dialog_select(const QString &dn) {
+    auto select_dialog = parent_widget->findChild<SelectObjectDialog *>();
+    QVERIFY(select_dialog != nullptr);
+    
+    auto select_base_widget = select_dialog->findChild<SelectBaseWidget *>();
+    QVERIFY(select_base_widget != nullptr);
+    select_base_widget_add(select_base_widget, test_arena_dn());
+
+    auto edit = select_dialog->findChild<QLineEdit *>("edit");
+    QVERIFY(edit != nullptr);
+
+    auto add_button = select_dialog->findChild<QPushButton *>("add_button");
+    QVERIFY(add_button != nullptr);
+
+    edit->setText(dn_get_name(dn));
+    add_button->click();
+
+    select_dialog->accept();
+
+    delete select_dialog;
+}
+
 void select_base_widget_add(SelectBaseWidget *widget, const QString &dn) {
     auto browse_button = widget->findChild<QPushButton *>();
     QVERIFY(browse_button != nullptr);
diff --git a/tests/admc_test.h b/tests/admc_test.h
index a69c253a..7d4c8f62 100644
--- a/tests/admc_test.h
+++ b/tests/admc_test.h
@@ -107,7 +107,12 @@ protected:
     // open().
     void close_message_box();
 
+    // Selects an object via an already open select object
+    // dialog. Object must be inside test arena
+    void select_object_dialog_select(const QString &dn);
+
 private:
+
 };
 
 void navigate_until_object(QTreeView *view, const QString &target_dn, const int dn_role);
diff --git a/tests/admc_test_member_of_tab.cpp b/tests/admc_test_member_of_tab.cpp
index 7c6eae6b..aaa306ea 100644
--- a/tests/admc_test_member_of_tab.cpp
+++ b/tests/admc_test_member_of_tab.cpp
@@ -116,10 +116,7 @@ void ADMCTestMemberOfTab::remove() {
 void ADMCTestMemberOfTab::add() {
     add_button->click();
 
-    auto select_dialog = member_of_tab->findChild<SelectObjectDialog *>();
-
-    select_in_select_dialog(select_dialog, group_dn);
-    select_dialog->accept();
+    select_object_dialog_select(group_dn);
 
     // Check ui state before applying
     QVERIFY(model->rowCount() == 2);
diff --git a/tests/admc_test_members_tab.cpp b/tests/admc_test_members_tab.cpp
index f45c17d2..5728c61f 100644
--- a/tests/admc_test_members_tab.cpp
+++ b/tests/admc_test_members_tab.cpp
@@ -113,10 +113,7 @@ void ADMCTestMembersTab::remove() {
 void ADMCTestMembersTab::add() {
     add_button->click();
 
-    auto select_dialog = members_tab->findChild<SelectObjectDialog *>();
-
-    select_in_select_dialog(select_dialog, user_dn);
-    select_dialog->accept();
+    select_object_dialog_select(user_dn);
 
     // Check ui state before applying
     QVERIFY(model->rowCount() == 1);