2 files changed, 18 insertions, 22 deletions

diff --git a/tests/unit/includes/AccountTest.php b/tests/unit/includes/AccountTest.php
new file mode 100644
index 000000000..d123a0c70
--- /dev/null
+++ b/tests/unit/includes/AccountTest.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Tests for account handling helper functions.
+ */
+
+class AccountTest extends Zotlabs\Tests\Unit\UnitTestCase {
+	public function test_get_account_by_id_returns_existing_account() {
+		$account = get_account_by_id(42);
+		$this->assertNotFalse($account);
+		$this->assertEquals($this->fixtures['account'][0]['account_email'], $account['account_email']);
+	}
+}
diff --git a/tests/unit/includes/PhotodriverTest.php b/tests/unit/includes/PhotodriverTest.php
index 6f6ad0ffe..34dc058b7 100644
--- a/tests/unit/includes/PhotodriverTest.php
+++ b/tests/unit/includes/PhotodriverTest.php
@@ -2,38 +2,22 @@
 
 namespace Zotlabs\Tests\Unit\includes;
 
-//use Zotlabs\Photo\PhotoGd;
 use Zotlabs\Tests\Unit\UnitTestCase;
-//use phpmock\phpunit\PHPMock;
 
 /**
  * @brief Unit Test cases for include/photo/photo_driver.php file.
  */
 class PhotodriverTest extends UnitTestCase {
-	//use PHPMock;
 
 	public function testPhotofactoryReturnsNullForUnsupportedType() {
-		// php-mock can not mock global functions which is called by a global function.
-		// If the calling function is in a namespace it would work.
-		//$logger = $this->getFunctionMock(__NAMESPACE__, 'logger');
-		//$logger->expects($this->once());
-
-		//$ph = \photo_factory('', 'image/bmp');
-		//$this->assertNull($ph);
-
-		$this->markTestIncomplete('Need to mock logger(), otherwise not unit testable.');
+		$photo = \photo_factory('', 'image/bmp');
+		$this->assertNull($photo);
 	}
 
 	public function testPhotofactoryReturnsPhotogdIfConfigIgnore_imagickIsSet() {
-		// php-mock can not mock global functions which is called by a global function.
-		// If the calling function is in a namespace it would work.
-		//$gc = $this->getFunctionMock(__NAMESPACE__, 'get_config');
-		// simulate get_config('system', 'ignore_imagick') configured
-		//$gc->expects($this->once())->willReturn(1)
-
-		//$ph = \photo_factory(file_get_contents('images/hz-16.png'), 'image/png');
-		//$this->assertInstanceOf(PhotoGd::class, $ph);
+		\Zotlabs\Lib\Config::Set('system', 'ignore_imagick', true);
 
-		$this->markTestIncomplete('Need to mock get_config(), otherwise not unit testable.');
+		$photo = \photo_factory(file_get_contents('images/hz-16.png'), 'image/png');
+		$this->assertInstanceOf('Zotlabs\Photo\PhotoGd', $photo);
 	}
-}
\ No newline at end of file
+}