Merge pull request #21057 from eileenmcnaughton/tok_resolve

[civicrm-core.git] / Civi / Test / DbTestTrait.php

diff --git a/Civi/Test/DbTestTrait.php b/Civi/Test/DbTestTrait.php
index 866984566f7a32cf1c6899c4adb6864c1275a5a6..079bb8df6b6f567c94f8e380c58ef32f3bf6f520 100644 (file)
--- a/Civi/Test/DbTestTrait.php
+++ b/Civi/Test/DbTestTrait.php
@@ -143,7 +143,7 @@ trait DbTestTrait {
     $expectedValue, $message
   ) {
     $value = \CRM_Core_DAO::getFieldValue($daoName, $searchValue, $returnColumn, $searchColumn, TRUE);
-    $this->assertEquals($expectedValue, $value, $message);
+    $this->assertEquals(trim($expectedValue), trim($value), $message);
   }
 
   /**
@@ -184,7 +184,7 @@ trait DbTestTrait {
     $actual = \CRM_Core_DAO::singleValueQuery($query, $params);
     $this->assertEquals($expected, $actual,
       sprintf('%sexpected=[%s] actual=[%s] query=[%s]',
-        $message, $expected, $actual, \CRM_Core_DAO::composeQuery($query, $params, FALSE)
+        $message, $expected, $actual, \CRM_Core_DAO::composeQuery($query, $params)
       )
     );
   }