Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2 files changed, 37 insertions, 33 deletions

diff --git a/tests/unit/TextTest.php b/tests/unit/TextTest.php
deleted file mode 100644
index 48c04bc54..000000000
--- a/tests/unit/TextTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * this file contains tests for text.php
- *
- * @package test.util
- */
-
-use PHPUnit\Framework\TestCase;
-
-/** required, it is the file under test */
-require_once('include/text.php');
-
-/**
- * TestCase for the texter
- *
- * @author ken restivo
- * @package test.util
- */
-class TextTest extends TestCase {
-	public function testGoodEmail() {
-		$this->assertTrue(valid_email_regex('ken@spaz.org'));
-	}
-	public function testGoodEmail2() {
-		$this->assertTrue(valid_email_regex('ken@restivo.org'));
-	}
-	public function testGoodEmail3() {
-		$this->assertTrue(valid_email_regex('nobody@hubzilla.com'));
-	}
-	public function testBadEmail() {
-		$this->assertFalse(valid_email_regex('nobody!uses!these!any.more'));
-	}
-
-}
\ No newline at end of file
diff --git a/tests/unit/includes/TextTest.php b/tests/unit/includes/TextTest.php
new file mode 100644
index 000000000..2b4cb19ea
--- /dev/null
+++ b/tests/unit/includes/TextTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Zotlabs\Tests\Unit\includes;
+
+use Zotlabs\Tests\Unit\UnitTestCase;
+
+/**
+ * @brief Unit Test case for texter.
+ *
+ * @author ken restivo
+ */
+class TextTest extends UnitTestCase {
+
+	public function testGoodEmail() {
+		$this->assertTrue(valid_email_regex('ken@spaz.org'));
+		$this->assertTrue(valid_email_regex('ken@restivo.org'));
+		$this->assertTrue(valid_email_regex('nobody@hubzilla.org'));
+		$this->assertTrue(valid_email_regex('foo+nobody@hubzilla.org'));
+	}
+
+	public function testBadEmail() {
+		$this->assertFalse(valid_email_regex('nobody!uses!these!any.more'));
+		$this->assertFalse(valid_email_regex('foo@bar@hubzilla.org'));
+	}
+
+	public function testPurifyHTML() {
+		$html = '<div id="id01"><p class="p01">text<br><b>b</b></p></div>';
+		$html_expect = '<div id="id01"><p class="p01">text<br /><b>b</b></p></div>';
+		$html5elements = '<section>section<nav>navigation</nav><article>main<a href="http://hubzilla.org/">hubzilla.org</a></article></section><footer>footer</footer>';
+		$htmldata = '<div data-title="title">text</div>';
+
+		$this->assertEquals($html_expect, purify_html($html));
+		$this->assertEquals($html5elements, purify_html($html5elements));
+		$this->assertEquals($htmldata, purify_html($htmldata));
+	}
+}
+