From 03ba3ef128455bbd6d50f9c99754d2eab6cff905 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 29 Nov 2016 10:38:12 -0500
Subject: [PATCH] CRM-19693 - Test fixes

---
 CRM/Core/OptionGroup.php                   | 1 +
 tests/phpunit/CRM/Core/OptionGroupTest.php | 5 ++---
 tests/phpunit/api/v3/ActivityTypeTest.php  | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index a490208509..c6a6d93960 100644
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -109,6 +109,7 @@ class CRM_Core_OptionGroup {
    * @param string $keyColumnName
    *   the column to use for 'key'.
    * @param string $orderBy
+   *   the column to use for ordering.
    *
    * @return array
    *   The values as specified by the params
diff --git a/tests/phpunit/CRM/Core/OptionGroupTest.php b/tests/phpunit/CRM/Core/OptionGroupTest.php
index 5bcc22be20..1bb9b052e3 100644
--- a/tests/phpunit/CRM/Core/OptionGroupTest.php
+++ b/tests/phpunit/CRM/Core/OptionGroupTest.php
@@ -43,8 +43,8 @@ class CRM_Core_OptionGroupTest extends CiviUnitTestCase {
    */
   public function testWeightOptionGroup() {
     $values = array();
-    $options1 = CRM_Core_OptionGroup::values('activity_type');
-    $options2 = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, NULL, 'label', TRUE, TRUE, 'value', 'name');
+    $options1 = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, NULL, 'label', FALSE, TRUE);
+    $options2 = CRM_Core_OptionGroup::values('activity_type', FALSE, FALSE, FALSE, NULL, 'label', FALSE, TRUE, 'value', 'name');
     // Verify that arrays are equal.
     $this->assertTrue(($options1 == $options2), "The arrays retrieved should be the same");
     // Verify sequence is different.
@@ -54,7 +54,6 @@ class CRM_Core_OptionGroupTest extends CiviUnitTestCase {
       FROM civicrm_option_value v
       INNER JOIN civicrm_option_group g ON g.id = v.option_group_id
       AND g.name = 'activity_type'
-      WHERE g.is_active = 1 AND v.is_active = 1
       ORDER BY v.name";
     $dao = CRM_Core_DAO::executeQuery($sql);
     while ($dao->fetch()) {
diff --git a/tests/phpunit/api/v3/ActivityTypeTest.php b/tests/phpunit/api/v3/ActivityTypeTest.php
index 5a28165a2f..4388b9545d 100644
--- a/tests/phpunit/api/v3/ActivityTypeTest.php
+++ b/tests/phpunit/api/v3/ActivityTypeTest.php
@@ -48,7 +48,6 @@ class api_v3_ActivityTypeTest extends CiviUnitTestCase {
     $params = array();
     $result = $this->callAPIAndDocument('activity_type', 'get', $params, __FUNCTION__, __FILE__);
     $this->assertEquals($result['values']['1'], 'Meeting');
-    $this->assertEquals($result['values']['13'], 'Open Case');
   }
 
   /**
-- 
2.25.1