#62: Move database setup to traits+bootstrap for phpunit 10 compatabi…

…lity. There isn't a TestSuite class any more for this purpose.
middlebury · Aug 8, 2024 · f1a2068 · f1a2068
1 parent c8c93b3
commit f1a2068
Show file tree

Hide file tree

Showing 81 changed files with 268 additions and 700 deletions.
diff --git a/application/test/ApplicationTestSuite.php b/application/test/ApplicationTestSuite.php
diff --git a/application/test/Catalog/Action/Helper/OsidIdTest.php b/application/test/Catalog/Action/Helper/OsidIdTest.php
@@ -9,6 +9,8 @@
 class Catalog_Action_Helper_OsidIdTest extends TestCase
 {
 
+	use Catalog_ApplicationTestTrait;
+
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.

diff --git a/application/test/Catalog/Action/Helper/OsidTermsTest.php b/application/test/Catalog/Action/Helper/OsidTermsTest.php
@@ -9,6 +9,8 @@
 class Catalog_Action_Helper_OsidTermsTest extends TestCase
 {
 
+	use Catalog_ApplicationTestTrait;
+
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.

diff --git a/application/test/Catalog/Action/Helper/OsidTest.php b/application/test/Catalog/Action/Helper/OsidTest.php
@@ -9,6 +9,8 @@
 class Catalog_Action_Helper_OsidTest extends TestCase
 {
 
+	use Catalog_ApplicationTestTrait;
+
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.

diff --git a/application/test/Catalog/Action/Helper/OsidTopicTest.php b/application/test/Catalog/Action/Helper/OsidTopicTest.php
@@ -9,6 +9,8 @@
 class Catalog_Action_Helper_OsidTopicTest extends TestCase
 {
 
+	use Catalog_ApplicationTestTrait;
+
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.

diff --git a/application/test/Catalog/Action/Helper/OsidTypeTest.php b/application/test/Catalog/Action/Helper/OsidTypeTest.php
@@ -9,6 +9,8 @@
 class Catalog_Action_Helper_OsidTypeTest extends TestCase
 {
 
+	use Catalog_ApplicationTestTrait;
+
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.

diff --git a/application/test/Catalog/Action/Helper/OsidTypesTest.php b/application/test/Catalog/Action/Helper/OsidTypesTest.php
@@ -9,6 +9,8 @@
 class Catalog_Action_Helper_OsidTypesTest extends TestCase
 {
 
+	use Catalog_ApplicationTestTrait;
+
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.

diff --git a/application/test/Catalog/ApplicationTestTrait.php b/application/test/Catalog/ApplicationTestTrait.php
@@ -0,0 +1,21 @@
+<?php
+
+trait Catalog_ApplicationTestTrait {
+
+  use banner_DatabaseTestTrait;
+
+  public static function setUpBeforeClass(): void
+  {
+    self::setUpDatabase();
+
+    Zend_Controller_Action_HelperBroker::addPath(APPLICATION_PATH.'/controllers/helper', 'Helper');
+    Zend_Controller_Action_HelperBroker::addPath(APPLICATION_PATH.'/resources/Catalog/Action/Helper', 'Catalog_Action_Helper');
+    Zend_Controller_Action_HelperBroker::addPath(APPLICATION_PATH.'/resources/Auth/Action/Helper', 'Auth_Action_Helper');
+
+    $registry = Zend_Registry::getInstance();
+    $registry->config = new Zend_Config_Ini(dirname(__FILE__).'/frontend_config.ini', 'development');
+
+    Zend_Controller_Action_HelperBroker::getStaticHelper('Osid')->setConfigPath(dirname(__FILE__).'/../apc/configuration.plist');
+  }
+
+}
diff --git a/application/test/Catalog/View/Helper/GetTimeStringHelperTest.php b/application/test/Catalog/View/Helper/GetTimeStringHelperTest.php
@@ -9,6 +9,8 @@
 class GetTimeStringHelperTest extends TestCase
 {
 
+	use Catalog_ApplicationTestTrait;
+
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.

diff --git a/application/test/TestSuite.php b/application/test/TestSuite.php
diff --git a/application/test/apc/TestSuite.php b/application/test/apc/TestSuite.php
diff --git a/application/test/apc/course/Course/Catalog/SessionTest.php b/application/test/apc/course/Course/Catalog/SessionTest.php
@@ -8,8 +8,9 @@ class apc_course_Course_Catalog_SessionTest
 	extends banner_course_Course_Catalog_SessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/Course/Lookup/CombinedSessionTest.php b/application/test/apc/course/Course/Lookup/CombinedSessionTest.php
@@ -8,8 +8,9 @@ class apc_course_Course_Lookup_CombinedSessionTest
 	extends banner_course_Course_Lookup_CombinedSessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/Course/Lookup/SessionTest.php b/application/test/apc/course/Course/Lookup/SessionTest.php
@@ -8,8 +8,9 @@ class apc_course_Course_Lookup_SessionTest
 	extends banner_course_Course_Lookup_SessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/Course/Search/OrderTest.php b/application/test/apc/course/Course/Search/OrderTest.php
@@ -8,8 +8,9 @@ class apc_course_Course_Search_OrderTest
 	extends banner_course_Course_Search_OrderTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/Course/Search/QueryTest.php b/application/test/apc/course/Course/Search/QueryTest.php
@@ -8,8 +8,9 @@ class apc_course_Course_Search_QueryTest
 	extends banner_course_Course_Search_QueryTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/Course/Search/SearchTest.php b/application/test/apc/course/Course/Search/SearchTest.php
@@ -8,8 +8,9 @@ class apc_course_Course_Search_SearchTest
 	extends banner_course_Course_Search_SearchTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/Course/Search/SessionTest.php b/application/test/apc/course/Course/Search/SessionTest.php
@@ -8,8 +8,9 @@ class apc_course_Course_Search_SessionTest
 	extends banner_course_Course_Search_SessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseCatalog/Lookup/SessionTest.php b/application/test/apc/course/CourseCatalog/Lookup/SessionTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseCatalog_Lookup_SessionTest
 	extends banner_course_CourseCatalog_Lookup_SessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseCatalogTest.php b/application/test/apc/course/CourseCatalogTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseCatalogTest
 	extends banner_course_CourseCatalogTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseManagerTest.php b/application/test/apc/course/CourseManagerTest.php
@@ -14,7 +14,7 @@ class apc_course_CourseManagerTest
 	 *
 	 * @access protected
 	 */
-	protected function setUp()
+	protected function setUp(): void
 	{
 		$this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG');
 		$this->manager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');

diff --git a/application/test/apc/course/CourseOffering/Catalog/SessionTest.php b/application/test/apc/course/CourseOffering/Catalog/SessionTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseOffering_Catalog_SessionTest
 	extends banner_course_CourseOffering_Catalog_SessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseOffering/Lookup/CombinedSessionTest.php b/application/test/apc/course/CourseOffering/Lookup/CombinedSessionTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseOffering_Lookup_CombinedSessionTest
 	extends banner_course_CourseOffering_Lookup_CombinedSessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseOffering/Lookup/SessionTest.php b/application/test/apc/course/CourseOffering/Lookup/SessionTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseOffering_Lookup_SessionTest
 	extends banner_course_CourseOffering_Lookup_SessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseOffering/Search/OrderTest.php b/application/test/apc/course/CourseOffering/Search/OrderTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseOffering_Search_OrderTest
 	extends banner_course_CourseOffering_Search_OrderTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseOffering/Search/QueryTest.php b/application/test/apc/course/CourseOffering/Search/QueryTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseOffering_Search_QueryTest
 	extends banner_course_CourseOffering_Search_QueryTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseOffering/Search/SearchTest.php b/application/test/apc/course/CourseOffering/Search/SearchTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseOffering_Search_SearchTest
 	extends banner_course_CourseOffering_Search_SearchTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}

diff --git a/application/test/apc/course/CourseOffering/Search/SessionTest.php b/application/test/apc/course/CourseOffering/Search/SessionTest.php
@@ -8,8 +8,9 @@ class apc_course_CourseOffering_Search_SessionTest
 	extends banner_course_CourseOffering_Search_SessionTest
 {
 
-	public static function setUpBeforeClass()
+	public static function setUpBeforeClass(): void
 	{
+		parent::setUpBeforeClass();
 		self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(realpath(dirname(__FILE__).'/../../../').'/configuration.plist');
 		self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0');
 	}