From 97d5a31f1da78821641e083e0336444b67cc56fe Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 6 Jun 2013 14:55:11 +1200 Subject: [PATCH] clean trailing spaces from tests folder in prep --- CRM/Core/BAO/CustomField.php | 2 +- CRM/Core/Config/Variables.php | 2 +- .../Search/Custom/GroupTestDataProvider.php | 6 +++--- .../CRM/Contact/Form/Search/Custom/dataset.xml | 4 ++-- tests/phpunit/CRM/Utils/Cache/SqlGroupTest.php | 2 +- .../phpunit/CiviTest/civicrm.settings.dist.php | 2 +- .../phpunit/WebTest/Profile/ProfileAddTest.php | 18 +++++++++--------- .../phpunit/api/v3/dataset/financial_types.xml | 10 +++++----- .../api/v3/dataset/financial_types_account.xml | 10 +++++----- tests/phpunit/api/v3/dataset/group_nesting.xml | 2 +- .../api/v3/dataset/group_subscribers.xml | 2 +- .../api/v3/dataset/option_value_activity.xml | 6 +++--- .../option_value_contribution_status.xml | 6 +++--- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index eae36c04d0..f6687f5c65 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -962,7 +962,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { case 'RichTextEditor': $attributes = array('rows' => $field->note_rows, 'cols' => $field->note_columns); if ($field->text_length) { - $attributes['maxlength'] = $field->text_length; + $attributes['maxlength'] = $field->text_length; } $qf->addWysiwyg($elementName, $label, $attributes, $search); break; diff --git a/CRM/Core/Config/Variables.php b/CRM/Core/Config/Variables.php index c06c81e55f..cec65cc7fe 100644 --- a/CRM/Core/Config/Variables.php +++ b/CRM/Core/Config/Variables.php @@ -452,7 +452,7 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults { * Path to wkhtmltopdf if available */ public $wkhtmltopdfPath = FALSE; - + /** * Allow second-degree relations permission to edit contacts */ diff --git a/tests/phpunit/CRM/Contact/Form/Search/Custom/GroupTestDataProvider.php b/tests/phpunit/CRM/Contact/Form/Search/Custom/GroupTestDataProvider.php index fd1cd9d833..aded5286d3 100644 --- a/tests/phpunit/CRM/Contact/Form/Search/Custom/GroupTestDataProvider.php +++ b/tests/phpunit/CRM/Contact/Form/Search/Custom/GroupTestDataProvider.php @@ -73,7 +73,7 @@ class CRM_Contact_Form_Search_Custom_GroupTestDataProvider implements Iterator { array('fv' => array('includeGroups' => array('3', '5')), 'id' => array( '13', '14', '15', '16', '17', '18', - '19', '20', '21', '22', '23', '24', + '19', '20', '21', '22', '23', '24', '27', '28', ), ), @@ -86,7 +86,7 @@ class CRM_Contact_Form_Search_Custom_GroupTestDataProvider implements Iterator { // Exclude tag 7 array('fv' => array('excludeTags' => array('7')), 'id' => array( - '9', '10', '13', '14', '17', '18', + '9', '10', '13', '14', '17', '18', '21', '22', '27', ), ), @@ -126,7 +126,7 @@ class CRM_Contact_Form_Search_Custom_GroupTestDataProvider implements Iterator { 'andOr' => 0, ), 'id' => array( - '11', '12', '15', '16', '17', '18', + '11', '12', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '26', '27', '28', ), diff --git a/tests/phpunit/CRM/Contact/Form/Search/Custom/dataset.xml b/tests/phpunit/CRM/Contact/Form/Search/Custom/dataset.xml index e47915c5da..1ae6e31f87 100644 --- a/tests/phpunit/CRM/Contact/Form/Search/Custom/dataset.xml +++ b/tests/phpunit/CRM/Contact/Form/Search/Custom/dataset.xml @@ -215,12 +215,12 @@ /> set('bar', $barValue); $this->assertDBQuery(2, 'SELECT count(*) FROM civicrm_cache WHERE group_name = "testSameInstance"'); $this->assertEquals($a->get('bar'), 45.78); - + $a->delete('foo'); $this->assertDBQuery(1, 'SELECT count(*) FROM civicrm_cache WHERE group_name = "testSameInstance"'); diff --git a/tests/phpunit/CiviTest/civicrm.settings.dist.php b/tests/phpunit/CiviTest/civicrm.settings.dist.php index 96ef2d551a..4ef32fc7f7 100644 --- a/tests/phpunit/CiviTest/civicrm.settings.dist.php +++ b/tests/phpunit/CiviTest/civicrm.settings.dist.php @@ -59,7 +59,7 @@ global $civicrm_root; if (empty($civicrm_root)) { $civicrm_root = dirname (dirname (dirname (dirname( __FILE__ ) ))); } -#$civicrm_root = '/var/www/drupal7.dev.civicrm.org/public/sites/devel.drupal7.tests.dev.civicrm.org/modules/civicrm'; +#$civicrm_root = '/var/www/drupal7.dev.civicrm.org/public/sites/devel.drupal7.tests.dev.civicrm.org/modules/civicrm'; // set this to a temporary directory. it defaults to /tmp/civi on linux //define( 'CIVICRM_TEMPLATE_COMPILEDIR', 'the/absolute/path/' ); diff --git a/tests/phpunit/WebTest/Profile/ProfileAddTest.php b/tests/phpunit/WebTest/Profile/ProfileAddTest.php index d1e36886d5..900af3d09c 100644 --- a/tests/phpunit/WebTest/Profile/ProfileAddTest.php +++ b/tests/phpunit/WebTest/Profile/ProfileAddTest.php @@ -119,11 +119,11 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase { function testProfileAddContactstoGroup() { $this->webtestLogin(); - + // take group name and create group $groupName = 'group_' . substr(sha1(rand()), 0, 7); $this->WebtestAddGroup($groupName); - + // Add new profile. $this->openCiviPage('admin/uf/group', 'reset=1'); @@ -143,7 +143,7 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase { //click on save $this->clickLink('_qf_Group_next'); - + //check for profile create $this->waitForText('crm-notification-container', "Your CiviCRM Profile '{$profileTitle}' has been added. You can add fields to this profile now."); @@ -159,7 +159,7 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase { $this->click("//option[@value='$type']"); $this->click('field_name_1'); $this->select('field_name_1', "value=$field"); - $this->clickLink('_qf_Field_next_new-top'); + $this->clickLink('_qf_Field_next_new-top'); } // create mode @@ -171,7 +171,7 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase { $this->type('last_name', $lastName1); $this->type('email-Primary', "$firstName1.$lastName1@example.com"); $this->clickLink('_qf_Edit_next', NULL); - + //anonymous contact $this->webtestLogout(); $this->openCiviPage('profile/create', "gid=$gid&reset=1", NULL); @@ -181,7 +181,7 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase { $this->type('last_name', $lastName2); $this->type('email-Primary', "$firstName2.$lastName2@example.com"); $this->clickLink('_qf_Edit_next', NULL); - + $this->webtestLogin(); //check the existence of the two contacts in the group $this->openCiviPage('group', 'reset=1'); @@ -190,8 +190,8 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase { $this->waitForVisible('crm-group-selector_processing'); $this->waitForElementPresent("xpath=//table[@id='crm-group-selector']/tbody/tr/td[contains(text(), '$groupName')]/following-sibling::td[@class='crm-group-group_links']/span/a"); $this->clickLink("xpath=//table[@id='crm-group-selector']/tbody/tr/td[1][text()= '$groupName']/following-sibling::td[@class='crm-group-group_links']/span/a"); - $contactEmails = array( - 1 => "$lastName1, $firstName1", + $contactEmails = array( + 1 => "$lastName1, $firstName1", 2 => "$lastName2, $firstName2" ); foreach ($contactEmails as $row => $name) { @@ -223,7 +223,7 @@ class WebTest_Profile_ProfileAddTest extends CiviSeleniumTestCase { $this->openCiviPage('admin/uf/group', 'reset=1'); $this->_testdeleteProfile($profileTitle); } - + function _testdeleteProfile($profileTitle) { //$this->waitForPageToLoad($this->getTimeoutMsec()); $this->waitForElementPresent("//div[@id='user-profiles']/div/div/table/tbody//tr/td[1]/span[text() = '$profileTitle']/../following-sibling::td[4]/span[2][text()='more']/ul/li[4]/a[text()='Delete']"); diff --git a/tests/phpunit/api/v3/dataset/financial_types.xml b/tests/phpunit/api/v3/dataset/financial_types.xml index cd736ff9a3..72e3278028 100644 --- a/tests/phpunit/api/v3/dataset/financial_types.xml +++ b/tests/phpunit/api/v3/dataset/financial_types.xml @@ -11,15 +11,15 @@ Gift For some worthwhile cause 0 - - 1 + + 1 Prize Also for some worthwhile cause 0 - - 1 - + + 1 + diff --git a/tests/phpunit/api/v3/dataset/financial_types_account.xml b/tests/phpunit/api/v3/dataset/financial_types_account.xml index e374e1b07e..cac87380f2 100644 --- a/tests/phpunit/api/v3/dataset/financial_types_account.xml +++ b/tests/phpunit/api/v3/dataset/financial_types_account.xml @@ -11,15 +11,15 @@ 10 civicrm_financial_type 10 - 1 - 1 + 1 + 1 11 civicrm_financial_type 11 - 1 - 1 - + 1 + 1 + diff --git a/tests/phpunit/api/v3/dataset/group_nesting.xml b/tests/phpunit/api/v3/dataset/group_nesting.xml index 6563916493..521ca1d7ac 100644 --- a/tests/phpunit/api/v3/dataset/group_nesting.xml +++ b/tests/phpunit/api/v3/dataset/group_nesting.xml @@ -24,6 +24,6 @@ 4 2 4 - + diff --git a/tests/phpunit/api/v3/dataset/group_subscribers.xml b/tests/phpunit/api/v3/dataset/group_subscribers.xml index 887f1d1581..0f9b9eca03 100644 --- a/tests/phpunit/api/v3/dataset/group_subscribers.xml +++ b/tests/phpunit/api/v3/dataset/group_subscribers.xml @@ -71,6 +71,6 @@ 0 - + diff --git a/tests/phpunit/api/v3/dataset/option_value_activity.xml b/tests/phpunit/api/v3/dataset/option_value_activity.xml index d91cc553f4..8bc33e0c0e 100644 --- a/tests/phpunit/api/v3/dataset/option_value_activity.xml +++ b/tests/phpunit/api/v3/dataset/option_value_activity.xml @@ -115,7 +115,7 @@ 0 1 - + 2 @@ -131,7 +131,7 @@ 1 1 9 - + id @@ -176,6 +176,6 @@ 001 - +
diff --git a/tests/phpunit/api/v3/dataset/option_value_contribution_status.xml b/tests/phpunit/api/v3/dataset/option_value_contribution_status.xml index 426e48320e..f4f4562008 100644 --- a/tests/phpunit/api/v3/dataset/option_value_contribution_status.xml +++ b/tests/phpunit/api/v3/dataset/option_value_contribution_status.xml @@ -67,7 +67,7 @@ 1 - + 66 11 @@ -101,7 +101,7 @@ 1 - + 63 11 @@ -118,6 +118,6 @@ 1 - + -- 2.25.1