mirror of
https://github.com/altlinux/admc.git
synced 2024-10-27 01:55:37 +03:00
fix compilation of tests
This commit is contained in:
parent
8ee2e033ee
commit
f138911bd2
@ -41,11 +41,9 @@ void ADMCTestAccountOptionEdit::init() {
|
||||
return out;
|
||||
}();
|
||||
|
||||
QList<AttributeEdit *> edit_list;
|
||||
|
||||
for (const AccountOption &option : option_list) {
|
||||
auto check = new QCheckBox(parent_widget);
|
||||
auto edit = new AccountOptionEdit(check, option, &edit_list, parent_widget);
|
||||
auto edit = new AccountOptionEdit(check, option, parent_widget);
|
||||
|
||||
check_map[option] = check;
|
||||
edit_map[option] = edit;
|
||||
|
@ -52,24 +52,22 @@ const QList<AttributeFilter> all_filters = {
|
||||
void ADMCTestAttributesTab::init() {
|
||||
ADMCTest::init();
|
||||
|
||||
attributes_tab = new AttributesTab(&edit_list, parent_widget);
|
||||
add_widget(attributes_tab);
|
||||
view = new QTreeView(parent_widget);
|
||||
filter_button = new QPushButton(parent_widget);
|
||||
edit_button = new QPushButton(parent_widget);
|
||||
auto view_button = new QPushButton(parent_widget);
|
||||
|
||||
filter_menu = attributes_tab->findChild<AttributesTabFilterMenu *>();
|
||||
edit = new AttributesTabEdit(view, filter_button, edit_button, view_button, parent_widget);
|
||||
|
||||
filter_menu = view->findChild<AttributesTabFilterMenu *>();
|
||||
QVERIFY(filter_menu);
|
||||
|
||||
view = attributes_tab->ui->view;
|
||||
|
||||
model = attributes_tab->findChild<QStandardItemModel *>();
|
||||
model = edit->findChild<QStandardItemModel *>();
|
||||
QVERIFY(model);
|
||||
|
||||
proxy = attributes_tab->findChild<QSortFilterProxyModel *>();
|
||||
proxy = edit->findChild<QSortFilterProxyModel *>();
|
||||
QVERIFY(proxy);
|
||||
|
||||
filter_button = attributes_tab->ui->filter_button;
|
||||
|
||||
edit_button = attributes_tab->ui->edit_button;
|
||||
|
||||
// Create test user
|
||||
const QString name = TEST_USER;
|
||||
dn = test_object_dn(name, CLASS_USER);
|
||||
@ -78,7 +76,7 @@ void ADMCTestAttributesTab::init() {
|
||||
|
||||
// Load it into the tab
|
||||
const AdObject object = ad.search_object(dn);
|
||||
AttributeEdit::load(edit_list, ad, object);
|
||||
edit->load(ad, object);
|
||||
|
||||
// NOTE: filters might be messed up in settings by user
|
||||
// so reset it before tests
|
||||
@ -172,7 +170,7 @@ void ADMCTestAttributesTab::apply() {
|
||||
navigate_until_object(view, "description", Qt::DisplayRole);
|
||||
edit_button->click();
|
||||
|
||||
auto list_attribute_dialog = attributes_tab->findChild<ListAttributeDialog *>();
|
||||
auto list_attribute_dialog = view->findChild<ListAttributeDialog *>();
|
||||
QVERIFY(list_attribute_dialog);
|
||||
QVERIFY(QTest::qWaitForWindowExposed(list_attribute_dialog, 1000));
|
||||
|
||||
@ -189,7 +187,7 @@ void ADMCTestAttributesTab::apply() {
|
||||
string_attribute_dialog->accept();
|
||||
list_attribute_dialog->accept();
|
||||
|
||||
AttributeEdit::apply(ad, edit_list, dn);
|
||||
edit->apply(ad, dn);
|
||||
|
||||
const AdObject object = ad.search_object(dn);
|
||||
const QString description_value = object.get_string(ATTRIBUTE_DESCRIPTION);
|
||||
|
@ -46,7 +46,7 @@ private slots:
|
||||
void filter();
|
||||
|
||||
private:
|
||||
AttributesTab *attributes_tab;
|
||||
AttributeEdit *edit;
|
||||
AttributesTabFilterMenu *filter_menu;
|
||||
QTreeView *view;
|
||||
QStandardItemModel *model;
|
||||
|
@ -35,7 +35,7 @@ void ADMCTestCountryEdit::init() {
|
||||
|
||||
combo = new QComboBox(parent_widget);
|
||||
|
||||
edit = new CountryEdit(combo, &edits, parent_widget);
|
||||
edit = new CountryEdit(combo, parent_widget);
|
||||
|
||||
// Create test user
|
||||
const QString name = TEST_USER;
|
||||
|
@ -33,7 +33,7 @@ void ADMCTestDateTimeEdit::init() {
|
||||
|
||||
qedit = new QDateTimeEdit(parent_widget);
|
||||
|
||||
edit = new DateTimeEdit(qedit, ATTRIBUTE_WHEN_CHANGED, &edits, parent_widget);
|
||||
edit = new DateTimeEdit(qedit, ATTRIBUTE_WHEN_CHANGED, parent_widget);
|
||||
|
||||
const QString name = TEST_USER;
|
||||
dn = test_object_dn(name, CLASS_USER);
|
||||
|
@ -39,7 +39,7 @@ void ADMCTestDelegationEdit::init() {
|
||||
auto on_button = new QRadioButton(parent_widget);
|
||||
auto off_button = new QRadioButton(parent_widget);
|
||||
|
||||
edit = new DelegationEdit(off_button, on_button, &edits, parent_widget);
|
||||
edit = new DelegationEdit(off_button, on_button, parent_widget);
|
||||
|
||||
QFETCH_GLOBAL(bool, use_on_button);
|
||||
button = [&]() {
|
||||
|
@ -44,7 +44,7 @@ void ADMCTestExpiryEdit::init() {
|
||||
|
||||
auto widget = new ExpiryWidget(parent_widget);
|
||||
|
||||
edit = new ExpiryEdit(widget, &edits, parent_widget);
|
||||
edit = new ExpiryEdit(widget, parent_widget);
|
||||
|
||||
date_edit = widget->ui->date_edit;
|
||||
|
||||
|
@ -32,7 +32,7 @@ void ADMCTestGpoptionsEdit::init() {
|
||||
|
||||
check = new QCheckBox(parent_widget);
|
||||
|
||||
edit = new GpoptionsEdit(check, &edits, parent_widget);
|
||||
edit = new GpoptionsEdit(check, parent_widget);
|
||||
|
||||
const QString name = TEST_OU;
|
||||
dn = test_object_dn(name, CLASS_OU);
|
||||
|
@ -30,7 +30,7 @@ void ADMCTestGroupScopeEdit::init() {
|
||||
|
||||
combo = new QComboBox(parent_widget);
|
||||
|
||||
edit = new GroupScopeEdit(combo, &edits, parent_widget);
|
||||
edit = new GroupScopeEdit(combo, parent_widget);
|
||||
|
||||
const QString name = TEST_GROUP;
|
||||
dn = test_object_dn(name, CLASS_GROUP);
|
||||
|
@ -30,7 +30,7 @@ void ADMCTestGroupTypeEdit::init() {
|
||||
|
||||
combo = new QComboBox(parent_widget);
|
||||
|
||||
edit = new GroupTypeEdit(combo, &edits, parent_widget);
|
||||
edit = new GroupTypeEdit(combo, parent_widget);
|
||||
|
||||
const QString name = TEST_GROUP;
|
||||
dn = test_object_dn(name, CLASS_GROUP);
|
||||
|
@ -34,7 +34,7 @@ void ADMCTestLogonComputersEdit::init() {
|
||||
|
||||
auto open_dialog_button = new QPushButton(parent_widget);
|
||||
|
||||
edit = new LogonComputersEdit(open_dialog_button, &edits, parent_widget);
|
||||
edit = new LogonComputersEdit(open_dialog_button, parent_widget);
|
||||
|
||||
const QString name = TEST_USER;
|
||||
dn = test_object_dn(name, CLASS_USER);
|
||||
|
@ -34,7 +34,7 @@ void ADMCTestManagerEdit::init() {
|
||||
|
||||
auto manager_widget = new ManagerWidget(parent_widget);
|
||||
|
||||
edit = new ManagerEdit(manager_widget, ATTRIBUTE_MANAGER, &edits, parent_widget);
|
||||
edit = new ManagerEdit(manager_widget, ATTRIBUTE_MANAGER, parent_widget);
|
||||
|
||||
manager_display = manager_widget->ui->manager_display;
|
||||
change_button = manager_widget->ui->change_button;
|
||||
|
@ -35,14 +35,17 @@
|
||||
void ADMCTestMemberOfTab::init() {
|
||||
ADMCTest::init();
|
||||
|
||||
member_of_tab = new MemberOfTab();
|
||||
add_widget(member_of_tab);
|
||||
view = new QTreeView(parent_widget);
|
||||
auto primary_button = new QPushButton(parent_widget);
|
||||
add_button = new QPushButton(parent_widget);
|
||||
remove_button = new QPushButton(parent_widget);
|
||||
auto properties_button = new QPushButton(parent_widget);
|
||||
auto primary_group_label = new QLabel(parent_widget);
|
||||
|
||||
view = member_of_tab->ui->view;
|
||||
model = member_of_tab->findChild<QStandardItemModel *>();
|
||||
edit = new MembershipTabEdit(view, primary_button, add_button, remove_button, properties_button, primary_group_label, MembershipTabType_MemberOf, parent_widget);
|
||||
|
||||
model = edit->findChild<QStandardItemModel *>();
|
||||
QVERIFY(model);
|
||||
add_button = member_of_tab->ui->add_button;
|
||||
remove_button = member_of_tab->ui->remove_button;
|
||||
|
||||
// Create test user
|
||||
const QString user_name = TEST_USER;
|
||||
@ -58,7 +61,7 @@ void ADMCTestMemberOfTab::init() {
|
||||
|
||||
// Load it into the tab
|
||||
const AdObject object = ad.search_object(user_dn);
|
||||
member_of_tab->load(ad, object);
|
||||
edit->load(ad, object);
|
||||
}
|
||||
|
||||
// Loading a group without members should result in empty
|
||||
@ -74,7 +77,7 @@ void ADMCTestMemberOfTab::load() {
|
||||
QVERIFY(add_success);
|
||||
|
||||
const AdObject object = ad.search_object(user_dn);
|
||||
member_of_tab->load(ad, object);
|
||||
edit->load(ad, object);
|
||||
|
||||
QCOMPARE(model->rowCount(), 2);
|
||||
|
||||
@ -105,7 +108,7 @@ void ADMCTestMemberOfTab::remove() {
|
||||
|
||||
remove_button->click();
|
||||
|
||||
member_of_tab->apply(ad, user_dn);
|
||||
edit->apply(ad, user_dn);
|
||||
|
||||
const AdObject updated_object = ad.search_object(user_dn);
|
||||
const QList<QString> member_list = updated_object.get_strings(ATTRIBUTE_MEMBER_OF);
|
||||
@ -120,7 +123,7 @@ void ADMCTestMemberOfTab::add() {
|
||||
select_object_dialog_select(group_dn);
|
||||
|
||||
// Apply and check object state
|
||||
member_of_tab->apply(ad, user_dn);
|
||||
edit->apply(ad, user_dn);
|
||||
const AdObject object = ad.search_object(user_dn);
|
||||
const QList<QString> member_of_list = object.get_strings(ATTRIBUTE_MEMBER_OF);
|
||||
QVERIFY(member_of_list.contains(group_dn));
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "admc_test.h"
|
||||
|
||||
class QTreeView;
|
||||
class MemberOfTab;
|
||||
class AttributeEdit;
|
||||
class QStandardItemModel;
|
||||
class QPushButton;
|
||||
|
||||
@ -40,7 +40,7 @@ private slots:
|
||||
void add();
|
||||
|
||||
private:
|
||||
MemberOfTab *member_of_tab;
|
||||
AttributeEdit *edit;
|
||||
QTreeView *view;
|
||||
QStandardItemModel *model;
|
||||
QString user_dn;
|
||||
|
@ -32,14 +32,17 @@
|
||||
void ADMCTestMembersTab::init() {
|
||||
ADMCTest::init();
|
||||
|
||||
members_tab = new MembersTab();
|
||||
add_widget(members_tab);
|
||||
view = new QTreeView(parent_widget);
|
||||
auto primary_button = new QPushButton(parent_widget);
|
||||
add_button = new QPushButton(parent_widget);
|
||||
remove_button = new QPushButton(parent_widget);
|
||||
auto properties_button = new QPushButton(parent_widget);
|
||||
auto primary_group_label = new QLabel(parent_widget);
|
||||
|
||||
view = members_tab->ui->view;
|
||||
model = members_tab->findChild<QStandardItemModel *>();
|
||||
edit = new MembershipTabEdit(view, primary_button, add_button, remove_button, properties_button, primary_group_label, MembershipTabType_Members, parent_widget);
|
||||
|
||||
model = edit->findChild<QStandardItemModel *>();
|
||||
QVERIFY(model);
|
||||
add_button = members_tab->ui->add_button;
|
||||
remove_button = members_tab->ui->remove_button;
|
||||
|
||||
// Create test user
|
||||
const QString user_name = TEST_USER;
|
||||
@ -55,7 +58,7 @@ void ADMCTestMembersTab::init() {
|
||||
|
||||
// Load it into the tab
|
||||
const AdObject object = ad.search_object(group_dn);
|
||||
members_tab->load(ad, object);
|
||||
edit->load(ad, object);
|
||||
}
|
||||
|
||||
// Loading a group without members should result in empty
|
||||
@ -71,7 +74,7 @@ void ADMCTestMembersTab::load() {
|
||||
QVERIFY(add_success);
|
||||
|
||||
const AdObject object = ad.search_object(group_dn);
|
||||
members_tab->load(ad, object);
|
||||
edit->load(ad, object);
|
||||
|
||||
QCOMPARE(model->rowCount(), 1);
|
||||
|
||||
@ -88,7 +91,7 @@ void ADMCTestMembersTab::remove() {
|
||||
|
||||
remove_button->click();
|
||||
|
||||
members_tab->apply(ad, group_dn);
|
||||
edit->apply(ad, group_dn);
|
||||
|
||||
const AdObject updated_object = ad.search_object(group_dn);
|
||||
const QList<QString> member_list = updated_object.get_strings(ATTRIBUTE_MEMBER);
|
||||
@ -107,7 +110,7 @@ void ADMCTestMembersTab::add() {
|
||||
QCOMPARE(model->item(0, 0)->text(), dn_get_name(user_dn));
|
||||
|
||||
// Apply and check object state
|
||||
members_tab->apply(ad, group_dn);
|
||||
edit->apply(ad, group_dn);
|
||||
const AdObject object = ad.search_object(group_dn);
|
||||
const QList<QString> member_list = object.get_strings(ATTRIBUTE_MEMBER);
|
||||
QCOMPARE(member_list, QList<QString>({user_dn}));
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "admc_test.h"
|
||||
|
||||
class QTreeView;
|
||||
class MembersTab;
|
||||
class AttributeEdit;
|
||||
class QStandardItemModel;
|
||||
class QPushButton;
|
||||
|
||||
@ -40,7 +40,7 @@ private slots:
|
||||
void add();
|
||||
|
||||
private:
|
||||
MembersTab *members_tab;
|
||||
AttributeEdit *edit;
|
||||
QTreeView *view;
|
||||
QStandardItemModel *model;
|
||||
QString user_dn;
|
||||
|
@ -35,7 +35,7 @@ void ADMCTestPasswordEdit::init() {
|
||||
main_edit = new QLineEdit(parent_widget);
|
||||
confirm_edit = new QLineEdit(parent_widget);
|
||||
|
||||
edit = new PasswordEdit(main_edit, confirm_edit, &edits, parent_widget);
|
||||
edit = new PasswordEdit(main_edit, confirm_edit, parent_widget);
|
||||
|
||||
// Create test user
|
||||
const QString name = TEST_USER;
|
||||
|
@ -32,7 +32,7 @@ void ADMCTestStringEdit::init() {
|
||||
|
||||
line_edit = new QLineEdit(parent_widget);
|
||||
|
||||
edit = new StringEdit(line_edit, TEST_ATTRIBUTE, &edits, parent_widget);
|
||||
edit = new StringEdit(line_edit, TEST_ATTRIBUTE, parent_widget);
|
||||
|
||||
// Create test user
|
||||
const QString name = TEST_USER;
|
||||
|
@ -32,7 +32,7 @@ void ADMCTestStringLargeEdit::init() {
|
||||
|
||||
text_edit = new QPlainTextEdit(parent_widget);
|
||||
|
||||
edit = new StringLargeEdit(text_edit, TEST_ATTRIBUTE, &edits, parent_widget);
|
||||
edit = new StringLargeEdit(text_edit, TEST_ATTRIBUTE, parent_widget);
|
||||
|
||||
// Create test user
|
||||
const QString name = TEST_USER;
|
||||
|
@ -48,7 +48,7 @@ void ADMCTestStringOtherEdit::init() {
|
||||
line_edit = new QLineEdit(parent_widget);
|
||||
other_button = new QPushButton(parent_widget);
|
||||
|
||||
edit = new StringOtherEdit(line_edit, other_button, TEST_ATTRIBUTE_MAIN, ATTRIBUTE_WWW_HOMEPAGE_OTHER, &edits, parent_widget);
|
||||
edit = new StringOtherEdit(line_edit, other_button, TEST_ATTRIBUTE_MAIN, ATTRIBUTE_WWW_HOMEPAGE_OTHER, parent_widget);
|
||||
|
||||
// Create test user
|
||||
const QString name = TEST_USER;
|
||||
|
@ -36,7 +36,7 @@ void ADMCTestUnlockEdit::init() {
|
||||
|
||||
checkbox = new QCheckBox(parent_widget);
|
||||
|
||||
unlock_edit = new UnlockEdit(checkbox, &edits, parent_widget);
|
||||
unlock_edit = new UnlockEdit(checkbox, parent_widget);
|
||||
|
||||
// Create test user
|
||||
const QString name = TEST_USER;
|
||||
|
@ -34,7 +34,7 @@ void ADMCTestUpnEdit::init() {
|
||||
prefix_edit = new QLineEdit();
|
||||
suffix_edit = new QComboBox();
|
||||
|
||||
upn_edit = new UpnEdit(prefix_edit, suffix_edit, &edits, parent_widget);
|
||||
upn_edit = new UpnEdit(prefix_edit, suffix_edit, parent_widget);
|
||||
upn_edit->init_suffixes(ad);
|
||||
|
||||
// Create test user
|
||||
|
Loading…
Reference in New Issue
Block a user