From 11cec3229c3c4cbae1a2c808c8d5c89075627ce9 Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Fri, 9 Nov 2018 08:36:28 -0500
Subject: [PATCH] Create/Update tests

create test for new class, move tests from previous
---
 tests/include/TextTest.php     | 72 ----------------------------
 tests/src/Util/StringsTest.php | 85 ++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 72 deletions(-)
 create mode 100644 tests/src/Util/StringsTest.php

diff --git a/tests/include/TextTest.php b/tests/include/TextTest.php
index f5da662f70..e516fe824a 100644
--- a/tests/include/TextTest.php
+++ b/tests/include/TextTest.php
@@ -12,61 +12,6 @@ use PHPUnit\Framework\TestCase;
  */
 class TextTest extends TestCase
 {
-
-	/**
-	 *autonames should be random, even length
-	 */
-	public function testAutonameEven()
-	{
-		$autoname1= Friendica\Util\Strings::getRandomName(10);
-		$autoname2= Friendica\Util\Strings::getRandomName(10);
-
-		$this->assertNotEquals($autoname1, $autoname2);
-	}
-
-	/**
-	 *autonames should be random, odd length
-	 */
-	public function testAutonameOdd()
-	{
-		$autoname1= Friendica\Util\Strings::getRandomName(9);
-		$autoname2= Friendica\Util\Strings::getRandomName(9);
-
-		$this->assertNotEquals($autoname1, $autoname2);
-	}
-
-	/**
-	 * try to fail autonames
-	 */
-	public function testAutonameNoLength()
-	{
-		$autoname1= Friendica\Util\Strings::getRandomName(0);
-		$this->assertEquals(0, strlen($autoname1));
-	}
-
-	/**
-	 * try to fail it with invalid input
-	 *
-	 * @todo What's corect behaviour here? An exception?
-	 */
-	public function testAutonameNegativeLength()
-	{
-		$autoname1= Friendica\Util\Strings::getRandomName(-23);
-		$this->assertEquals(0, strlen($autoname1));
-	}
-
-	/**
-	 * test with a length, that may be too short
-	 */
-	public function testAutonameLength1()
-	{
-		$autoname1= Friendica\Util\Strings::getRandomName(1);
-		$this->assertEquals(1, strlen($autoname1));
-
-		$autoname2= Friendica\Util\Strings::getRandomName(1);
-		$this->assertEquals(1, strlen($autoname2));
-	}
-
 	/**
 	 * test attribute contains
 	 */
@@ -232,23 +177,6 @@ class TextTest extends TestCase
 		$this->assertEquals(array(1,3), expand_acl($text));
 	}
 
-	/**
-	 * test, that tags are escaped
-	 */
-	public function testEscapeTags()
-	{
-		$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />';
-
-		$validstring = Friendica\Util\Strings::removeTags($invalidstring);
-		$escapedString = Friendica\Util\Strings::escapeTags($invalidstring);
-
-		$this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
-		$this->assertEquals(
-			"&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;",
-			$escapedString
-		);
-	}
-
 	/**
 	 * test hex2bin and reverse
 	 */
diff --git a/tests/src/Util/StringsTest.php b/tests/src/Util/StringsTest.php
new file mode 100644
index 0000000000..54a4bdd727
--- /dev/null
+++ b/tests/src/Util/StringsTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @file tests/src/Util/StringsTest.php
+ */
+namespace Friendica\Test\Util;
+
+use Friendica\Util\Strings;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @brief Strings utility test class
+ */
+class StringsTest extends TestCase
+{
+    /**
+	 * randomnames should be random, even length
+	 */
+	public function testRandomEven()
+	{
+		$randomname1 = Strings::getRandomName(10);
+		$randomname2 = Strings::getRandomName(10);
+
+		$this->assertNotEquals($randomname1, $randomname2);
+	}
+
+	/**
+	 * randomnames should be random, odd length
+	 */
+	public function testRandomOdd()
+	{
+		$randomname1 = Strings::getRandomName(9);
+		$randomname2 = Strings::getRandomName(9);
+
+		$this->assertNotEquals($randomname1, $randomname2);
+	}
+
+	/**
+	 * try to fail ramdonnames
+	 */
+	public function testRandomNameNoLength()
+	{
+		$randomname1 = Strings::getRandomName(0);
+		$this->assertEquals(0, strlen($randomname1));
+	}
+
+	/**
+	 * try to fail it with invalid input
+	 *
+	 * @todo What's corect behaviour here? An exception?
+	 */
+	public function testRandomNameNegativeLength()
+	{
+		$randomname1 = Strings::getRandomName(-23);
+		$this->assertEquals(0, strlen($randomname1));
+	}
+
+	/**
+	 * test with a length, that may be too short
+	 */
+	public function testRandomNameLength1()
+	{
+		$randomname1 = Strings::getRandomName(1);
+		$this->assertEquals(1, strlen($randomname1));
+
+		$randomname2 = Strings::getRandomName(1);
+		$this->assertEquals(1, strlen($randomname2));
+    }
+    
+    /**
+	 * test, that tags are escaped
+	 */
+	public function testEscapeTags()
+	{
+		$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />';
+
+		$validstring = Strings::removeTags($invalidstring);
+		$escapedString = Strings::escapeTags($invalidstring);
+
+		$this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
+		$this->assertEquals(
+			"&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;",
+			$escapedString
+		);
+	}
+}