diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-05-19 08:10:22 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-05-22 09:09:13 +0000 |
| commit | eef1ebfb60bc4fe24790e5d9ab87bc00722030ae (patch) | |
| tree | 2c73bca88d113a32b0794f80ad2b4355a1f5dc6b /tests | |
| parent | c0700c1a780542ed81a188f2bf6c8a04b1d1a4fa (diff) | |
Change 'Checkable' element behavior
Althogh 'Checkable' value is set to package, that can contain packages to
install. Enabling the install of components using 'Checkable' value.
Change-Id: I05d65fe2da65644872d46bdef3accd5e3f16ad31
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/componentmodel/tst_componentmodel.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/tests/auto/installer/componentmodel/tst_componentmodel.cpp b/tests/auto/installer/componentmodel/tst_componentmodel.cpp index 5d86103a9..d5cae916c 100644 --- a/tests/auto/installer/componentmodel/tst_componentmodel.cpp +++ b/tests/auto/installer/componentmodel/tst_componentmodel.cpp @@ -199,11 +199,12 @@ private slots: model.setRootComponents(rootComponents); testDefaultInheritedModelBehavior(&model, 1); - // select all possible components. As one is uncheckable should result in partial check. + // select all possible components. + // Also uncheckable is checked as that is only 'visually' uncheckedable. model.setCheckedState(ComponentModel::AllChecked); - QCOMPARE(model.checkedState(), ComponentModel::PartiallyChecked); - testModelState(&model, m_defaultChecked + m_defaultPartially + m_defaultUnchecked, - QStringList(), m_uncheckable); + QCOMPARE(model.checkedState(), ComponentModel::AllChecked); + testModelState(&model, m_defaultChecked + m_defaultPartially + m_defaultUnchecked + m_uncheckable, + QStringList(), QStringList()); // deselect all possible components // as the first root is a forced install, should result in partially checked state @@ -234,12 +235,12 @@ private slots: model.setRootComponents(rootComponents); testDefaultInheritedModelBehavior(&model, 1); - // select all possible components. As one is uncheckable should result to partially check + // select all possible components. model.setCheckedState(ComponentModel::AllChecked); - QCOMPARE(model.checkedState(), ComponentModel::PartiallyChecked); - testModelState(&model, m_defaultChecked + m_defaultPartially + m_defaultUnchecked + QCOMPARE(model.checkedState(), ComponentModel::AllChecked); + testModelState(&model, m_defaultChecked + m_defaultPartially + m_defaultUnchecked + m_uncheckable + QStringList(vendorSecondProductVirtual) << vendorThirdProductVirtual, QStringList(), - m_uncheckable); + QStringList()); // deselect all possible components // as the first root is a forced install, should result in partially checked state @@ -272,11 +273,11 @@ private slots: model.setRootComponents(rootComponents); testDefaultInheritedModelBehavior(&model, 1); - // select all possible components. As one is uncheckable should result to partially check + // select all possible components. model.setCheckedState(ComponentModel::AllChecked); - QCOMPARE(model.checkedState(), ComponentModel::PartiallyChecked); - testModelState(&model, m_defaultChecked + m_defaultPartially + m_defaultUnchecked, - QStringList(), m_uncheckable); + QCOMPARE(model.checkedState(), ComponentModel::AllChecked); + testModelState(&model, m_defaultChecked + m_defaultPartially + m_defaultUnchecked+ m_uncheckable, + QStringList(), QStringList()); // deselect all possible components model.setCheckedState(ComponentModel::AllUnchecked); @@ -307,12 +308,12 @@ private slots: model.setRootComponents(rootComponents); testDefaultInheritedModelBehavior(&model, 1); - // select all possible components. As one is uncheckable should result to partially check + // select all possible components. model.setCheckedState(ComponentModel::AllChecked); - QCOMPARE(model.checkedState(), ComponentModel::PartiallyChecked); - testModelState(&model, m_defaultChecked + m_defaultPartially + m_defaultUnchecked + QCOMPARE(model.checkedState(), ComponentModel::AllChecked); + testModelState(&model, m_defaultChecked + m_defaultPartially + m_defaultUnchecked +m_uncheckable + QStringList(vendorSecondProductVirtual) << vendorThirdProductVirtual, QStringList(), - m_uncheckable); + QStringList()); // deselect all possible components model.setCheckedState(ComponentModel::AllUnchecked); |