Fix test set up to declare frontend_title

diff --git a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/242_email_on_hold.sql b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/242_email_on_hold.sql
index ec65882e38261310d2ab7b9b4615248bb73ebd98..cea3d7e1e4798fbaf06241be5062df518a4cbbe5 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/242_email_on_hold.sql
+++ b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/242_email_on_hold.sql
@@ -5,4 +5,4 @@ INSERT INTO `civicrm_mapping_field` (`id`, `mapping_id`, `name`, `contact_type`,
 
 INSERT INTO `civicrm_saved_search` (`id`, `form_values`, `mapping_id`, `search_custom_id`) VALUES (75, 'a:7:{s:5:"qfKey";s:32:"30ba24b74dd8ceb5710384b962004599";s:6:"mapper";a:2:{i:1;a:2:{i:0;a:3:{i:0;s:10:"Individual";i:1;s:5:"email";i:2;s:1:" ";}i:1;a:3:{i:0;s:10:"Individual";i:1;s:7:"on_hold";i:2;s:1:" ";}}i:2;a:1:{i:0;a:1:{i:0;s:0:"";}}}s:8:"operator";a:2:{i:1;a:2:{i:0;s:11:"IS NOT NULL";i:1;s:1:"=";}i:2;a:1:{i:0;s:0:"";}}s:5:"value";a:2:{i:1;a:2:{i:0;s:0:"";i:1;s:1:"1";}i:2;a:1:{i:0;s:0:"";}}s:4:"task";s:2:"13";s:8:"radio_ts";s:6:"ts_all";s:11:"uf_group_id";s:0:"";}', 149, NULL);
 
-INSERT INTO `civicrm_group` (`id`, `name`, `title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `refresh_date`, `parents`, `children`, `is_hidden`, `is_reserved`, `created_id`) VALUES (242, '_Integrity__emails_on_hold', '@ Integrity - emails on hold', NULL, NULL, 75, 1, 'User and User Admin Only', ' ( `civicrm_group_contact_cache_242`.group_id = 242 ) ', 'a:10:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:22:"civicrm_state_province";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:33:"`civicrm_group_contact_cache_242`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_242` ON contact_a.id = `civicrm_group_contact_cache_242`.contact_id ";s:6:"gender";i:1;}', 'a:2:{s:15:"civicrm_contact";i:1;s:33:"`civicrm_group_contact_cache_242`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_242` ON contact_a.id = `civicrm_group_contact_cache_242`.contact_id ";}', NULL, NULL, NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `civicrm_group` (`id`, `name`, `title`, `frontend_title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `refresh_date`, `parents`, `children`, `is_hidden`, `is_reserved`, `created_id`) VALUES (242, '_Integrity__emails_on_hold', '@ Integrity - emails on hold','@ Integrity - emails on hold', NULL, NULL, 75, 1, 'User and User Admin Only', ' ( `civicrm_group_contact_cache_242`.group_id = 242 ) ', 'a:10:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:22:"civicrm_state_province";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:33:"`civicrm_group_contact_cache_242`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_242` ON contact_a.id = `civicrm_group_contact_cache_242`.contact_id ";s:6:"gender";i:1;}', 'a:2:{s:15:"civicrm_contact";i:1;s:33:"`civicrm_group_contact_cache_242`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_242` ON contact_a.id = `civicrm_group_contact_cache_242`.contact_id ";}', NULL, NULL, NULL, NULL, NULL, 0, 0, NULL);

diff --git a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/251_empty_email_on_hold.sql b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/251_empty_email_on_hold.sql
index 780bc171d311642422ab1971086092af7d6fb26c..0319f36b8666d3b4544aa52f922de3712cb13c1a 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/251_empty_email_on_hold.sql
+++ b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/251_empty_email_on_hold.sql
@@ -1,3 +1,3 @@
 INSERT INTO `civicrm_saved_search` (`id`, `form_values`, `mapping_id`, `search_custom_id`) VALUES (77, 'a:58:{s:5:"qfKey";s:37:"27e1084e725e5a1d4335639ceb45e4bc_3852";s:12:"hidden_basic";s:1:"1";s:12:"contact_type";a:0:{}s:5:"group";a:0:{}s:10:"group_type";a:0:{}s:21:"group_search_selected";s:5:"group";s:12:"contact_tags";a:0:{}s:9:"sort_name";s:0:"";s:5:"email";s:0:"";s:14:"contact_source";s:0:"";s:9:"job_title";s:0:"";s:10:"contact_id";s:0:"";s:19:"external_identifier";s:0:"";s:7:"uf_user";s:0:"";s:10:"tag_search";s:0:"";s:11:"uf_group_id";s:0:"";s:14:"component_mode";s:1:"1";s:8:"operator";s:3:"AND";s:25:"display_relationship_type";s:0:"";s:15:"privacy_options";a:0:{}s:16:"privacy_operator";s:3:"AND";s:14:"privacy_toggle";s:1:"1";s:13:"email_on_hold";a:1:{s:7:"on_hold";N;}s:30:"preferred_communication_method";a:6:{i:1;s:0:"";i:2;s:0:"";i:3;s:0:"";i:4;s:0:"";i:5;s:0:"";i:6;s:0:"";}s:18:"preferred_language";s:0:"";s:13:"phone_numeric";s:0:"";s:22:"phone_location_type_id";s:0:"";s:19:"phone_phone_type_id";s:0:"";s:15:"hidden_location";s:1:"1";s:14:"street_address";s:0:"";s:15:"postal_code_low";s:0:"";s:16:"postal_code_high";s:0:"";s:4:"city";s:0:"";s:11:"postal_code";s:0:"";s:14:"state_province";a:1:{i:0;s:4:"1641";}s:7:"country";s:0:"";s:13:"prox_distance";s:0:"";s:18:"prox_distance_unit";s:5:"miles";s:12:"world_region";s:0:"";s:21:"hidden_CiviContribute";s:1:"1";s:19:"contribution_source";s:0:"";s:21:"contribution_date_low";s:0:"";s:22:"contribution_date_high";s:0:"";s:23:"contribution_amount_low";s:0:"";s:24:"contribution_amount_high";s:0:"";s:22:"contribution_status_id";a:0:{}s:38:"contribution_thankyou_date_is_not_null";s:0:"";s:37:"contribution_receipt_date_is_not_null";s:0:"";s:24:"contribution_in_honor_of";s:0:"";s:22:"contribution_pay_later";s:0:"";s:22:"contribution_recurring";s:0:"";s:17:"contribution_test";s:0:"";s:27:"contribution_transaction_id";s:0:"";s:25:"contribution_check_number";s:0:"";s:32:"contribution_pcp_display_in_roll";s:0:"";s:24:"contribution_campaign_id";a:0:{}s:4:"task";s:2:"14";s:8:"radio_ts";s:6:"ts_all";}', NULL, NULL);
 
-INSERT INTO `civicrm_group` (`id`, `name`, `title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `refresh_date`, `parents`, `children`, `is_hidden`, `is_reserved`, `created_id`) VALUES (251, 'Qld_All', 'Qld All', 'All contacts with Qld as the State', NULL, 77, 1, 'User and User Admin Only', ' ( `civicrm_group_contact_cache_251`.group_id = 251 ) ', 'a:8:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:33:"`civicrm_group_contact_cache_251`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_251` ON contact_a.id = `civicrm_group_contact_cache_251`.contact_id ";}', 'a:2:{s:15:"civicrm_contact";i:1;s:33:"`civicrm_group_contact_cache_251`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_251` ON contact_a.id = `civicrm_group_contact_cache_251`.contact_id ";}', NULL, NULL, NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `civicrm_group` (`id`, `name`, `title`, `frontend_title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `refresh_date`, `parents`, `children`, `is_hidden`, `is_reserved`, `created_id`) VALUES (251, 'Qld_All', 'Qld All', 'Qld All', 'All contacts with Qld as the State', NULL, 77, 1, 'User and User Admin Only', ' ( `civicrm_group_contact_cache_251`.group_id = 251 ) ', 'a:8:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:33:"`civicrm_group_contact_cache_251`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_251` ON contact_a.id = `civicrm_group_contact_cache_251`.contact_id ";}', 'a:2:{s:15:"civicrm_contact";i:1;s:33:"`civicrm_group_contact_cache_251`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_251` ON contact_a.id = `civicrm_group_contact_cache_251`.contact_id ";}', NULL, NULL, NULL, NULL, NULL, 0, 0, NULL);

diff --git a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/801_pre44_billing_email_smartgroup.sql b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/801_pre44_billing_email_smartgroup.sql
index 48171d8d9b70d8deb8e341dff08575eea483af5f..89e1fd3de24981e013673f73e35c2e897942210b 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/801_pre44_billing_email_smartgroup.sql
+++ b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/801_pre44_billing_email_smartgroup.sql
@@ -9,5 +9,5 @@ INSERT IGNORE INTO `civicrm_mapping_field` (`id`, `mapping_id`, `name`, `contact
 
 INSERT IGNORE INTO `civicrm_saved_search` (`id`, `form_values`, `mapping_id`, `search_custom_id`) VALUES (286, 'a:8:{s:5:"qfKey";s:37:"92bf8874b4cd856436833fba5526a10f_9684";s:6:"mapper";a:2:{i:1;a:5:{i:0;a:3:{i:0;s:10:"Individual";i:1;s:5:"email";i:2;s:1:"5";}i:1;a:2:{i:0;s:10:"Individual";i:1;s:12:"do_not_email";}i:2;a:3:{i:0;s:10:"Individual";i:1;s:14:"state_province";i:2;s:1:"5";}i:3;a:2:{i:0;s:10:"Individual";i:1;s:10:"is_opt_out";}i:4;a:3:{i:0;s:10:"Individual";i:1;s:7:"on_hold";i:2;s:1:"5";}}i:2;a:1:{i:0;a:1:{i:0;s:0:"";}}}s:8:"operator";a:2:{i:1;a:5:{i:0;s:11:"IS NOT NULL";i:1;s:1:"=";i:2;s:1:"=";i:3;s:1:"=";i:4;s:1:"=";}i:2;a:1:{i:0;s:0:"";}}s:5:"value";a:2:{i:1;a:5:{i:0;s:0:"";i:1;s:1:"0";i:2;s:5:"Idaho";i:3;s:1:"0";i:4;s:1:"0";}i:2;a:1:{i:0;s:0:"";}}s:4:"task";s:2:"13";s:8:"radio_ts";s:6:"ts_all";s:11:"uf_group_id";s:0:"";s:14:"component_mode";i:1;}', 315, NULL);
 
-INSERT IGNORE INTO `civicrm_group` (`id`, `name`, `title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `refresh_date`, `parents`, `children`, `is_hidden`, `is_reserved`, `created_id`) VALUES (801, 'Idaho EmailContacts', 'Idaho Email Contacts', NULL, NULL, 286, 1, 'User and User Admin Only', ' ( `civicrm_group_contact_cache_801`.group_id = 801 ) ', 'a:12:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:22:"civicrm_state_province";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:33:"`civicrm_group_contact_cache_801`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_801` ON contact_a.id = `civicrm_group_contact_cache_801`.contact_id ";s:6:"gender";i:1;s:17:"individual_prefix";i:1;s:17:"individual_suffix";i:1;}', 'a:2:{s:15:"civicrm_contact";i:1;s:33:"`civicrm_group_contact_cache_801`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_801` ON contact_a.id = `civicrm_group_contact_cache_801`.contact_id ";}', '\ 12\ 1', '2014-06-26 03:31:03', NULL, NULL, NULL, 0, 0, NULL);
+INSERT IGNORE INTO `civicrm_group` (`id`, `name`, `title`, `frontend_title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `refresh_date`, `parents`, `children`, `is_hidden`, `is_reserved`, `created_id`) VALUES (801, 'Idaho EmailContacts', 'Idaho Email Contacts', 'Idaho Email Contacts', NULL, NULL, 286, 1, 'User and User Admin Only', ' ( `civicrm_group_contact_cache_801`.group_id = 801 ) ', 'a:12:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:22:"civicrm_state_province";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:33:"`civicrm_group_contact_cache_801`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_801` ON contact_a.id = `civicrm_group_contact_cache_801`.contact_id ";s:6:"gender";i:1;s:17:"individual_prefix";i:1;s:17:"individual_suffix";i:1;}', 'a:2:{s:15:"civicrm_contact";i:1;s:33:"`civicrm_group_contact_cache_801`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_801` ON contact_a.id = `civicrm_group_contact_cache_801`.contact_id ";}', '\ 12\ 1', '2014-06-26 03:31:03', NULL, NULL, NULL, 0, 0, NULL);
 

diff --git a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/94_legacy_state_province.sql b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/94_legacy_state_province.sql
index 107518f40410953ae532156063aa1d24db41b6dc..c11d1091da404d488b7aa04d05a8db75dfcc15be 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/94_legacy_state_province.sql
+++ b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/94_legacy_state_province.sql
@@ -8,4 +8,4 @@ INSERT INTO `civicrm_mapping_field` (`id`, `mapping_id`, `name`, `contact_type`,
 (2845, 113, 'state_province', 'Individual', 4, NULL, NULL, NULL, NULL, NULL, 1, '=', 'New York', NULL);
 INSERT INTO `civicrm_saved_search` (`id`, `form_values`, `mapping_id`, `search_custom_id`) VALUES
 (38, 'a:6:{s:6:"mapper";a:2:{i:1;a:5:{i:0;a:3:{i:0;s:10:"Individual";i:1;s:5:"email";i:2;s:1:" ";}i:1;a:2:{i:0;s:10:"Individual";i:1;s:12:"do_not_email";}i:2;a:2:{i:0;s:10:"Individual";i:1;s:10:"is_opt_out";}i:3;a:2:{i:0;s:10:"Individual";i:1;s:10:"first_name";}i:4;a:3:{i:0;s:10:"Individual";i:1;s:14:"state_province";i:2;s:1:" ";}}i:2;a:1:{i:0;a:1:{i:0;s:0:"";}}}s:8:"operator";a:2:{i:1;a:5:{i:0;s:11:"IS NOT NULL";i:1;s:2:"!=";i:2;s:2:"!=";i:3;s:11:"IS NOT NULL";i:4;s:1:"=";}i:2;a:1:{i:0;s:0:"";}}s:5:"value";a:2:{i:1;a:5:{i:0;s:0:"";i:1;s:1:"1";i:2;s:1:"1";i:3;s:0:"";i:4;s:8:"New York";}i:2;a:1:{i:0;s:0:"";}}s:4:"task";s:2:"13";s:8:"radio_ts";s:6:"ts_all";s:11:"uf_group_id";s:0:"";}', '113', NULL);
-INSERT INTO `civicrm_group` (`id`, `name`, `title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `refresh_date`, `parents`, `children`, `is_hidden`, `is_reserved`, `created_id`) VALUES (94, '_null_streets', '@ null streets', NULL, NULL, 38, 1, 'User and User Admin Only', ' ( `civicrm_group_contact_cache_242`.group_id = 94 ) ', 'a:10:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:22:"civicrm_state_province";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:33:"`civicrm_group_contact_cache_94`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_94` ON contact_a.id = `civicrm_group_contact_cache_94`.contact_id ";s:6:"gender";i:1;}', 'a:2:{s:15:"civicrm_contact";i:1;s:33:"`civicrm_group_contact_cache_94`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_94` ON contact_a.id = `civicrm_group_contact_cache_94`.contact_id ";}', NULL, NULL, NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `civicrm_group` (`id`, `name`, `title`, `frontend_title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`, `where_clause`, `select_tables`, `where_tables`, `group_type`, `cache_date`, `refresh_date`, `parents`, `children`, `is_hidden`, `is_reserved`, `created_id`) VALUES (94, '_null_streets', '@ null streets', '@ null streets', NULL, NULL, 38, 1, 'User and User Admin Only', ' ( `civicrm_group_contact_cache_242`.group_id = 94 ) ', 'a:10:{s:15:"civicrm_contact";i:1;s:15:"civicrm_address";i:1;s:22:"civicrm_state_province";i:1;s:15:"civicrm_country";i:1;s:13:"civicrm_email";i:1;s:13:"civicrm_phone";i:1;s:10:"civicrm_im";i:1;s:19:"civicrm_worldregion";i:1;s:33:"`civicrm_group_contact_cache_94`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_94` ON contact_a.id = `civicrm_group_contact_cache_94`.contact_id ";s:6:"gender";i:1;}', 'a:2:{s:15:"civicrm_contact";i:1;s:33:"`civicrm_group_contact_cache_94`";s:136:" LEFT JOIN civicrm_group_contact_cache `civicrm_group_contact_cache_94` ON contact_a.id = `civicrm_group_contact_cache_94`.contact_id ";}', NULL, NULL, NULL, NULL, NULL, 0, 0, NULL);

diff --git a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/primary_multiple_state_province.sql b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/primary_multiple_state_province.sql
index 195e77348897b455ac6bb59a2ef6bd79e66acddb..761209dff25e920cff7e54b8ccdda23eb3d2f15a 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/primary_multiple_state_province.sql
+++ b/tests/phpunit/CRM/Contact/BAO/SavedSearchDataSets/primary_multiple_state_province.sql
@@ -4,4 +4,4 @@ INSERT INTO `civicrm_mapping_field` (`id`, `mapping_id`, `name`, `contact_type`,
 (2846, 114, 'state_province', 'Contact', 0, NULL, NULL, NULL, NULL, NULL, 1, 'IN', '1501,2704', NULL);
 INSERT INTO `civicrm_saved_search` (`id`, `form_values`, `mapping_id`, `search_custom_id`) VALUES
 (333, 'a:5:{s:6:"mapper";a:1:{i:1;a:1:{i:0;a:3:{i:0;s:7:"Contact";i:1;s:14:"state_province";i:2;s:1:" ";}}}s:8:"operator";a:1:{i:1;a:1:{i:0;s:2:"IN";}}s:5:"value";a:1:{i:1;a:1:{i:0;s:9:"1501,2074";}}s:8:"radio_ts";s:6:"ts_all";s:4:"task";s:0:"";}', '114', NULL);
-INSERT INTO `civicrm_group` (`id`, `name`, `title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`) VALUES (98, 'core_2874', 'Core 2874 test group', NULL, NULL, 333, 1, 'User and User Admin Only');
+INSERT INTO `civicrm_group` (`id`, `name`, `frontend_title`, `title`, `description`, `source`, `saved_search_id`, `is_active`, `visibility`) VALUES (98, 'core_2874', 'Core 2874 test group', 'Core 2874 test group', NULL, NULL, 333, 1, 'User and User Admin Only');