From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 12 Jan 2015 03:29:03 +0000 (+1300)
Subject: remove another function that would cause tests to fail if it were used
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b7d77cbac58f762c7609617bb984c0e6f993ddc1;p=civicrm-core.git

remove another function that would cause tests to fail if it were used
---

diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index 9abc7ddd34..fbf336cf04 100644
--- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
+++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
@@ -1680,23 +1680,9 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
    * @param $expectedValues
    */
   public function assertDBCompareValues($daoName, $searchParams, $expectedValues) {
-    if (!self::checkDoLocalDBTest()) {
-      return;
-    }
-
-    return CiviDBAssert::assertDBCompareValues($this, $daoName, $searchParams, $expectedValues);
-  }
-
-  /**
-   * @param $expectedValues
-   * @param $actualValues
-   */
-  public function assertAttributesEquals(&$expectedValues, &$actualValues) {
-    if (!self::checkDoLocalDBTest()) {
-      return;
+    if (self::checkDoLocalDBTest()) {
+      CiviDBAssert::assertDBCompareValues($this, $daoName, $searchParams, $expectedValues);
     }
-
-    return CiviDBAssert::assertAttributesEquals($expectedValues, $actualValues);
   }
 
   /**
@@ -1705,7 +1691,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
    * @param string $message
    */
   public function assertType($expected, $actual, $message = '') {
-    return $this->assertInternalType($expected, $actual, $message);
+    $this->assertInternalType($expected, $actual, $message);
   }
 
   /**
@@ -2084,7 +2070,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
    * which uses the entity info as its selection value
    * @param array $pageUrl
    *   The url which on which the ajax custom group load takes place.
-   * @param bool $beforeTriggering
+   * @param string $beforeTriggering
    * @return void
    */
   public function customFieldSetLoadOnTheFlyCheck($customSets, $pageUrl, $beforeTriggering = NULL) {
@@ -2275,6 +2261,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
 
   /**
    * Enable or disable Pop-ups via Display Preferences
+   * @param bool $enabled
    */
   public function enableDisablePopups($enabled = TRUE) {
     $this->openCiviPage('admin/setting/preferences/display', 'reset=1');