From fcb93467d9b68083c53a72d4b7fd5af9914d8482 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 12 Jan 2015 16:10:57 +1300
Subject: [PATCH] fix spelling, minor function fix to reflect lack of return
 value

---
 .../phpunit/CiviTest/CiviSeleniumTestCase.php  | 18 ++++++++++--------
 .../WebTest/Report/LoggingReportTest.php       | 14 +++++++-------
 tests/phpunit/api/v3/SyntaxConformanceTest.php |  3 +--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index e926a1194e..4900b04d8c 100644
--- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
+++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
@@ -1617,18 +1617,20 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
    * Generic function to compare expected values after an api call to retrieved
    * DB values.
    *
-   * @daoName  string   DAO Name of object we're evaluating.
-   * @id       int      Id of object
-   * @match    array    Associative array of field name => expected value. Empty if asserting
+   * @param string $daoName
+   *   DAO Name of object we're evaluating.
+   * @param int $id
+   *   Id of object
+   * @param array $match
+   *   Associative array of field name => expected value. Empty if asserting
    *                      that a DELETE occurred
-   * @delete   boolean  True if we're checking that a DELETE action occurred.
+   * @param boolean $delete
+   *   are we checking that a DELETE action occurred?
    */
   public function assertDBState($daoName, $id, $match, $delete = FALSE) {
-    if (!self::checkDoLocalDBTest()) {
-      return;
+    if (self::checkDoLocalDBTest()) {
+      CiviDBAssert::assertDBState($this, $daoName, $id, $match, $delete);
     }
-
-    return CiviDBAssert::assertDBState($this, $daoName, $id, $match, $delete);
   }
 
   /**
diff --git a/tests/phpunit/WebTest/Report/LoggingReportTest.php b/tests/phpunit/WebTest/Report/LoggingReportTest.php
index 59b4cffdbf..c6ebfcd16a 100644
--- a/tests/phpunit/WebTest/Report/LoggingReportTest.php
+++ b/tests/phpunit/WebTest/Report/LoggingReportTest.php
@@ -49,7 +49,7 @@ class WebTest_Report_LoggingReportTest extends CiviSeleniumTestCase {
     $this->enableComponents("CiviCase");
 
     //add new contact
-    $orginalFirstName = $firstName = 'Anthony' . substr(sha1(rand()), 0, 7);
+    $originalFirstName = $firstName = 'Anthony' . substr(sha1(rand()), 0, 7);
     $lastName = 'Anderson' . substr(sha1(rand()), 0, 7);
 
     $this->webtestAddContact($firstName, $lastName);
@@ -254,18 +254,18 @@ class WebTest_Report_LoggingReportTest extends CiviSeleniumTestCase {
     $contactInfo['data'] = array(
       array(
         'field' => 'Sort Name',
-        'changed_from' => "{$lastName}, {$orginalFirstName}",
+        'changed_from' => "{$lastName}, {$originalFirstName}",
         'changed_to' => "{$lastName}, {$firstName}"
       ),
       array(
         'field' => 'Display Name',
-        'changed_from' => "{$orginalFirstName} {$lastName}",
+        'changed_from' => "{$originalFirstName} {$lastName}",
         'changed_to' => "{$firstName} {$lastName}"
       ),
-      array('field' => 'First Name', 'changed_from' => $orginalFirstName, 'changed_to' => $firstName),
-      // array('field' => 'Email Greeting', 'changed_from' => "Dear {$orginalFirstName}", 'changed_to' => "Dear {$firstName}"),
-      // array('field' => 'Postal Greeting', 'changed_from' => "Dear {$orginalFirstName}", 'changed_to' => "Dear {$firstName}"),
-      // array('field' => 'Addressee', 'changed_from' => "{$orginalFirstName} {$lastName}", 'changed_to' => "{$firstName} {$lastName}"),
+      array('field' => 'First Name', 'changed_from' => $originalFirstName, 'changed_to' => $firstName),
+      // array('field' => 'Email Greeting', 'changed_from' => "Dear {$originalFirstName}", 'changed_to' => "Dear {$firstName}"),
+      // array('field' => 'Postal Greeting', 'changed_from' => "Dear {$originalFirstName}", 'changed_to' => "Dear {$firstName}"),
+      // array('field' => 'Addressee', 'changed_from' => "{$originalFirstName} {$lastName}", 'changed_to' => "{$firstName} {$lastName}"),
     );
     $contactInfo = array_merge($contactInfo, $data[0]);
 
diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index f1e8c5f493..6009ad9d7c 100644
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -1335,14 +1335,13 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
    * @param string $entityName
    * @param int $count
    *
-   *
    * @return array
    */
   private function getMockableBAOObjects($entityName, $count = 2) {
     $baoString = _civicrm_api3_get_BAO($entityName);
     if (empty($baoString)) {
       $this->markTestIncomplete("Entity [$entityName] cannot be mocked - no known DAO");
-      return;
+      return array();
     }
     $baos = array();
     $i = 0;
-- 
2.25.1