more test fixes

diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php
index d3f7bee1cdc1371a5a50616f09d745a64ac06a00..f32706f41ddb3b8799a741ea3de7da6b220f9af4 100644 (file)
--- a/tests/phpunit/api/v3/ContactTest.php
+++ b/tests/phpunit/api/v3/ContactTest.php
@@ -253,11 +253,12 @@ class api_v3_ContactTest extends CiviUnitTestCase {
 
     $contact = $this->callAPISuccess('contact', 'create', $params);
     $result = $this->callAPISuccess('contact', 'getsingle', array('id' => $contact['id']));
-    $this->assertArrayKeyExists('prefix_id', $result);
-    $this->assertArrayKeyExists('gender_id', $result);
-    $this->assertArrayKeyExists('suffix_id', $result);
-    $this->assertEquals(4, $result['prefix_id']);
-    $this->assertEquals(1, $result['suffix_id']);
+
+    $this->assertArrayKeyExists('individual_prefix', $result);
+    $this->assertArrayKeyExists('individual_suffix', $result);
+    $this->assertArrayKeyExists('gender', $result);
+    $this->assertEquals(4, $result['individual_prefix'][0]);
+    $this->assertEquals(1, $result['individual_suffix'][0]);
   }
 
   /**
@@ -276,12 +277,12 @@ class api_v3_ContactTest extends CiviUnitTestCase {
 
     $contact = $this->callAPISuccess('contact', 'create', $params);
     $result = $this->callAPISuccess('contact', 'getsingle', array('id' => $contact['id']));
-    $this->assertArrayKeyExists('prefix_id', $result);
-    $this->assertArrayKeyExists('gender_id', $result);
-    $this->assertArrayKeyExists('suffix_id', $result);
-    $this->assertEquals(4, $result['prefix_id']);
-    $this->assertEquals(1, $result['suffix_id']);
-    $this->assertEquals(2, $result['gender_id']);
+
+    $this->assertArrayKeyExists('individual_prefix', $result);
+    $this->assertArrayKeyExists('individual_suffix', $result);
+    $this->assertArrayKeyExists('gender', $result);
+    $this->assertEquals(4, $result['individual_prefix'][0]);
+    $this->assertEquals(1, $result['individual_suffix'][0]);
   }
 
   /**