From 018afbe4690967351c261a49f97fe416a9c9fde8 Mon Sep 17 00:00:00 2001 From: Marcin Miklas Date: Thu, 23 Sep 2010 09:49:24 +0200 Subject: Fixes: NB#193538 - MComboBox uses wrong logical id for default value. RevBy: Sergiy Details: MCombBox now uses qtn_comm_popup_default as logical value for "Tap to select" text. --- tests/ut_mcombobox/ut_mcombobox.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/ut_mcombobox') diff --git a/tests/ut_mcombobox/ut_mcombobox.cpp b/tests/ut_mcombobox/ut_mcombobox.cpp index 54dbe536..b5206734 100644 --- a/tests/ut_mcombobox/ut_mcombobox.cpp +++ b/tests/ut_mcombobox/ut_mcombobox.cpp @@ -289,7 +289,7 @@ void Ut_MComboBox::testBuiltinModel() // remove current item m_combobox->removeItem(1); QCOMPARE(m_combobox->currentIndex(), -1); - QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("xx_ComboBoxSubtitle")); + QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("qtn_comm_popup_default")); QCOMPARE(spy.count(), 1); QCOMPARE(spy.takeLast()[0], QVariant(-1)); // check that after removing items everything looks ok @@ -350,7 +350,7 @@ void Ut_MComboBox::testModelSwitching() // model changed selection should reset QCOMPARE(m_combobox->currentIndex(), -1); - QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("xx_ComboBoxSubtitle")); + QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("qtn_comm_popup_default")); QCOMPARE(spy.count(), 1); QCOMPARE(spy.takeLast()[0], QVariant(-1)); @@ -378,7 +378,7 @@ void Ut_MComboBox::testStringListModel() // remove current item strListModel->removeRow(1); QCOMPARE(m_combobox->currentIndex(), -1); - QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("xx_ComboBoxSubtitle")); + QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("qtn_comm_popup_default")); // check that after removing items everything looks ok QCOMPARE(m_combobox->count(), 2); m_combobox->setCurrentIndex(1); @@ -413,7 +413,7 @@ void Ut_MComboBox::testStringListModelSetStringList() // change string list completely strListModel->setStringList(QStringList() << "bar0" << "bar1" << "bar2" << "bar3"); QCOMPARE(m_combobox->currentIndex(), -1); - QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("xx_ComboBoxSubtitle")); + QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("qtn_comm_popup_default")); QCOMPARE(spy.count(), 1); QCOMPARE(spy.takeFirst()[0], QVariant(-1)); } -- cgit v1.2.3