From 0158c2b698bec68271075ba8cdd239f666a90e66 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 5 Sep 2019 09:33:18 +1000
Subject: [PATCH] Enable apiv4 testing for GroupNesting and GroupOrganization
 entities

---
 tests/phpunit/api/v3/GroupNestingTest.php     | 16 ++++++++++-
 .../phpunit/api/v3/GroupOrganizationTest.php  | 28 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/api/v3/GroupNestingTest.php b/tests/phpunit/api/v3/GroupNestingTest.php
index dba8e57793..ca3516b360 100644
--- a/tests/phpunit/api/v3/GroupNestingTest.php
+++ b/tests/phpunit/api/v3/GroupNestingTest.php
@@ -87,6 +87,8 @@ class api_v3_GroupNestingTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_nesting_get.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGet() {
     $params = [
@@ -108,6 +110,8 @@ class api_v3_GroupNestingTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_nesting_get with just one param (child_group_id).
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGetWithChildGroupId() {
     $params = [
@@ -135,6 +139,8 @@ class api_v3_GroupNestingTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_nesting_get with just one param (parent_group_id).
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGetWithParentGroupId() {
     $params = [
@@ -169,7 +175,9 @@ class api_v3_GroupNestingTest extends CiviUnitTestCase {
    * Test civicrm_group_nesting_get for no records results.
    *
    * Success expected. (these tests are of marginal value as are in syntax conformance,
-   * don't copy & paste
+   * don't copy & paste.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGetEmptyResults() {
     $params = [
@@ -183,6 +191,8 @@ class api_v3_GroupNestingTest extends CiviUnitTestCase {
    * Test civicrm_group_nesting_create.
    *
    * @throws \Exception
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testCreate() {
     $params = [
@@ -196,6 +206,8 @@ class api_v3_GroupNestingTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_nesting_remove.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testDelete() {
     $params = [
@@ -213,6 +225,8 @@ class api_v3_GroupNestingTest extends CiviUnitTestCase {
    * Test civicrm_group_nesting_remove with empty parameter array.
    *
    * Error expected.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testDeleteWithEmptyParams() {
     $this->callAPIFailure('group_nesting', 'delete', []);
diff --git a/tests/phpunit/api/v3/GroupOrganizationTest.php b/tests/phpunit/api/v3/GroupOrganizationTest.php
index a3c26cff5f..cd30a2ac84 100644
--- a/tests/phpunit/api/v3/GroupOrganizationTest.php
+++ b/tests/phpunit/api/v3/GroupOrganizationTest.php
@@ -51,6 +51,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_get with valid params.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationGet() {
 
@@ -67,6 +69,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_get with group_id.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationGetWithGroupId() {
     $createParams = [
@@ -85,6 +89,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_get with empty params.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationGetWithEmptyParams() {
     $params = [];
@@ -95,6 +101,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_get with wrong params.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationGetWithWrongParams() {
     $params = 'groupOrg';
@@ -104,6 +112,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_get invalid keys.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationGetWithInvalidKeys() {
     $params = [
@@ -118,6 +128,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Check with valid params.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationCreate() {
     $params = [
@@ -129,6 +141,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * CRM-13841 - Load Group Org before save
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationCreateTwice() {
     $params = [
@@ -142,6 +156,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Check with empty params array.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationCreateWithEmptyParams() {
     $params = [];
@@ -151,6 +167,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Check with invalid params.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationCreateParamsNotArray() {
     $params = 'group_org';
@@ -160,6 +178,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Check with invalid params keys.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationCreateWithInvalidKeys() {
     $params = [
@@ -173,6 +193,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_remove with params not an array.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationDeleteParamsNotArray() {
     $params = 'delete';
@@ -182,6 +204,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_remove with empty params.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationDeleteWithEmptyParams() {
     $params = [];
@@ -191,6 +215,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_remove with valid params.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationDelete() {
     $paramsC = [
@@ -207,6 +233,8 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
 
   /**
    * Test civicrm_group_organization_remove with invalid params key.
+   *
+   * @dataProvider versionThreeAndFour
    */
   public function testGroupOrganizationDeleteWithInvalidKey() {
     $paramsDelete = [
-- 
2.25.1