From 1b64d7cb2c45db443469b0ee1ef82fcba04cf709 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 20 May 2021 16:41:59 -0700 Subject: [PATCH] CiviTestListener - Provide a variable to identify the active test --- Civi/Test/CiviTestListener.php | 2 ++ Civi/Test/CiviTestListenerPHPUnit7.php | 2 ++ Civi/Test/Legacy/CiviTestListener.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Civi/Test/CiviTestListener.php b/Civi/Test/CiviTestListener.php index af5c2cc268..c8c838bc05 100644 --- a/Civi/Test/CiviTestListener.php +++ b/Civi/Test/CiviTestListener.php @@ -51,6 +51,7 @@ else { public function startTest(\PHPUnit\Framework\Test $test) { if ($this->isCiviTest($test)) { error_reporting(E_ALL); + $GLOBALS['CIVICRM_TEST_CASE'] = $test; } if ($test instanceof HeadlessInterface) { @@ -82,6 +83,7 @@ else { } \CRM_Utils_Time::resetTime(); if ($this->isCiviTest($test)) { + unset($GLOBALS['CIVICRM_TEST_CASE']); error_reporting(E_ALL & ~E_NOTICE); $this->errorScope = NULL; } diff --git a/Civi/Test/CiviTestListenerPHPUnit7.php b/Civi/Test/CiviTestListenerPHPUnit7.php index 1efbacce13..b791e4caf1 100644 --- a/Civi/Test/CiviTestListenerPHPUnit7.php +++ b/Civi/Test/CiviTestListenerPHPUnit7.php @@ -43,6 +43,7 @@ class CiviTestListenerPHPUnit7 implements \PHPUnit\Framework\TestListener { public function startTest(\PHPUnit\Framework\Test $test): void { if ($this->isCiviTest($test)) { error_reporting(E_ALL); + $GLOBALS['CIVICRM_TEST_CASE'] = $test; } if ($test instanceof HeadlessInterface) { @@ -74,6 +75,7 @@ class CiviTestListenerPHPUnit7 implements \PHPUnit\Framework\TestListener { } \CRM_Utils_Time::resetTime(); if ($this->isCiviTest($test)) { + unset($GLOBALS['CIVICRM_TEST_CASE']); error_reporting(E_ALL & ~E_NOTICE); $this->errorScope = NULL; } diff --git a/Civi/Test/Legacy/CiviTestListener.php b/Civi/Test/Legacy/CiviTestListener.php index d7e3a1ad9d..1bd0a70507 100644 --- a/Civi/Test/Legacy/CiviTestListener.php +++ b/Civi/Test/Legacy/CiviTestListener.php @@ -41,6 +41,7 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener { public function startTest(\PHPUnit_Framework_Test $test) { if ($this->isCiviTest($test)) { error_reporting(E_ALL); + $GLOBALS['CIVICRM_TEST_CASE'] = $test; } if ($test instanceof \Civi\Test\HeadlessInterface) { @@ -71,6 +72,7 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener { } \CRM_Utils_Time::resetTime(); if ($this->isCiviTest($test)) { + unset($GLOBALS['CIVICRM_TEST_CASE']); error_reporting(E_ALL & ~E_NOTICE); $this->errorScope = NULL; } -- 2.25.1