phpunit tests updates

publish/last.published

@@ -1 +1 @@
-9.0.0
+9.0.2

src/DB/IO.php

@@ -3123,16 +3123,13 @@ class IO
 
 	/**
 	 * switches the debug flag on or off
-	 * if none given, then return current set only
-	 * @param  bool|null $debug true/false or null for just getting current set
-	 * @return bool             Current debug flag as set
+	 *
+	 * @param  bool $debug True/False to turn debugging in this calss on or off
+	 * @return void
 	 */
-	public function dbSetDebug(?bool $debug = null): bool
+	public function dbSetDebug(bool $debug): void
 	{
-		if ($debug !== null) {
-			$this->db_debug = $debug;
-		}
-		return $this->db_debug;
+		$this->db_debug = $debug;
 	}
 
 	/**
@@ -3140,9 +3137,11 @@ class IO
 	 * OR
 	 * with the optional parameter fix sets debug
 	 * returns current set stats
+	 *
 	 * @param  bool|null $debug Flag to turn debug on off or null for toggle
 	 * @return bool             Current debug status
 	 *                          True for debug is on, False for off
+	 * @deprecated Use dbSetDebug and dbGetDebug
 	 */
 	public function dbToggleDebug(?bool $debug = null): bool
 	{
@@ -3156,6 +3155,7 @@ class IO
 
 	/**
 	 * Return current set db debug flag status
+	 *
 	 * @return bool Current debug status
 	 */
 	public function dbGetDebug(): bool

src/Debug/Support.php

@@ -177,7 +177,6 @@ class Support
 		$caller_level = 1;
 		$caller_list = self::getCallerMethodList();
 		if ($caller_list[0] == 'dV') {
-			echo "Raise caller level<br>: " . $caller_list[0] . "<br>";
 			$caller_level = 2;
 		}
 		// we need to strip the string in <small></small that is

src/Logging/Logging.php

@@ -213,7 +213,7 @@ class Logging
 				$settings['mandatory'] && !isset($options[$name]) &&
 				empty($settings['alias'])
 			) {
-				throw new \InvalidArgumentException(
+				throw new InvalidArgumentException(
 					'Missing mandatory option: "' . $name . '"',
 					E_USER_WARNING
 				);
@@ -230,7 +230,7 @@ class Logging
 			switch ($settings['type']) {
 				case 'bool':
 					if (!is_bool($this->options[$name])) {
-						throw new \InvalidArgumentException(
+						throw new InvalidArgumentException(
 							'Option: "' . $name . '" is not of type bool',
 							E_USER_ERROR
 						);
@@ -238,7 +238,7 @@ class Logging
 					break;
 				case 'string':
 					if (!is_string($this->options[$name])) {
-						throw new \InvalidArgumentException(
+						throw new InvalidArgumentException(
 							'Option: "' . $name . '" is not of type string',
 							E_USER_ERROR
 						);
@@ -249,7 +249,7 @@ class Logging
 						empty($settings['type_info']) ||
 						!$this->options[$name] instanceof $settings['type_info']
 					) {
-						throw new \InvalidArgumentException(
+						throw new InvalidArgumentException(
 							'Option: "' . $name . '" is not of instance '
 								. ($settings['type_info'] ?? 'NO INSTANCE DEFINED'),
 							E_USER_ERROR
@@ -675,9 +675,11 @@ class Logging
 	 *
 	 * @return bool True, we are at debug level
 	 */
-	public function getJsDebug(): bool
+	public function loggingLevelIsDebug(): bool
 	{
-		return $this->log_level === Level::Debug ? true : false;
+		return $this->getLoggingLevel()->includes(
+			Level::Debug
+		);
 	}
 
 	// log file id set (file name prefix)

test/phpunit/DB/CoreLibsDBIOTest.php

@@ -99,7 +99,6 @@ final class CoreLibsDBIOTest extends TestCase
 		],
 	];
 	private static $log;
-	private static bool $db_debug = false;
 
 	/**
 	 * Test if pgsql module loaded
@@ -123,7 +122,6 @@ final class CoreLibsDBIOTest extends TestCase
 			'log_file_id' => 'CoreLibs-DB-IO-Test',
 		]);
 		// will be true, default logging is true
-		self::$db_debug = self::$log->getLoggingLevel()->includes(Level::Debug);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config['valid'],
 			self::$log
@@ -521,6 +519,9 @@ final class CoreLibsDBIOTest extends TestCase
 	 */
 	public function debugSetProvider(): array
 	{
+		// 0: db connecdtion
+		// 1: override log flag, null for default
+		// 2: set flag
 		return [
 			'default debug set' => [
 				// what base connection
@@ -538,95 +539,46 @@ final class CoreLibsDBIOTest extends TestCase
 		];
 	}
 
-	/**
-	 * test set for toggleDEbug
-	 *
-	 * @return array
-	 */
-	public function debugToggleProvider(): array
-	{
-		return [
-			'default debug set' => [
-				// what base connection
-				'valid',
-				// actions
-				null,
-				// toggle is inverse
-				self::$db_debug ? true : false,
-			],
-			'toggle debug to false' => [
-				'valid',
-				false,
-				false,
-			]
-		];
-	}
-
 	/**
 	 * Test dbSetDbug, dbGetDebug
 	 *
 	 * @covers ::dbGetDbug
 	 * @covers ::dbSetDebug
-	 * @dataProvider debugSetProvider
-	 * @testdox Setting debug $set will be $expected [$_dataName]
+	 * @testdox Set and Get Debug flag
 	 *
 	 * @return void
 	 */
-	public function testDbSetDebug(
-		string $connection,
-		?bool $set,
-		bool $expected
-	): void {
+	public function testDbSetDebug(): void
+	{
+		$connection = 'valid';
+		// default set, expect true
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
 			self::$log
 		);
-		echo "Expected: " . self::$db_debug . "\n";
-		$this->assertEquals(
-			$expected,
-			$set === null ?
-				$db->dbSetDebug() :
-				$db->dbSetDebug($set)
+		$this->assertTrue(
+			$db->dbGetDebug()
 		);
-		// must always match
-		$this->assertEquals(
-			$expected,
+		// switch off
+		$db->dbSetDebug(false);
+		$this->assertFalse(
 			$db->dbGetDebug()
 		);
 		$db->dbClose();
-	}
-
-	/**
-	 * Test dbToggleDebug, dbGetDebug
-	 *
-	 * @covers ::dbGetDbug
-	 * @covers ::dbSetDebug
-	 * @dataProvider debugToggleProvider
-	 * @testdox Toggle debug $toggle will be $expected [$_dataName]
-	 *
-	 * @return void
-	 */
-	public function testDbToggleDebug(
-		string $connection,
-		?bool $toggle,
-		bool $expected
-	): void {
+		// second conenction with log set NOT debug
+		$log = new \CoreLibs\Logging\Logging([
+			// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
+			'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
+			'log_file_id' => 'CoreLibs-DB-IO-Test',
+			'log_level' => \CoreLibs\Logging\Logger\Level::Notice,
+		]);
 		$db = new \CoreLibs\DB\IO(
 			self::$db_config[$connection],
-			self::$log
+			$log
 		);
-		$this->assertEquals(
-			$expected,
-			$toggle === null ?
-				$db->dbToggleDebug() :
-				$db->dbToggleDebug($toggle)
-		);
-		// must always match
-		$this->assertEquals(
-			$expected,
+		$this->assertFalse(
 			$db->dbGetDebug()
 		);
-		$db->dbClose();
 	}
 
 	// - set max query call sets

test/phpunit/Debug/CoreLibsDebugSupportTest.php

@@ -460,16 +460,18 @@ final class CoreLibsDebugSupportTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @cover ::getCallerFileLine
-	 * @testWith ["/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/www/vendor/phpunit/phpunit/src/Framework/TestCase.php:1608"]
-	 * @testdox getCallerFileLine check if it returns $expected [$_dataName]
+	 * @testWith ["vendor/phpunit/phpunit/src/Framework/TestCase.php:"]
+	 * @testdox getCallerFileLine check based on regex /[\w\-\/]/vendor/phpunit/phpunit/src/Framework/TestCase.php:\d+ [$_dataName]
 	 *
 	 * @param  string $expected
 	 * @return void
 	 */
-	public function testGetCallerFileLine(string $expected): void
+	public function testGetCallerFileLine(): void
 	{
-		$this->assertEquals(
-			$expected,
+		// regex prefix with path "/../" and then fixed vendor + \d+
+		$regex = "/^\/[\w\-\/]+\/vendor\/phpunit\/phpunit\/src\/Framework\/TestCase.php:\d+$/";
+		$this->assertMatchesRegularExpression(
+			$regex,
 			Support::getCallerFileLine()
 		);
 	}
@@ -518,11 +520,17 @@ final class CoreLibsDebugSupportTest extends TestCase
 				break;
 			case 11:
 				// add one "run" before "runBare"
+				// array_splice(
+				// 	$expected,
+				// 	7,
+				// 	0,
+				// 	['run']
+				// );
 				array_splice(
 					$expected,
-					7,
 					0,
-					['run']
+					0,
+					['include']
 				);
 				$this->assertEquals(
 					$expected,

test/phpunit/Logging/CoreLibsLoggingLoggingTest.php

@@ -20,7 +20,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 	private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
 	private const REGEX_BASE = "\[[\d\-\s\.:]+\]\s{1}" // date
 		. "\[[\w\.]+(:\d+)?\]\s{1}" // host:port
-		. "\[[\w+\.\/]+:\d+\]\s{1}" // folder/file
+		. "\[[\w\-\.\/]+:\d+\]\s{1}" // folder/file
 		. "\[\w+\]\s{1}" // run id
 		. "{[\w\\\\]+(::\w+)?}\s{1}"; // class
 
@@ -217,14 +217,14 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 
 	// setLoggingLevel
 	// getLoggingLevel
-	// getJsDebug
+	// loggingLevelIsDebug
 
 	/**
 	 * Undocumented function
 	 *
 	 * @covers ::setLoggingLevel
 	 * @covers ::getLoggingLevel
-	 * @covers ::getJsDebug
+	 * @covers ::loggingLevelIsDebug
 	 * @testdox setLoggingLevel set/get checks
 	 *
 	 * @return void
@@ -242,7 +242,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 			$log->getLoggingLevel()
 		);
 		$this->assertFalse(
-			$log->getJsDebug()
+			$log->loggingLevelIsDebug()
 		);
 		// not set, should be debug]
 		$log = new \CoreLibs\Logging\Logging([
@@ -254,7 +254,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 			$log->getLoggingLevel()
 		);
 		$this->assertTrue(
-			$log->getJsDebug()
+			$log->loggingLevelIsDebug()
 		);
 		// invalid, should be debug, will throw excpetion too
 		$this->expectException(\InvalidArgumentException::class);
@@ -269,7 +269,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 			$log->getLoggingLevel()
 		);
 		$this->assertTrue(
-			$log->getJsDebug()
+			$log->loggingLevelIsDebug()
 		);
 		// set valid, then change
 		$log = new \CoreLibs\Logging\Logging([