--- a/qtmobility/tests/auto/qcontactdetails/tst_qcontactdetails.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactdetails/tst_qcontactdetails.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,6 @@
 #include <QtTest/QtTest>
 
 #include "qtcontacts.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -56,9 +55,6 @@
     tst_QContactDetails();
     virtual ~tst_QContactDetails();
 
-private:
-    QContactManagerDataHolder managerDataHolder;
-
 public slots:
     void init();
     void cleanup();
@@ -323,13 +319,11 @@
 
     // test property add [== fail]
     QVERIFY(!c.saveDetail(&d2));
-    QVERIFY(d2.accessConstraints() & QContactDetail::ReadOnly);
     QCOMPARE(c.details(QContactDisplayLabel::DefinitionName).count(), 1);
 
     // test property update [== fail]
     d1 = c.detail<QContactDisplayLabel>();
     QVERIFY(!c.saveDetail(&d1));
-    QVERIFY(d1.accessConstraints() & QContactDetail::ReadOnly);
 
     // test property remove
     QVERIFY(!c.removeDetail(&d1)); // cannot remove display label
@@ -547,6 +541,27 @@
     QCOMPARE(n1.lastName(), QString("Gumboots"));
     QCOMPARE(n1.suffix(), QString("Esquire"));
 
+    // Values based (ql1c)
+    QCOMPARE(n1.value(QContactName::FieldPrefix), QString("Dr"));
+    QCOMPARE(n1.value(QContactName::FieldFirstName), QString("Freddy"));
+    QCOMPARE(n1.value(QContactName::FieldMiddleName), QString("William Preston"));
+    QCOMPARE(n1.value(QContactName::FieldLastName), QString("Gumboots"));
+    QCOMPARE(n1.value(QContactName::FieldSuffix), QString("Esquire"));
+
+    // Values based (const char *)
+    QCOMPARE(n1.value(QContactName::FieldPrefix.latin1()), QString("Dr"));
+    QCOMPARE(n1.value(QContactName::FieldFirstName.latin1()), QString("Freddy"));
+    QCOMPARE(n1.value(QContactName::FieldMiddleName.latin1()), QString("William Preston"));
+    QCOMPARE(n1.value(QContactName::FieldLastName.latin1()), QString("Gumboots"));
+    QCOMPARE(n1.value(QContactName::FieldSuffix.latin1()), QString("Esquire"));
+
+    // Values based (QLatin1String)
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldPrefix)), QString("Dr"));
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldFirstName)), QString("Freddy"));
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldMiddleName)), QString("William Preston"));
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldLastName)), QString("Gumboots"));
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldSuffix)), QString("Esquire"));
+
     // test property add
     QVERIFY(c.saveDetail(&n1));
     QCOMPARE(c.details(QContactName::DefinitionName).count(), 1);