From f80068e75bf6743dff04b250799754e5925117d9 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@git.wordpress.org>
Date: Tue, 30 Aug 2016 14:32:04 +0000
Subject: [PATCH] Tests: Require `Basic_Object` and `Basic_Subclass` files
 earlier in call stack.

This ensures compatibility with third-party tools using these classes
in their test suites, after [38285].

Props DylanAuty, Frank Klein, TimothyBlynJacobs.
Fixes #37523.

git-svn-id: https://develop.svn.wordpress.org/trunk@38445 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/includes/functions.php | 3 +++
 tests/phpunit/tests/basic.php        | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php
index 0e644ff824..7a9ef13de4 100644
--- a/tests/phpunit/includes/functions.php
+++ b/tests/phpunit/includes/functions.php
@@ -1,5 +1,8 @@
 <?php
 
+require_once dirname( __FILE__ ) . '/class-basic-object.php';
+require_once dirname( __FILE__ ) . '/class-basic-subclass.php';
+
 /**
  * Resets various `$_SERVER` variables that can get altered during tests.
  */
diff --git a/tests/phpunit/tests/basic.php b/tests/phpunit/tests/basic.php
index 1225ae3854..a17f94e7cc 100644
--- a/tests/phpunit/tests/basic.php
+++ b/tests/phpunit/tests/basic.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once dirname( dirname( __FILE__ ) ) . '/includes/class-basic-object.php';
-require_once dirname( dirname( __FILE__ ) ) . '/includes/class-basic-subclass.php';
-
 /**
  * just make sure the test framework is working
  *