clean trailing spaces from tests folder in prep

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index eae36c04d0a8d66150792f0ea208caefb7e136fb..f6687f5c6587fc9345e46a7d17563c7dcdccbcda 100644 (file)
--- 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 c06c81e55f0bbd5a93c6f9e41d3ba1fb4988ebe4..cec65cc7fedd81754022a08d7deab328b25591a1 100644 (file)
--- 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 fd1cd9d83391ad98bc7bdcfdb0152b85adecaab5..aded5286d3561942fa642962dad23fd09a65a414 100644 (file)
--- 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 e47915c5da88e942241f00691a705fc66fd997d7..1ae6e31f87525a5b444d36a31cbe7d444b49a8cd 100644 (file)
--- a/tests/phpunit/CRM/Contact/Form/Search/Custom/dataset.xml
+++ b/tests/phpunit/CRM/Contact/Form/Search/Custom/dataset.xml
@@ -215,12 +215,12 @@
     />
     <civicrm_entity_tag
         entity_id="14"
-        entity_table="civicrm_contact" 
+        entity_table="civicrm_contact"
         tag_id="9"
     />
     <civicrm_entity_tag
         entity_id="16"
-        entity_table="civicrm_contact" 
+        entity_table="civicrm_contact"
         tag_id="9"
     />
     <civicrm_entity_tag

diff --git a/tests/phpunit/CRM/Utils/Cache/SqlGroupTest.php b/tests/phpunit/CRM/Utils/Cache/SqlGroupTest.php
index 4f07998e33da3ecb6bff531aafdf33be8910b23d..d8785186d3d15c9814f1ba2520b0bdd6ee7ddc4b 100644 (file)
--- a/tests/phpunit/CRM/Utils/Cache/SqlGroupTest.php
+++ b/tests/phpunit/CRM/Utils/Cache/SqlGroupTest.php
@@ -28,7 +28,7 @@ class CRM_Utils_Cache_SqlGroupTest extends CiviUnitTestCase {
     $a->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 96ef2d551ab7e5b25b700fbb0c210ac58f281f22..4ef32fc7f737ce22a2e6dc0f20d3e12b35c3bf5c 100644 (file)
--- 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 d1e36886d5fe247b88d4b9ea143624b9a492ed34..900af3d09c00c130f1d083028f89a4e42de519a4 100644 (file)
--- 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 cd736ff9a34af314867c964c3e8552899566e05d..72e327802897398766b4e553789fc96dfbbe5293 100644 (file)
--- a/tests/phpunit/api/v3/dataset/financial_types.xml
+++ b/tests/phpunit/api/v3/dataset/financial_types.xml
@@ -11,15 +11,15 @@
       <value>Gift</value>  <!--  name  -->
       <value>For some worthwhile cause</value>  <!--  description  -->
       <value>0</value>  <!--  is_deductible  -->
-      <null />  <!--  is_reserved  -->      
-      <value>1</value>  <!--  is_active  --> 
+      <null />  <!--  is_reserved  -->
+      <value>1</value>  <!--  is_active  -->
     </row>
     <row>
       <value>Prize</value>  <!--  name  -->
       <value>Also for some worthwhile cause</value>  <!--  description  -->
       <value>0</value>  <!--  is_deductible  -->
-      <null />  <!--  is_reserved  -->      
-      <value>1</value>  <!--  is_active  -->     
-    </row>    
+      <null />  <!--  is_reserved  -->
+      <value>1</value>  <!--  is_active  -->
+    </row>
   </table>
 </dataset>

diff --git a/tests/phpunit/api/v3/dataset/financial_types_account.xml b/tests/phpunit/api/v3/dataset/financial_types_account.xml
index e374e1b07e4a22c8d803fffec725686bb237e571..cac87380f26dd9ab225a249d0b06910cdc533c77 100644 (file)
--- a/tests/phpunit/api/v3/dataset/financial_types_account.xml
+++ b/tests/phpunit/api/v3/dataset/financial_types_account.xml
@@ -11,15 +11,15 @@
       <value>10</value>  <!--  id  -->
       <value>civicrm_financial_type</value>  <!-- entity_table   -->
       <value>10</value>  <!--  entity_id  -->
-      <value>1</value>  <!-- account_relationship   -->   
-      <value>1</value>  <!-- financial_account_id   --> 
+      <value>1</value>  <!-- account_relationship   -->
+      <value>1</value>  <!-- financial_account_id   -->
     </row>
     <row>
       <value>11</value>  <!--  id  -->
       <value>civicrm_financial_type</value>  <!-- entity_table   -->
       <value>11</value>  <!--  entity_id  -->
-      <value>1</value>  <!-- account_relationship   -->   
-      <value>1</value>  <!-- financial_account_id   -->      
-    </row>    
+      <value>1</value>  <!-- account_relationship   -->
+      <value>1</value>  <!-- financial_account_id   -->
+    </row>
   </table>
 </dataset>

diff --git a/tests/phpunit/api/v3/dataset/group_nesting.xml b/tests/phpunit/api/v3/dataset/group_nesting.xml
index 6563916493423f729ad7532edae606a43d5fa3ef..521ca1d7aca0677d0d51c081926fc1780d4ffce5 100644 (file)
--- a/tests/phpunit/api/v3/dataset/group_nesting.xml
+++ b/tests/phpunit/api/v3/dataset/group_nesting.xml
@@ -24,6 +24,6 @@
       <value>4</value>  <!--  id  -->
       <value>2</value>  <!--  parent_group_id  -->
       <value>4</value>  <!--  child_group_id  -->
-    </row>    
+    </row>
   </table>
 </dataset>

diff --git a/tests/phpunit/api/v3/dataset/group_subscribers.xml b/tests/phpunit/api/v3/dataset/group_subscribers.xml
index 887f1d1581c31791c814a47635589194755b71d7..0f9b9eca035d04be7097b2e63946a799415a631a 100644 (file)
--- a/tests/phpunit/api/v3/dataset/group_subscribers.xml
+++ b/tests/phpunit/api/v3/dataset/group_subscribers.xml
@@ -71,6 +71,6 @@
       <null />  <!--  parents  -->
       <null />  <!--  children  -->
       <value>0</value>  <!--  is_hidden  -->
-    </row>    
+    </row>
   </table>
 </dataset>

diff --git a/tests/phpunit/api/v3/dataset/option_value_activity.xml b/tests/phpunit/api/v3/dataset/option_value_activity.xml
index d91cc553f49107c679ca8fd8fd21c5267b08bc7d..8bc33e0c0e49d5a871e00afcc62262772f0e3c08 100644 (file)
--- a/tests/phpunit/api/v3/dataset/option_value_activity.xml
+++ b/tests/phpunit/api/v3/dataset/option_value_activity.xml
@@ -115,7 +115,7 @@
       <value>0</value>
       <value>1</value>
       <null />
-    </row>    
+    </row>
     <row>
       <null />
       <value>2</value>
@@ -131,7 +131,7 @@
       <value>1</value>
       <value>1</value>
       <value>9</value>
-    </row> 
+    </row>
   </table>
   <table name="civicrm_option_value">
     <column>id</column>
@@ -176,6 +176,6 @@
       <value>0</value>
       <value>0</value>
       <value>1</value>
-    </row>    
+    </row>
   </table>
 </dataset>

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 426e48320e420fdcbcd33a6525633f59532bcf35..f4f456200871b91d5c1386e5b6abc08007014154 100644 (file)
--- 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 @@
       <value>1</value>          <!--  is_active  -->
       <null />                  <!--  component_id  -->
       <null />                  <!--  visibility_id  -->
-    </row>    
+    </row>
     <row>
       <value>66</value>        <!--  id  -->
       <value>11</value>         <!--  option_group_id  -->
@@ -101,7 +101,7 @@
       <value>1</value>          <!--  is_active  -->
       <null />                  <!--  component_id  -->
       <null />                  <!--  visibility_id  -->
-    </row>    
+    </row>
     <row>
       <value>63</value>        <!--  id  -->
       <value>11</value>         <!--  option_group_id  -->
@@ -118,6 +118,6 @@
       <value>1</value>          <!--  is_active  -->
       <null />                  <!--  component_id  -->
       <null />                  <!--  visibility_id  -->
-    </row>        
+    </row>
   </table>
 </dataset>