Merge branch 'master' of git://github.com/civicrm/civicrm-core into codingstandards-12

[civicrm-core.git] / tests / phpunit / WebTest / Import / DuplicateMatchingTest.php

diff --git a/tests/phpunit/WebTest/Import/DuplicateMatchingTest.php b/tests/phpunit/WebTest/Import/DuplicateMatchingTest.php
index dac41f8570b67e5208b04c2ecbfa03a5f4f10503..6e3923fb09172ba6c7950847f75b91d843a401fd 100644 (file)
--- a/tests/phpunit/WebTest/Import/DuplicateMatchingTest.php
+++ b/tests/phpunit/WebTest/Import/DuplicateMatchingTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -35,10 +35,10 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
     parent::setUp();
   }
 
-  /*
+  /**
    *  Test contact import for Individuals Duplicate Matching.
    */
-  function testIndividualDuplicateMatchingImport() {
+  public function testIndividualDuplicateMatchingImport() {
     $this->webtestLogin();
 
     $this->openCiviPage("contact/add", "reset=1&ct=Individual", 'first_name');
@@ -136,10 +136,10 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
     $this->importContacts($headers, $rows, 'Individual', 'No Duplicate Checking');
   }
 
-  /*
+  /**
    *  Test contact import for Organization Duplicate Matching.
    */
-  function testOrganizationDuplicateMatchingImport() {
+  public function testOrganizationDuplicateMatchingImport() {
     $this->webtestLogin();
 
     //create oranization
@@ -231,10 +231,10 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
     $this->importContacts($headers, $rows, 'Organization', 'No Duplicate Checking');
   }
 
-  /*
+  /**
    *  Test contact import for Household Duplicate Matching.
    */
-  function testHouseholdDuplicateMatchingImport() {
+  public function testHouseholdDuplicateMatchingImport() {
     $this->webtestLogin();
 
     // create household
@@ -332,7 +332,7 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
    * @param $originalRows
    * @param $checkSummary
    */
-  function checkDuplicateContacts($originalHeaders, $originalRows, $checkSummary) {
+  public function checkDuplicateContacts($originalHeaders, $originalRows, $checkSummary) {
     $this->assertTrue($this->isTextPresent('CiviCRM has detected one record which is a duplicate of existing CiviCRM contact record. These records have not been imported.'));
 
     $checkSummary = array(
@@ -355,7 +355,7 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
    *
    * @return array
    */
-  function _individualDuplicateMatchingCSVData($individualFields) {
+  public function _individualDuplicateMatchingCSVData($individualFields) {
     $headers = array(
       'first_name' => 'First Name',
       'middle_name' => 'Middle Name',
@@ -370,7 +370,8 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
     );
 
     $rows = array(
-      array('first_name' => isset($individualFields['first_name']) ? $individualFields['first_name'] : substr(sha1(rand()), 0, 7),
+      array(
+        'first_name' => isset($individualFields['first_name']) ? $individualFields['first_name'] : substr(sha1(rand()), 0, 7),
         'middle_name' => isset($individualFields['middle_name']) ? $individualFields['middle_name'] : substr(sha1(rand()), 0, 7),
         'last_name' => isset($individualFields['last_name']) ? $individualFields['last_name'] : 'Anderson',
         'email' => isset($individualFields['email']) ? $individualFields['email'] : substr(sha1(rand()), 0, 7) . '@example.com',
@@ -381,7 +382,8 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
         'state' => 'NY',
         'country' => 'United States',
       ),
-      array('first_name' => substr(sha1(rand()), 0, 7),
+      array(
+        'first_name' => substr(sha1(rand()), 0, 7),
         'middle_name' => substr(sha1(rand()), 0, 7),
         'last_name' => 'Summerson',
         'email' => substr(sha1(rand()), 0, 7) . '@example.com',
@@ -406,7 +408,7 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
    *
    * @return array
    */
-  function _organizationDuplicateMatchingCSVData($organizationFields) {
+  public function _organizationDuplicateMatchingCSVData($organizationFields) {
     $headers = array(
       'organization_name' => 'Organization Name',
       'email' => 'Email',
@@ -418,7 +420,8 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
       'country' => 'Country',
     );
     $rows = array(
-      array('organization_name' => isset($organizationFields['organization_name']) ? $organizationFields['organization_name'] : 'org_' . substr(sha1(rand()), 0, 7),
+      array(
+        'organization_name' => isset($organizationFields['organization_name']) ? $organizationFields['organization_name'] : 'org_' . substr(sha1(rand()), 0, 7),
         'email' => isset($organizationFields['email']) ? $organizationFields['email'] : substr(sha1(rand()), 0, 7) . 'example.org',
         'phone' => '9949912154',
         'address_1' => 'Add 1',
@@ -427,7 +430,8 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
         'state' => 'NY',
         'country' => 'United States',
       ),
-      array('organization_name' => 'org_' . substr(sha1(rand()), 0, 7),
+      array(
+        'organization_name' => 'org_' . substr(sha1(rand()), 0, 7),
         'email' => substr(sha1(rand()), 0, 7) . '@example.org',
         'phone' => '6949412154',
         'address_1' => 'Add 1',
@@ -441,16 +445,15 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
     return array($headers, $rows);
   }
 
-  /*
-   *  Helper function to provide data for contact import for Household
-   *  Duplicate Matching.
-   */
   /**
+   * Helper function to provide data for contact import for Household
+   * Duplicate Matching.
+   *
    * @param $householdFields
    *
    * @return array
    */
-  function _householdDuplicateMatchingCSVData($householdFields) {
+  public function _householdDuplicateMatchingCSVData($householdFields) {
     $headers = array(
       'household_name' => 'Household Name',
       'email' => 'Email',
@@ -463,7 +466,8 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
     );
 
     $rows = array(
-      array('household_name' => isset($householdFields['household_name']) ? $householdFields['household_name'] : 'household_' . substr(sha1(rand()), 0, 7),
+      array(
+        'household_name' => isset($householdFields['household_name']) ? $householdFields['household_name'] : 'household_' . substr(sha1(rand()), 0, 7),
         'email' => isset($householdFields['email']) ? $householdFields['email'] : substr(sha1(rand()), 0, 7) . '@example.com',
         'phone' => '3949912154',
         'address_1' => 'Add 1',
@@ -472,7 +476,8 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
         'state' => 'NY',
         'country' => 'United States',
       ),
-      array('household_name' => 'household_' . substr(sha1(rand()), 0, 7),
+      array(
+        'household_name' => 'household_' . substr(sha1(rand()), 0, 7),
         'email' => substr(sha1(rand()), 0, 7) . '@example.org',
         'phone' => '5949412154',
         'address_1' => 'Add 1',
@@ -486,4 +491,3 @@ class WebTest_Import_DuplicateMatchingTest extends ImportCiviSeleniumTestCase {
     return array($headers, $rows);
   }
 }
-