3 files changed, 78 insertions, 27 deletions
diff --git a/tests/unit/UnitTestCase.php b/tests/unit/UnitTestCase.php
index 97ac1576e..0bf7b547a 100644
--- a/tests/unit/UnitTestCase.php
+++ b/tests/unit/UnitTestCase.php
@@ -72,6 +72,8 @@ class UnitTestCase extends TestCase {
 	}
 
 	protected function setUp() : void {
+		$myclass = get_class($this);
+		logger("[*] Running test: {$myclass}::{$this->getName(true)}", LOGGER_DEBUG);
 		if ( \DBA::$dba->connected ) {
 			// Create a transaction, so that any actions taken by the
 			// tests does not change the actual contents of the database.
diff --git a/tests/unit/includes/NetworkTest.php b/tests/unit/includes/NetworkTest.php
index 0b9b42e00..9fb00e9d3 100644
--- a/tests/unit/includes/NetworkTest.php
+++ b/tests/unit/includes/NetworkTest.php
@@ -5,29 +5,68 @@
  * @package test.util
  */
 
-use PHPUnit\Framework\TestCase;
-
-require_once('include/network.php');
-
-class NetworkTest extends TestCase {
-
-  public function setup() : void {
-    \App::set_baseurl("https://mytest.org");
-  }
-
-  /**
-   * @dataProvider localUrlTestProvider
-   */
-  public function testIsLocalURL($url, $expected) {
-    $this->assertEquals($expected, is_local_url($url));
-  }
-
-  public function localUrlTestProvider() : array {
-    return [
-      [ '/some/path', true ],
-      [ 'https://mytest.org/some/path', true ],
-      [ 'https://other.site/some/path', false ],
-    ];
-  }
-}
+class NetworkTest extends Zotlabs\Tests\Unit\UnitTestCase {
+
+	public function setUp() : void {
+		parent::setUp();
+
+		\App::set_baseurl("https://mytest.org");
+	}
+
+	/**
+	 * @dataProvider localUrlTestProvider
+	 */
+	public function testIsLocalURL($url, $expected) {
+		$this->assertEquals($expected, is_local_url($url));
+	}
+
+	public function localUrlTestProvider() : array {
+		return [
+			[ '/some/path', true ],
+			[ 'https://mytest.org/some/path', true ],
+			[ 'https://other.site/some/path', false ],
+		];
+	}
+
+	/**
+	 * Test the validate_email function.
+	 *
+	 * @dataProvider validate_email_provider
+	 */
+	public function test_validate_email(string $email, bool $expected) : void {
+		$this->assertEquals($expected, validate_email($email));
+	}
 
+	/**
+	 * Test that the validate_email function is disabled when configured to.
+	 *
+	 * @dataProvider validate_email_provider
+	 */
+	public function test_disable_validate_email(string $email) : void {
+		\Zotlabs\Lib\Config::Set('system', 'disable_email_validation', true);
+		$this->assertTrue(validate_email($email));
+	}
+
+	function validate_email_provider() : array {
+		return [
+			// First some invalid email addresses
+			['', false],
+			['not_an_email', false],
+			['@not_an_email', false],
+			['not@an@email', false],
+			['not@an@email.com', false],
+
+			// then test valid addresses too
+			['test@example.com', true],
+
+			// Should also work with international domains
+			['some.email@dømain.net', true],
+
+			// Should also work with the new top-level domains
+			['some.email@example.cancerresearch', true],
+
+			// And internationalized TLD's
+			['some.email@example.شبكة', true]
+		];
+	}
+}
diff --git a/tests/unit/includes/dba/_files/config.yml b/tests/unit/includes/dba/_files/config.yml
index 80b9ba12f..e93486857 100644
--- a/tests/unit/includes/dba/_files/config.yml
+++ b/tests/unit/includes/dba/_files/config.yml
@@ -1,13 +1,23 @@
 ---
 config:
   -
-    id: 1
     cat: system
     k: do_not_check_dns
     v: true
   -
-    id: 2
     cat: system
     k: not_allowed_email
     v: 'baduser@example.com,baddomain.com,*.evil.org'
+  -
+    cat: system
+    k: debugging
+    v: true
+  -
+    cat: system
+    k: loglevel
+    v: 2
+  -
+    cat: system
+    k: logfile
+    v: tests/results/unit_test.log