From 5acc61830d3762a1aa5f1e4eefbf485c8d50a053 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 27 Mar 2020 12:46:53 +1300
Subject: [PATCH] [Test] Remove skip that seems no longer required

The removed line seems to be loosening the test for a deprecation that I didn't hit in testing today
---
 tests/phpunit/api/v4/Entity/ConformanceTest.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/api/v4/Entity/ConformanceTest.php b/tests/phpunit/api/v4/Entity/ConformanceTest.php
index 3b0357580e..7c42824ed9 100644
--- a/tests/phpunit/api/v4/Entity/ConformanceTest.php
+++ b/tests/phpunit/api/v4/Entity/ConformanceTest.php
@@ -14,8 +14,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 
 
@@ -57,10 +55,16 @@ class ConformanceTest extends UnitTestCase {
     $this->loadDataSet('ConformanceTest');
     $this->creationParamProvider = \Civi::container()->get('test.param_provider');
     parent::setUp();
-    // calculateTaxAmount() for contribution triggers a deprecation notice
-    \PHPUnit\Framework\Error\Deprecated::$enabled = FALSE;
   }
 
+  /**
+   * Get entities to test.
+   *
+   * @return array
+   *
+   * @throws \API_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
   public function getEntities() {
     return Entity::get()->setCheckPermissions(FALSE)->execute()->column('name');
   }
@@ -97,7 +101,7 @@ class ConformanceTest extends UnitTestCase {
 
   /**
    * @param string $entityClass
-   * @param $entity
+   * @param string $entity
    */
   protected function checkFields($entityClass, $entity) {
     $fields = $entityClass::getFields()
@@ -114,6 +118,8 @@ class ConformanceTest extends UnitTestCase {
 
   /**
    * @param string $entityClass
+   *
+   * @return array
    */
   protected function checkActions($entityClass) {
     $actions = $entityClass::getActions()
-- 
2.25.1