--- a/telutils/dialpad/tsrc/unit/ut_dialpadnumericbutton/ut_dialpadnumericbutton.cpp	Fri Sep 03 13:59:20 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadnumericbutton/ut_dialpadnumericbutton.cpp	Fri Sep 17 17:09:13 2010 +0300
@@ -31,9 +31,9 @@
     void initTestCase();
     void cleanupTestCase();
 
-    void testSetText();
-    void testSetSecondaryText();
-    void testSetSecondary2ndRowText();
+    void testSetPrimaryLabel();
+    void testSetSecondaryLabel();
+    void testSetSecondaryLableRow2();
     void testSetIcon();
 
 private:
@@ -50,20 +50,28 @@
     delete mButton;
 }
 
-void ut_DialpadNumericButton::testSetText()
+void ut_DialpadNumericButton::testSetPrimaryLabel()
 {
-    QVERIFY(mButton->text().isNull());
-    mButton->setText(QLatin1String("Primary text"));
-    QVERIFY(mButton->text() == QLatin1String("Primary text"));
+    QVERIFY(mButton->primaryLabel().isNull());
+    mButton->setPrimaryLabel(QLatin1String("Primary text"));
+    QVERIFY(mButton->primaryLabel() == QLatin1String("Primary text"));
 }
 
-void ut_DialpadNumericButton::testSetSecondaryText()
+void ut_DialpadNumericButton::testSetSecondaryLabel()
 {
-    QVERIFY(mButton->secondaryText().isNull());
-    mButton->setSecondaryText(QLatin1String("Secondary text"));
-    QVERIFY(mButton->secondaryText() == QLatin1String("Secondary text"));
+    QVERIFY(mButton->secondaryLabel().isNull());
+    mButton->setSecondaryLabel(QLatin1String("Secondary text"));
+    QVERIFY(mButton->secondaryLabel() == QLatin1String("Secondary text"));
 }
 
+void ut_DialpadNumericButton::testSetSecondaryLableRow2()
+{
+    QVERIFY(mButton->secondaryLabelRow2().isNull());
+    mButton->setSecondaryLabelRow2(QLatin1String("Secondary 2nd row text"));
+    QVERIFY(mButton->secondaryLabelRow2() == QLatin1String("Secondary 2nd row text"));
+}
+
+
 void ut_DialpadNumericButton::testSetIcon()        
 {
     HbIcon icon(QLatin1String("dummy.svg"));
@@ -75,12 +83,5 @@
     QVERIFY(mButton->icon().color() == Qt::white);
 }
 
-void ut_DialpadNumericButton::testSetSecondary2ndRowText()
-{
-    QVERIFY(mButton->secondary2ndRowText().isNull());
-    mButton->setSecondary2ndRowText(QLatin1String("Secondary 2nd row text"));
-    QVERIFY(mButton->secondary2ndRowText() == QLatin1String("Secondary 2nd row text"));
-}
-
 DIALPAD_TEST_MAIN(ut_DialpadNumericButton)
 #include "ut_dialpadnumericbutton.moc"