Merge pull request #10145 from eileenmcnaughton/test-fail

Fix test regression by correctly setting timestamp in test method
civicrm · Apr 11, 2017 · 3ea7bd0 · 3ea7bd0
2 parents e620163 + 2149f4b
commit 3ea7bd0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CRM/Core/BAO/Domain.php b/CRM/Core/BAO/Domain.php
@@ -29,8 +29,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2017
- * $Id$
- *
  */
 
 /**
@@ -65,17 +63,18 @@ public static function retrieve(&$params, &$defaults) {
   /**
    * Get the domain BAO.
    *
-   * @param null $reset
+   * @param bool $reset
    *
-   * @return CRM_Core_BAO_Domain|null
+   * @return \CRM_Core_BAO_Domain
+   * @throws \CRM_Core_Exception
    */
   public static function getDomain($reset = NULL) {
     static $domain = NULL;
     if (!$domain || $reset) {
       $domain = new CRM_Core_BAO_Domain();
       $domain->id = CRM_Core_Config::domainID();
       if (!$domain->find(TRUE)) {
-        CRM_Core_Error::fatal();
+        throw new CRM_Core_Exception('No domain in DB');
       }
     }
     return $domain;

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
@@ -234,7 +234,6 @@ protected function assignTestValue($fieldName, &$fieldDef, $counter) {
           break;
 
         case CRM_Utils_Type::T_DATE:
-        case CRM_Utils_Type::T_TIMESTAMP:
         case CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME:
           $this->$dbName = '19700101';
           if ($dbName == 'end_date') {
@@ -243,6 +242,10 @@ protected function assignTestValue($fieldName, &$fieldDef, $counter) {
           }
           break;
 
+        case CRM_Utils_Type::T_TIMESTAMP:
+          $this->$dbName = '19700201000000';
+          break;
+
         case CRM_Utils_Type::T_TIME:
           CRM_Core_Error::fatal("T_TIME shouldn't be used.");
           //$object->$dbName='000000';