Remove references to deprecated preferred_mail_format in tests

diff --git a/tests/fixtures/contacts.json b/tests/fixtures/contacts.json
index 4acb3ce25cfd85147a993be7a98016a8f8f18af6..ba1ddfdd5327d613047edb7704f54203cf4047f7 100644 (file)
--- a/tests/fixtures/contacts.json
+++ b/tests/fixtures/contacts.json
@@ -17,7 +17,6 @@
             "legal_name": null,
             "image_URL": null,
             "preferred_communication_method": null,
-            "preferred_mail_format": null,
             "hash": null,
             "api_key": null,
             "source": null,
@@ -42,7 +41,6 @@
             "legal_name": null,
             "image_URL": null,
             "preferred_communication_method": null,
-            "preferred_mail_format": null,
             "hash": null,
             "api_key": null,
             "source": null,

diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index c0d259b6ae6374efd46ad224a5329d905e98f32f..729c0b3f0e190bf387e81fbe5f613638b343c714 100644 (file)
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -1229,7 +1229,6 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
       'sort_name' => '',
       'display_name' => '',
       'do_not_email' => '',
-      'preferred_mail_format' => '',
       'is_deceased' => '',
       'email' => '',
       'on_hold' => '',

diff --git a/tests/phpunit/CRM/Contact/BAO/ContactTest.php b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
index 761cbaa16f16453ae82c2ebc8aba096a4b0e91fc..973254d8cc8f5469fc56107786148ac2a03c539e 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
@@ -859,7 +859,6 @@ class CRM_Contact_BAO_ContactTest extends CiviUnitTestCase {
       ],
       'contact_source' => 'test contact',
       'external_identifier' => 111222333,
-      'preferred_mail_format' => 'Both',
       'is_opt_out' => 0,
       'legal_identifier' => '123123123123',
       'image_URL' => 'http://imageupdate.com',

diff --git a/tests/phpunit/CRM/Contact/BAO/QueryTest.php b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
index 187dea143f7d6008da88a05da80ac453d4642d56..427add5ff31ea773d52ee588f7948946b7fef9aa 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/QueryTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
@@ -1179,7 +1179,6 @@ civicrm_relationship.is_active = 1 AND
       'is_deceased' => 1,
       'on_hold' => 1,
       'display_name' => 1,
-      'preferred_mail_format' => 1,
     ];
     $numberOfContacts = 2;
 

diff --git a/tests/phpunit/CRM/Core/PseudoConstantTest.php b/tests/phpunit/CRM/Core/PseudoConstantTest.php
index 763f127d59b1030ad3eb2c65879c81475f8dccbb..967c1340fd06eecfaac207fe0d730c2c7cb91c47 100644 (file)
--- a/tests/phpunit/CRM/Core/PseudoConstantTest.php
+++ b/tests/phpunit/CRM/Core/PseudoConstantTest.php
@@ -693,10 +693,6 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase {
           'sample' => ['en_US' => 'English (United States)'],
           'max' => 250,
         ],
-        [
-          'fieldName' => 'preferred_mail_format',
-          'sample' => 'Text',
-        ],
         [
           'fieldName' => 'communication_style_id',
           'sample' => 'Formal',

diff --git a/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql b/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
index 32a9cc7142fc4573bbd1957372f2b6fa0c877755..ca6f7e38b0457194baf282c3255005d955081d0b 100644 (file)
--- a/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
+++ b/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
@@ -42,18 +42,18 @@ INSERT INTO `civicrm_address` (`id`, `contact_id`, `location_type_id`, `is_prima
 -- Dumping data for table `civicrm_contact`
 --
 
-INSERT INTO `civicrm_contact` (`id`, `contact_type`, `contact_sub_type`, `do_not_email`, `do_not_phone`, `do_not_mail`, `do_not_sms`, `do_not_trade`, `is_opt_out`, `legal_identifier`, `external_identifier`, `sort_name`, `display_name`, `nick_name`, `legal_name`, `image_URL`, `preferred_communication_method`, `preferred_language`, `preferred_mail_format`, `hash`, `api_key`, `source`, `first_name`, `middle_name`, `last_name`, `prefix_id`, `suffix_id`, `email_greeting_id`, `email_greeting_custom`, `email_greeting_display`, `postal_greeting_id`, `postal_greeting_custom`, `postal_greeting_display`, `addressee_id`, `addressee_custom`, `addressee_display`, `job_title`, `gender_id`, `birth_date`, `is_deceased`, `deceased_date`, `household_name`, `primary_contact_id`, `organization_name`, `sic_code`, `user_unique_id`, `employer_id`, `is_deleted`, `created_date`, `modified_date`) VALUES
-(1, 'Organization', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Default Organization', 'Default Organization', NULL, 'Default Organization', NULL, NULL, NULL, 'Both', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, 'Default Organization', NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:22'),
-(2, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'merriechowski95@notmail.info', 'merriechowski95@notmail.info', NULL, NULL, NULL, '\ 13\ 1', NULL, 'Both', '748043021', NULL, NULL, NULL, NULL, NULL, 4, NULL, 1, NULL, 'Dear merriechowski95@notmail.info', 1, NULL, 'Dear merriechowski95@notmail.info', 1, NULL, 'merriechowski95@notmail.info', NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:51'),
-(4, 'Individual', NULL, 0, 1, 0, 0, 0, 0, NULL, NULL, 'Dimitrov, Kenny', 'Kenny Dimitrov Sr.', NULL, NULL, NULL, NULL, NULL, 'Both', '-1596099917', NULL, NULL, 'Kenny', 'U', 'Dimitrov', NULL, 2, 1, NULL, 'Dear Kenny', 1, NULL, 'Dear Kenny', 1, NULL, 'Kenny Dimitrov Sr.', NULL, NULL, '1957-10-30', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:45'),
-(6, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Dimitrov, Iris', 'Ms. Iris Dimitrov', NULL, NULL, NULL, '\ 15\ 1', NULL, 'Both', '1205681375', NULL, NULL, 'Iris', 'L', 'Dimitrov', 2, NULL, 1, NULL, 'Dear Iris', 1, NULL, 'Dear Iris', 1, NULL, 'Ms. Iris Dimitrov', NULL, 1, '1965-06-03', 1, '2012-06-27', NULL, NULL, 'United Peace Center', NULL, NULL, NULL, 0, NULL, '2013-05-29 17:59:13'),
-(8, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Muller, Billy', 'Mr. Billy Muller Jr.', NULL, NULL, NULL, NULL, NULL, 'Both', '1431681652', NULL, NULL, 'Billy', '', 'Muller', 3, 1, 1, NULL, 'Dear Billy', 1, NULL, 'Dear Billy', 1, NULL, 'Mr. Billy Muller Jr.', NULL, 2, '1975-06-21', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:59:01'),
-(16, 'Individual', NULL, 1, 0, 0, 0, 0, 0, NULL, NULL, 'Smith, Errol', 'Dr. Errol Smith II', NULL, NULL, NULL, NULL, NULL, 'Both', '-2025612268', NULL, NULL, 'Errol', 'F', 'Smith', 4, 3, 1, NULL, 'Dear Errol', 1, NULL, 'Dear Errol', 1, NULL, 'Dr. Errol Smith II', NULL, 2, '1958-07-23', 1, '2013-05-19', NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:59:06'),
-(19, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Bachman, Lincoln', 'Dr. Lincoln Bachman', NULL, NULL, NULL, '\ 14\ 1', NULL, 'Both', '-320957811', NULL, NULL, 'Lincoln', 'F', 'Bachman', 4, NULL, 1, NULL, 'Dear Lincoln', 1, NULL, 'Dear Lincoln', 1, NULL, 'Dr. Lincoln Bachman', NULL, 2, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:56'),
-(34, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Blackwell, Sanford', 'Mr. Sanford Blackwell III', NULL, NULL, NULL, '\ 13\ 1', NULL, 'Both', '-1083735405', NULL, NULL, 'Sanford', 'T', 'Blackwell', 3, 4, 1, NULL, 'Dear Sanford', 1, NULL, 'Dear Sanford', 1, NULL, 'Mr. Sanford Blackwell III', NULL, 2, '1966-06-14', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:54'),
-(71, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Grant, Megan', 'Dr. Megan Grant', NULL, NULL, NULL, '\ 11\ 1', NULL, 'Both', '597745467', NULL, NULL, 'Megan', '', 'Grant', 4, NULL, 1, NULL, 'Dear Megan', 1, NULL, 'Dear Megan', 1, NULL, 'Dr. Megan Grant', NULL, 1, NULL, 1, '2013-03-17', NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:44'),
-(82, 'Organization', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, ' Empowerment Association', ' Empowerment Association', NULL, NULL, NULL, '\ 14\ 1', NULL, 'Both', '-35644052', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 3, NULL, ' Empowerment Association', NULL, NULL, NULL, 0, NULL, NULL, NULL, ' Empowerment Association', NULL, NULL, NULL, 0, NULL, '2013-05-29 17:59:15'),
-(92, 'Individual', NULL, 1, 0, 0, 0, 0, 0, NULL, NULL, 'Reynolds, Brent', 'Mr. Brent Reynolds', NULL, NULL, NULL, '\ 15\ 1', NULL, 'Both', '547975558', NULL, NULL, 'Brent', 'E', 'Reynolds', 3, NULL, 1, NULL, 'Dear Brent', 1, NULL, 'Dear Brent', 1, NULL, 'Mr. Brent Reynolds', NULL, 2, '1981-07-27', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:50');
+INSERT INTO `civicrm_contact` (`id`, `contact_type`, `contact_sub_type`, `do_not_email`, `do_not_phone`, `do_not_mail`, `do_not_sms`, `do_not_trade`, `is_opt_out`, `legal_identifier`, `external_identifier`, `sort_name`, `display_name`, `nick_name`, `legal_name`, `image_URL`, `preferred_communication_method`, `preferred_language`, `hash`, `api_key`, `source`, `first_name`, `middle_name`, `last_name`, `prefix_id`, `suffix_id`, `email_greeting_id`, `email_greeting_custom`, `email_greeting_display`, `postal_greeting_id`, `postal_greeting_custom`, `postal_greeting_display`, `addressee_id`, `addressee_custom`, `addressee_display`, `job_title`, `gender_id`, `birth_date`, `is_deceased`, `deceased_date`, `household_name`, `primary_contact_id`, `organization_name`, `sic_code`, `user_unique_id`, `employer_id`, `is_deleted`, `created_date`, `modified_date`) VALUES
+(1, 'Organization', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Default Organization', 'Default Organization', NULL, 'Default Organization', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, 'Default Organization', NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:22'),
+(2, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'merriechowski95@notmail.info', 'merriechowski95@notmail.info', NULL, NULL, NULL, '\ 13\ 1', NULL, '748043021', NULL, NULL, NULL, NULL, NULL, 4, NULL, 1, NULL, 'Dear merriechowski95@notmail.info', 1, NULL, 'Dear merriechowski95@notmail.info', 1, NULL, 'merriechowski95@notmail.info', NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:51'),
+(4, 'Individual', NULL, 0, 1, 0, 0, 0, 0, NULL, NULL, 'Dimitrov, Kenny', 'Kenny Dimitrov Sr.', NULL, NULL, NULL, NULL, NULL, '-1596099917', NULL, NULL, 'Kenny', 'U', 'Dimitrov', NULL, 2, 1, NULL, 'Dear Kenny', 1, NULL, 'Dear Kenny', 1, NULL, 'Kenny Dimitrov Sr.', NULL, NULL, '1957-10-30', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:45'),
+(6, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Dimitrov, Iris', 'Ms. Iris Dimitrov', NULL, NULL, NULL, '\ 15\ 1', NULL, '1205681375', NULL, NULL, 'Iris', 'L', 'Dimitrov', 2, NULL, 1, NULL, 'Dear Iris', 1, NULL, 'Dear Iris', 1, NULL, 'Ms. Iris Dimitrov', NULL, 1, '1965-06-03', 1, '2012-06-27', NULL, NULL, 'United Peace Center', NULL, NULL, NULL, 0, NULL, '2013-05-29 17:59:13'),
+(8, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Muller, Billy', 'Mr. Billy Muller Jr.', NULL, NULL, NULL, NULL, NULL, '1431681652', NULL, NULL, 'Billy', '', 'Muller', 3, 1, 1, NULL, 'Dear Billy', 1, NULL, 'Dear Billy', 1, NULL, 'Mr. Billy Muller Jr.', NULL, 2, '1975-06-21', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:59:01'),
+(16, 'Individual', NULL, 1, 0, 0, 0, 0, 0, NULL, NULL, 'Smith, Errol', 'Dr. Errol Smith II', NULL, NULL, NULL, NULL, NULL, '-2025612268', NULL, NULL, 'Errol', 'F', 'Smith', 4, 3, 1, NULL, 'Dear Errol', 1, NULL, 'Dear Errol', 1, NULL, 'Dr. Errol Smith II', NULL, 2, '1958-07-23', 1, '2013-05-19', NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:59:06'),
+(19, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Bachman, Lincoln', 'Dr. Lincoln Bachman', NULL, NULL, NULL, '\ 14\ 1', NULL, '-320957811', NULL, NULL, 'Lincoln', 'F', 'Bachman', 4, NULL, 1, NULL, 'Dear Lincoln', 1, NULL, 'Dear Lincoln', 1, NULL, 'Dr. Lincoln Bachman', NULL, 2, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:56'),
+(34, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Blackwell, Sanford', 'Mr. Sanford Blackwell III', NULL, NULL, NULL, '\ 13\ 1', NULL, '-1083735405', NULL, NULL, 'Sanford', 'T', 'Blackwell', 3, 4, 1, NULL, 'Dear Sanford', 1, NULL, 'Dear Sanford', 1, NULL, 'Mr. Sanford Blackwell III', NULL, 2, '1966-06-14', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:54'),
+(71, 'Individual', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 'Grant, Megan', 'Dr. Megan Grant', NULL, NULL, NULL, '\ 11\ 1', NULL, '597745467', NULL, NULL, 'Megan', '', 'Grant', 4, NULL, 1, NULL, 'Dear Megan', 1, NULL, 'Dear Megan', 1, NULL, 'Dr. Megan Grant', NULL, 1, NULL, 1, '2013-03-17', NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:44'),
+(82, 'Organization', NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, ' Empowerment Association', ' Empowerment Association', NULL, NULL, NULL, '\ 14\ 1', NULL, '-35644052', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 3, NULL, ' Empowerment Association', NULL, NULL, NULL, 0, NULL, NULL, NULL, ' Empowerment Association', NULL, NULL, NULL, 0, NULL, '2013-05-29 17:59:15'),
+(92, 'Individual', NULL, 1, 0, 0, 0, 0, 0, NULL, NULL, 'Reynolds, Brent', 'Mr. Brent Reynolds', NULL, NULL, NULL, '\ 15\ 1', NULL, '547975558', NULL, NULL, 'Brent', 'E', 'Reynolds', 3, NULL, 1, NULL, 'Dear Brent', 1, NULL, 'Dear Brent', 1, NULL, 'Mr. Brent Reynolds', NULL, 2, '1981-07-27', 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '2013-05-29 17:58:50');
 
 --
 -- Dumping data for table `civicrm_contribution`

diff --git a/tests/phpunit/api/v3/APITest.php b/tests/phpunit/api/v3/APITest.php
index df1858f7e97454efebda9687d46c4cfeb270532c..8cbe3b767b2c998f4bb11b857cf42b60d82b2d83 100644 (file)
--- a/tests/phpunit/api/v3/APITest.php
+++ b/tests/phpunit/api/v3/APITest.php
@@ -166,7 +166,7 @@ class api_v3_APITest extends CiviUnitTestCase {
 
     $this->assertTrue(is_numeric($contact['id']));
     $this->assertNotEmpty($contact['title']);
-    // preferred_mail_format preferred_communication_method preferred_language gender_id
+    // preferred_communication_method preferred_language gender_id
     // currency
     $this->assertNotEmpty($contact['currency']);
 

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index 0ac67f6830bdf5acdede10c91f908d61cadf520a..72ad346b42056df18e1ba7db9195bd1ed9ef7913 100644 (file)
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -4324,7 +4324,6 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
       'sort_name' => 'McTesterson, Testy',
       'display_name' => 'Testy McTesterson',
       'preferred_language' => 'en_US',
-      'preferred_mail_format' => 'Both',
       'first_name' => 'Testy',
       'last_name' => 'McTesterson',
       'contact_is_deleted' => '0',

diff --git a/tests/phpunit/api/v3/UtilsTest.php b/tests/phpunit/api/v3/UtilsTest.php
index 2d72d8da0d62989de058c89672b3cf6ef3672dda..06d5dcdb72fc4eca6647a479de18a0d7a3caef21 100644 (file)
--- a/tests/phpunit/api/v3/UtilsTest.php
+++ b/tests/phpunit/api/v3/UtilsTest.php
@@ -329,14 +329,13 @@ class api_v3_UtilsTest extends CiviUnitTestCase {
     $this->assertArrayHasKey('values', $result);
   }
 
-  public function testGetFields_AllOptions() {
-    $result = $this->callAPISuccess('contact', 'getfields', [
+  public function testGetFieldsAllOptions(): void {
+    $result = $this->callAPISuccess('Contact', 'getfields', [
       'options' => [
         'get_options' => 'all',
       ],
     ]);
     $this->assertEquals('Household', $result['values']['contact_type']['options']['Household']);
-    $this->assertEquals('HTML', $result['values']['preferred_mail_format']['options']['HTML']);
   }
 
   public function basicArrayCases() {

diff --git a/tests/phpunit/api/v3/dataset/contact_1.xml b/tests/phpunit/api/v3/dataset/contact_1.xml
index fde1b94a733115b0f474cb760f5486e06ee818fa..7cd015de43a28061d8bb45a6fb2ad5edc8335656 100644 (file)
--- a/tests/phpunit/api/v3/dataset/contact_1.xml
+++ b/tests/phpunit/api/v3/dataset/contact_1.xml
@@ -19,7 +19,6 @@
     <column>legal_name</column>
     <column>image_URL</column>
     <column>preferred_communication_method</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -63,7 +62,6 @@
       <null /><!--  legal_name  -->
       <null /><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
-      <null /><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->

diff --git a/tests/phpunit/api/v3/dataset/contact_17.xml b/tests/phpunit/api/v3/dataset/contact_17.xml
index 4cc7767e1b31c1d542bd47000acaadb7953a51b6..fe39e34d49cf9caa8e88f384ff4ac104bca26dcc 100644 (file)
--- a/tests/phpunit/api/v3/dataset/contact_17.xml
+++ b/tests/phpunit/api/v3/dataset/contact_17.xml
@@ -19,7 +19,6 @@
     <column>legal_name</column>
     <column>image_URL</column>
     <column>preferred_communication_method</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -63,7 +62,6 @@
       <null /><!--  legal_name  -->
       <null /><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
-      <null /><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->

diff --git a/tests/phpunit/api/v3/dataset/contact_hld.xml b/tests/phpunit/api/v3/dataset/contact_hld.xml
index 350ebc99af85bc65d630f70c3c90e9d05b8d7e79..3c5e455bdc9d41a760d5b31fb18d30781db174fc 100644 (file)
--- a/tests/phpunit/api/v3/dataset/contact_hld.xml
+++ b/tests/phpunit/api/v3/dataset/contact_hld.xml
@@ -20,7 +20,6 @@
     <column>image_URL</column>
     <column>preferred_communication_method</column>
     <column>preferred_language</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -69,7 +68,6 @@
       <null /><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
       <null /><!--  preferred_language  -->
-      <null /><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->

diff --git a/tests/phpunit/api/v3/dataset/contact_hld_upd.xml b/tests/phpunit/api/v3/dataset/contact_hld_upd.xml
index be09e851cabe186c27115975ee9567113972ca2e..55c0cb70a1151a2a88c4df9fc961b07ede2d9021 100644 (file)
--- a/tests/phpunit/api/v3/dataset/contact_hld_upd.xml
+++ b/tests/phpunit/api/v3/dataset/contact_hld_upd.xml
@@ -20,7 +20,6 @@
     <column>image_URL</column>
     <column>preferred_communication_method</column>
     <column>preferred_language</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -69,7 +68,6 @@
       <null /><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
       <value></value><!--  preferred_language  -->
-      <null /><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->

diff --git a/tests/phpunit/api/v3/dataset/contact_ind.xml b/tests/phpunit/api/v3/dataset/contact_ind.xml
index f942f1ca7aa959c3b794c4254017d24b208d7a7a..30a60af0c50ebbfcdcecf01c9b1b67c337e5ba27 100644 (file)
--- a/tests/phpunit/api/v3/dataset/contact_ind.xml
+++ b/tests/phpunit/api/v3/dataset/contact_ind.xml
@@ -20,7 +20,6 @@
     <column>image_URL</column>
     <column>preferred_communication_method</column>
     <column>preferred_language</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -69,7 +68,6 @@
       <null /><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
       <null />en_US<!--  preferred_language  -->
-      <null /><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->

diff --git a/tests/phpunit/api/v3/dataset/contact_ind_upd.xml b/tests/phpunit/api/v3/dataset/contact_ind_upd.xml
index 2bdc7ea27ca0c88ef29b6a90e1785da54043a18c..561018111c38dab314768da1a7c4dd3c499136c5 100644 (file)
--- a/tests/phpunit/api/v3/dataset/contact_ind_upd.xml
+++ b/tests/phpunit/api/v3/dataset/contact_ind_upd.xml
@@ -20,7 +20,6 @@
     <column>image_URL</column>
     <column>preferred_communication_method</column>
     <column>preferred_language</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -69,7 +68,6 @@
       <value>http://some.url.com/image.jpg</value><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
       <value></value><!--  preferred_language  -->
-      <value>HTML</value><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->

diff --git a/tests/phpunit/api/v3/dataset/contact_org.xml b/tests/phpunit/api/v3/dataset/contact_org.xml
index 716c2bb3b138bbac2c6dab9d61cb7cf338812c36..fda5ebefaf73d8454342de6a09ce6f4953318b7b 100644 (file)
--- a/tests/phpunit/api/v3/dataset/contact_org.xml
+++ b/tests/phpunit/api/v3/dataset/contact_org.xml
@@ -20,7 +20,6 @@
     <column>image_URL</column>
     <column>preferred_communication_method</column>
     <column>preferred_language</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -69,7 +68,6 @@
       <null /><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
       <null />en_US<!--  preferred_language  -->
-      <null /><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->

diff --git a/tests/phpunit/api/v3/dataset/contact_org_upd.xml b/tests/phpunit/api/v3/dataset/contact_org_upd.xml
index f6b2984aee86f231188e355bcde27cf33920a32b..28f20319f0d28a17cdbe222a4d573766d3605730 100644 (file)
--- a/tests/phpunit/api/v3/dataset/contact_org_upd.xml
+++ b/tests/phpunit/api/v3/dataset/contact_org_upd.xml
@@ -20,7 +20,6 @@
     <column>image_URL</column>
     <column>preferred_communication_method</column>
     <column>preferred_language</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -69,7 +68,6 @@
       <null /><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
       <value></value><!--  preferred_language  -->
-      <null /><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->

diff --git a/tests/phpunit/api/v3/dataset/mailing_contact.xml b/tests/phpunit/api/v3/dataset/mailing_contact.xml
index d4d1ddc9eaed21a501a6a3ee6911e466884607ae..914ccab1a2e5afd02a82f9a58f2b6f13c009071a 100644 (file)
--- a/tests/phpunit/api/v3/dataset/mailing_contact.xml
+++ b/tests/phpunit/api/v3/dataset/mailing_contact.xml
@@ -20,7 +20,6 @@
     <column>image_URL</column>
     <column>preferred_communication_method</column>
     <column>preferred_language</column>
-    <column>preferred_mail_format</column>
     <column>hash</column>
     <column>api_key</column>
     <column>source</column>
@@ -69,7 +68,6 @@
       <null /><!--  image_URL  -->
       <null /><!--  preferred_communication_method  -->
       <null />en_US<!--  preferred_language  -->
-      <null /><!--  preferred_mail_format  -->
       <null /><!--  hash  -->
       <null /><!--  api_key  -->
       <null /><!--  source  -->