X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FWebTest%2FImport%2FDateFormatTest.php;h=f4d84a4bf020cb830726f2df1f3116991cc06588;hb=81621fee4d9c2e8c6f5272a1c6b38a86186fe185;hp=85ad21d2a05857d3f2d91f77417bfa585f1c5f4d;hpb=49414d6faa37375cef1ea0a156054ddd9cc6ae8d;p=civicrm-core.git

diff --git a/tests/phpunit/WebTest/Import/DateFormatTest.php b/tests/phpunit/WebTest/Import/DateFormatTest.php
index 85ad21d2a0..f4d84a4bf0 100644
--- a/tests/phpunit/WebTest/Import/DateFormatTest.php
+++ b/tests/phpunit/WebTest/Import/DateFormatTest.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -22,7 +22,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 require_once 'WebTest/Import/ImportCiviSeleniumTestCase.php';
 
@@ -35,7 +35,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     parent::setUp();
   }
 
-  /*
+  /**
    *  Test contact import for yyyy_mm_dd date format.
    */
   public function testDateFormat_yyyy_mm_dd() {
@@ -50,7 +50,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     $this->importContacts($headers, $rows, 'Individual', 'Skip', array(), $other);
   }
 
-  /*
+  /**
    *  Test contact import for mm_dd_yy date format.
    */
   public function testDateFormat_mm_dd_yy() {
@@ -66,7 +66,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     $this->importContacts($headers, $rows, 'Individual', 'Skip', array(), $other);
   }
 
-  /*
+  /**
    *  Test contact import for mm_dd_yyyy date format.
    */
   public function testDateFormat_mm_dd_yyyy() {
@@ -87,7 +87,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     $this->importContacts($headers, $rows, 'Individual', 'Skip', array(), $other);
   }
 
-  /*
+  /**
    *  Test contact import for Month_dd_yyyy date format.
    */
   public function testDateFormat_Month_dd_yyyy() {
@@ -108,7 +108,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     $this->importContacts($headers, $rows, 'Individual', 'Skip', array(), $other);
   }
 
-  /*
+  /**
    *  Test contact import for dd_mon_yy date format.
    */
   public function testDateFormat_dd_mon_yy() {
@@ -129,7 +129,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     $this->importContacts($headers, $rows, 'Individual', 'Skip', array(), $other);
   }
 
-  /*
+  /**
    *  Test contact import for dd_mm_yyyy date format.
    */
   public function testDateFormat_dd_mm_yyyy() {
@@ -150,7 +150,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     $this->importContacts($headers, $rows, 'Individual', 'Skip', array(), $other);
   }
 
-  /*
+  /**
    *  Helper function to provide data for contact import for Individuals and yyyy-mm-dd OR yyyymmdd dateformat.
    */
   /**
@@ -173,7 +173,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
 
     $rows = array(
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        'first_name' => substr(sha1(rand()), 0, 7),
         'middle_name' => substr(sha1(rand()), 0, 7),
         'last_name' => 'Anderson',
         'email' => substr(sha1(rand()), 0, 7) . '@example.com',
@@ -182,11 +182,11 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '1998-12-25',
       ),
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        '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',
@@ -195,7 +195,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '1999-11-26',
       ),
     );
@@ -203,7 +203,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     return array($headers, $rows);
   }
 
-  /*
+  /**
    *  Helper function to provide data for contact import for Individuals and mm/dd/yy OR mm-dd-yy dateformat.
    */
   /**
@@ -226,7 +226,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
 
     $rows = array(
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        'first_name' => substr(sha1(rand()), 0, 7),
         'middle_name' => substr(sha1(rand()), 0, 7),
         'last_name' => 'Anderson',
         'email' => substr(sha1(rand()), 0, 7) . '@example.com',
@@ -235,11 +235,11 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '12/23/98',
       ),
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        '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',
@@ -248,7 +248,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '11/24/88',
       ),
     );
@@ -256,7 +256,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     return array($headers, $rows);
   }
 
-  /*
+  /**
    *  Helper function to provide data for contact import for Individuals and mm/dd/yyyy OR mm-dd-yyyy dateformat.
    */
   /**
@@ -279,7 +279,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
 
     $rows = array(
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        'first_name' => substr(sha1(rand()), 0, 7),
         'middle_name' => substr(sha1(rand()), 0, 7),
         'last_name' => 'Anderson',
         'email' => substr(sha1(rand()), 0, 7) . '@example.com',
@@ -288,11 +288,11 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '11/12/1995',
       ),
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        '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',
@@ -301,7 +301,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '12/12/1995',
       ),
     );
@@ -309,7 +309,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     return array($headers, $rows);
   }
 
-  /*
+  /**
    *  Helper function to provide data for contact import for Individuals and Month dd, yyyy dateformat.
    */
   /**
@@ -332,7 +332,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
 
     $rows = array(
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        'first_name' => substr(sha1(rand()), 0, 7),
         'middle_name' => substr(sha1(rand()), 0, 7),
         'last_name' => 'Anderson',
         'email' => substr(sha1(rand()), 0, 7) . '@example.com',
@@ -341,11 +341,11 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => 'December 12, 1998',
       ),
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        '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',
@@ -354,7 +354,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => 'December 13, 1998',
       ),
     );
@@ -362,7 +362,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     return array($headers, $rows);
   }
 
-  /*
+  /**
    *  Helper function to provide data for contact import for Individuals and dd-mon-yy OR dd/mm/yy dateformat.
    */
   /**
@@ -385,7 +385,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
 
     $rows = array(
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        'first_name' => substr(sha1(rand()), 0, 7),
         'middle_name' => substr(sha1(rand()), 0, 7),
         'last_name' => 'Anderson',
         'email' => substr(sha1(rand()), 0, 7) . '@example.com',
@@ -394,11 +394,11 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '25/12/98',
       ),
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        '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',
@@ -407,7 +407,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '26/12/99',
       ),
     );
@@ -415,7 +415,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
     return array($headers, $rows);
   }
 
-  /*
+  /**
    *  Helper function to provide data for contact import for Individuals and dd/mm/yyyy dateformat.
    */
   /**
@@ -438,7 +438,7 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
 
     $rows = array(
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        'first_name' => substr(sha1(rand()), 0, 7),
         'middle_name' => substr(sha1(rand()), 0, 7),
         'last_name' => 'Anderson',
         'email' => substr(sha1(rand()), 0, 7) . '@example.com',
@@ -447,11 +447,11 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '25/12/1998',
       ),
       array(
-    'first_name' => substr(sha1(rand()), 0, 7),
+        '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',
@@ -460,11 +460,12 @@ class WebTest_Import_DateFormatTest extends ImportCiviSeleniumTestCase {
         'address_2' => 'Add 2',
         'city' => 'Watson',
         'state' => 'NY',
-        'country' => 'United States',
+        'country' => 'UNITED STATES',
         'birth_date' => '24/11/1996',
       ),
     );
 
     return array($headers, $rows);
   }
+
 }