From fbc017cdba81fa7b159bca5fd0b3a4fb4885c5ad Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Mon, 5 Mar 2012 22:22:10 +0100
Subject: added test blueprints, fixed? encoding issues

---
 tests/xss_filter_tests.php | 140 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 tests/xss_filter_tests.php

(limited to 'tests')

diff --git a/tests/xss_filter_tests.php b/tests/xss_filter_tests.php
new file mode 100644
index 000000000..2d29e390a
--- /dev/null
+++ b/tests/xss_filter_tests.php
@@ -0,0 +1,140 @@
+<?php
+/**
+* Tests, without pHPUnit by now
+* @package test.util
+*/
+
+require_once(text.php); 
+
+/**
+* test no tags
+*/
+$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />'
+
+$validstring=notags($invalidstring); 
+$escapedString=escape_tags($invalidstring); 
+
+assert("[submit type="button" onclick="alert(\'failed!\');" /]", $validstring); 
+assert("what ever", $escapedString); 
+
+/**
+*autonames should be random, even length
+*/
+$autoname1=autoname(10); 
+$autoname2=autoname(10); 
+
+assertNotEquals($autoname1, $autoname2); 
+
+/**
+*autonames should be random, odd length
+*/
+$autoname1=autoname(9); 
+$autoname2=autoname(9); 
+
+assertNotEquals($autoname1, $autoname2); 
+
+/**
+* try to fail autonames
+*/
+$autoname1=autoname(0); 
+$autoname2=autoname(MAX_VALUE); 
+$autoname3=autoname(1); 
+assert(count($autoname1), 0); 
+assert(count($autoname2), MAX_VALUE); 
+assert(count($autoname3), 1); 
+
+/**
+*xmlify and unxmlify
+*/
+$text="<tag>I want to break\n this!11!<?hard?></tag>"
+$xml=xmlify($text); //test whether it actually may be part of a xml document
+$retext=unxmlify($text); 
+
+assert($text, $retext); 
+
+/**
+* test hex2bin and reverse
+*/
+
+assert(-3, hex2bin(bin2hex(-3))); 
+assert(0, hex2bin(bin2hex(0))); 
+assert(12, hex2bin(bin2hex(12))); 
+assert(MAX_INT, hex2bin(bin2hex(MAX_INT))); 
+
+/**
+* test expand_acl
+*/
+$text="<1><2><3>"; 
+assert(array(1, 2, 3), $text); 
+
+$text="<1><279012><15>"; 
+assert(array(1, 279012, 15), $text); 
+
+$text="<1><279012><tt>"; //maybe that's invalid
+assert(array(1, 279012, "tt"), $text); 
+
+$text="<1><279 012><tt>"; //maybe that's invalid
+assert(array(1, "279 012", "tt"), $text); 
+
+$text=""; //maybe that's invalid
+assert(array(), $text); 
+
+$text="According to documentation, that's invalid. "; //should be invalid
+assert(array(), $text); 
+
+$text="<Another invalid string"; //should be invalid
+assert(array(), $text); 
+
+$text="Another invalid> string"; //should be invalid
+assert(array(), $text); 
+
+$text="Another> invalid> string>"; //should be invalid
+assert(array(), $text); 
+
+/**
+* test attribute contains
+*/
+$testAttr="class1 notclass2 class3"; 
+assertTrue(attribute_contains($testAttr, "class3")); 
+assertFalse(attribute_contains($testAttr, "class2")); 
+
+$testAttr=""; 
+assertFalse(attribute_contains($testAttr, "class2")); 
+
+$testAttr="--... %$§() /(=?}"; 
+assertFalse(attribute_contains($testAttr, "class2")); 
+
+/**
+* test get_tags
+*/
+$text="hi @Mike, I'm just writing #test_cases, "; 
+$text.=" so @somebody@friendica.com may change #things. Of course I "; 
+$text.="look for a lot of #pitfalls, like #tags at the end of a sentence "; 
+$text.="@comment. I hope noone forgets about @fullstops.because that might"; 
+$text.=" break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "; 
+$text.="Now, add a @first_last tag. "
+//check whether this are all variants (no, auto-stuff is missing). 
+
+$tags=get_tags($text); 
+
+assert("@Mike", $tags[0]); 
+assert("#test_cases", $tags[1]); 
+assert("@somebody@friendica.com", $tags[2]); 
+assert("#things", $tags[3]); 
+assert("#pitfalls", $tags[4]); 
+assert("#tags", $tags[5]); 
+assert("@comment", $tags[6]); 
+assert("@fullstops", $tags[7]); 
+assert("#things", $tags[8]); 
+assert("@Mike", $tags[9]); 
+assert("@campino@friendica.eu", $tags[10]); 
+assert("#nice", $tags[11]); 
+assert("@first_last", $tags[12]); 
+
+$tags=get_tags(""); 
+assert(0, count($tags)); 
+
+//function qp, quick and dirty??
+//get_mentions
+//get_contact_block, bis Zeile 538
+?>
-- 
cgit v1.2.3


From 185fcd0701946babf61066b49582225286061563 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Thu, 8 Mar 2012 17:43:12 +0100
Subject: better tests

---
 tests/xss_filter_test.php  | 217 +++++++++++++++++++++++++++++++++++++++++++++
 tests/xss_filter_tests.php | 140 -----------------------------
 2 files changed, 217 insertions(+), 140 deletions(-)
 create mode 100644 tests/xss_filter_test.php
 delete mode 100644 tests/xss_filter_tests.php

(limited to 'tests')

diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php
new file mode 100644
index 000000000..e480ef7ec
--- /dev/null
+++ b/tests/xss_filter_test.php
@@ -0,0 +1,217 @@
+<?php
+/**
+* Tests, without pHPUnit by now
+* @package test.util
+*/
+
+require_once('include/text.php'); 
+
+class AntiXSSTest extends PHPUnit_Framework_TestCase {
+
+/**
+* test no tags
+*/
+	public function testEscapeTags() {
+		$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />';
+
+		$validstring=notags($invalidstring);
+		$escapedString=escape_tags($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);
+	}
+
+	/**
+	 *autonames should be random, even length
+	 */
+	public function testAutonameEven() {
+		$autoname1=autoname(10);
+		$autoname2=autoname(10);
+
+		$this->assertNotEquals($autoname1, $autoname2);
+	}
+
+	/**
+	 *autonames should be random, odd length
+	 */
+	public function testAutonameOdd() {
+		$autoname1=autoname(9);
+		$autoname2=autoname(9);
+
+		$this->assertNotEquals($autoname1, $autoname2);
+	}
+
+	/**
+	 * try to fail autonames
+	 */
+	public function testAutonameNoLength() {
+		$autoname1=autoname(0);
+		$this->assertEquals(0, count($autoname1));
+	}
+
+	public function testAutonameNegativeLength() {
+		$autoname1=autoname(-23);
+		$this->assertEquals(0, count($autoname1));
+	}
+	
+// 	public function testAutonameMaxLength() {
+// 		$autoname2=autoname(PHP_INT_MAX);
+// 		$this->assertEquals(PHP_INT_MAX, count($autoname2));
+// 	}
+	
+	public function testAutonameLength1() {
+		$autoname3=autoname(1);
+		$this->assertEquals(1, count($autoname3));
+	}
+
+	/**
+	 *xmlify and unxmlify
+	 */
+	public function testXmlify() {
+		$text="<tag>I want to break\n this!11!<?hard?></tag>"; 
+		$xml=xmlify($text); //test whether it actually may be part of a xml document
+		$retext=unxmlify($text);
+
+		$this->assertEquals($text, $retext);
+	}
+
+	/**
+	 * test hex2bin and reverse
+	 */
+
+	public function testHex2Bin() {
+		$this->assertEquals(-3, hex2bin(bin2hex(-3)));
+		$this->assertEquals(0, hex2bin(bin2hex(0)));
+		$this->assertEquals(12, hex2bin(bin2hex(12)));
+		$this->assertEquals(PHP_INT_MAX, hex2bin(bin2hex(PHP_INT_MAX)));
+	}
+	
+	/**
+	 * test expand_acl
+	 */
+	public function testExpandAclNormal() {
+		$text="<1><2><3>";
+		$this->assertEquals(array(1, 2, 3), expand_acl($text));
+	}
+	
+	public function testExpandAclBigNumber() {
+		$text="<1><279012><15>";
+		$this->assertEquals(array(1, 279012, 15), expand_acl($text));
+	}
+
+	public function testExpandAclString() {
+		$text="<1><279012><tt>"; //maybe that's invalid
+		$this->assertEquals(array(1, 279012, 'tt'), expand_acl($text));
+	}
+
+	public function testExpandAclSpace() {
+		$text="<1><279 012><32>"; //maybe that's invalid
+		$this->assertEquals(array(1, "279 012", "32"), expand_acl($text));
+	}
+
+	public function testExpandAclEmpty() {
+		$text=""; //maybe that's invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+
+	public function testExpandAclNoBrackets() {
+		$text="According to documentation, that's invalid. "; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+
+	public function testExpandAclJustOneBracket1() {
+		$text="<Another invalid string"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+
+	public function testExpandAclJustOneBracket2() {
+		$text="Another invalid> string"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+
+	public function testExpandAclCloseOnly() {
+		$text="Another> invalid> string>"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	public function testExpandAclOpenOnly() {
+		$text="<Another< invalid string<"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	public function testExpandAclNoMatching1() {
+		$text="<Another<> invalid <string>"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	public function testExpandAclNoMatching2() {
+		$text="<1>2><3>"; 
+		$this->assertEquals(array(), expand_acl($text));
+	}
+
+	/**
+	 * test attribute contains
+	 */
+	public function testAttributeContains1() {
+		$testAttr="class1 notclass2 class3";
+		$this->assertTrue(attribute_contains($testAttr, "class3"));
+		$this->assertFalse(attribute_contains($testAttr, "class2"));
+	}
+
+	/**
+	 * test attribute contains
+	 */
+	public function testAttributeContains2() {
+		$testAttr="class1 not-class2 class3";
+		$this->assertTrue(attribute_contains($testAttr, "class3"));
+		$this->assertFalse(attribute_contains($testAttr, "class2"));
+	}
+	
+	public function testAttributeContainsEmpty() {
+		$testAttr="";
+		$this->assertFalse(attribute_contains($testAttr, "class2"));
+	}
+
+	public function testAttributeContainsSpecialChars() {
+		$testAttr="--... %\$ä() /(=?}";
+		$this->assertFalse(attribute_contains($testAttr, "class2"));
+	}
+	
+	/**
+	 * test get_tags
+	 */
+	public function testGetTags() {
+		$text="hi @Mike, I'm just writing #test_cases, "
+		." so @somebody@friendica.com may change #things. Of course I "
+		."look for a lot of #pitfalls, like #tags at the end of a sentence "
+		."@comment. I hope noone forgets about @fullstops.because that might"
+		." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "
+		."Now, add a @first_last tag. "; 
+		//check whether this are all variants (no, auto-stuff is missing).
+
+		$tags=get_tags($text);
+
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("#test_cases", $tags[1]);
+		$this->assertEquals("@somebody@friendica.com", $tags[2]);
+		$this->assertEquals("#things", $tags[3]);
+		$this->assertEquals("#pitfalls", $tags[4]);
+		$this->assertEquals("#tags", $tags[5]);
+		$this->assertEquals("@comment", $tags[6]);
+		$this->assertEquals("@fullstops", $tags[7]);
+		$this->assertEquals("#things", $tags[8]);
+		$this->assertEquals("@Mike", $tags[9]);
+		$this->assertEquals("@campino@friendica.eu", $tags[10]);
+		$this->assertEquals("#nice", $tags[11]);
+		$this->assertEquals("@first_last", $tags[12]);
+	}
+
+	public function testGetTagsEmpty() {
+		$tags=get_tags("");
+		$this->assertEquals(0, count($tags));
+	}
+//function qp, quick and dirty??
+//get_mentions
+//get_contact_block, bis Zeile 538
+}
+?>
diff --git a/tests/xss_filter_tests.php b/tests/xss_filter_tests.php
deleted file mode 100644
index 2d29e390a..000000000
--- a/tests/xss_filter_tests.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
-* Tests, without pHPUnit by now
-* @package test.util
-*/
-
-require_once(text.php); 
-
-/**
-* test no tags
-*/
-$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />'
-
-$validstring=notags($invalidstring); 
-$escapedString=escape_tags($invalidstring); 
-
-assert("[submit type="button" onclick="alert(\'failed!\');" /]", $validstring); 
-assert("what ever", $escapedString); 
-
-/**
-*autonames should be random, even length
-*/
-$autoname1=autoname(10); 
-$autoname2=autoname(10); 
-
-assertNotEquals($autoname1, $autoname2); 
-
-/**
-*autonames should be random, odd length
-*/
-$autoname1=autoname(9); 
-$autoname2=autoname(9); 
-
-assertNotEquals($autoname1, $autoname2); 
-
-/**
-* try to fail autonames
-*/
-$autoname1=autoname(0); 
-$autoname2=autoname(MAX_VALUE); 
-$autoname3=autoname(1); 
-assert(count($autoname1), 0); 
-assert(count($autoname2), MAX_VALUE); 
-assert(count($autoname3), 1); 
-
-/**
-*xmlify and unxmlify
-*/
-$text="<tag>I want to break\n this!11!<?hard?></tag>"
-$xml=xmlify($text); //test whether it actually may be part of a xml document
-$retext=unxmlify($text); 
-
-assert($text, $retext); 
-
-/**
-* test hex2bin and reverse
-*/
-
-assert(-3, hex2bin(bin2hex(-3))); 
-assert(0, hex2bin(bin2hex(0))); 
-assert(12, hex2bin(bin2hex(12))); 
-assert(MAX_INT, hex2bin(bin2hex(MAX_INT))); 
-
-/**
-* test expand_acl
-*/
-$text="<1><2><3>"; 
-assert(array(1, 2, 3), $text); 
-
-$text="<1><279012><15>"; 
-assert(array(1, 279012, 15), $text); 
-
-$text="<1><279012><tt>"; //maybe that's invalid
-assert(array(1, 279012, "tt"), $text); 
-
-$text="<1><279 012><tt>"; //maybe that's invalid
-assert(array(1, "279 012", "tt"), $text); 
-
-$text=""; //maybe that's invalid
-assert(array(), $text); 
-
-$text="According to documentation, that's invalid. "; //should be invalid
-assert(array(), $text); 
-
-$text="<Another invalid string"; //should be invalid
-assert(array(), $text); 
-
-$text="Another invalid> string"; //should be invalid
-assert(array(), $text); 
-
-$text="Another> invalid> string>"; //should be invalid
-assert(array(), $text); 
-
-/**
-* test attribute contains
-*/
-$testAttr="class1 notclass2 class3"; 
-assertTrue(attribute_contains($testAttr, "class3")); 
-assertFalse(attribute_contains($testAttr, "class2")); 
-
-$testAttr=""; 
-assertFalse(attribute_contains($testAttr, "class2")); 
-
-$testAttr="--... %$§() /(=?}"; 
-assertFalse(attribute_contains($testAttr, "class2")); 
-
-/**
-* test get_tags
-*/
-$text="hi @Mike, I'm just writing #test_cases, "; 
-$text.=" so @somebody@friendica.com may change #things. Of course I "; 
-$text.="look for a lot of #pitfalls, like #tags at the end of a sentence "; 
-$text.="@comment. I hope noone forgets about @fullstops.because that might"; 
-$text.=" break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "; 
-$text.="Now, add a @first_last tag. "
-//check whether this are all variants (no, auto-stuff is missing). 
-
-$tags=get_tags($text); 
-
-assert("@Mike", $tags[0]); 
-assert("#test_cases", $tags[1]); 
-assert("@somebody@friendica.com", $tags[2]); 
-assert("#things", $tags[3]); 
-assert("#pitfalls", $tags[4]); 
-assert("#tags", $tags[5]); 
-assert("@comment", $tags[6]); 
-assert("@fullstops", $tags[7]); 
-assert("#things", $tags[8]); 
-assert("@Mike", $tags[9]); 
-assert("@campino@friendica.eu", $tags[10]); 
-assert("#nice", $tags[11]); 
-assert("@first_last", $tags[12]); 
-
-$tags=get_tags(""); 
-assert(0, count($tags)); 
-
-//function qp, quick and dirty??
-//get_mentions
-//get_contact_block, bis Zeile 538
-?>
-- 
cgit v1.2.3


From f84c191f8df126b95d8a41f70e785a9592018390 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Fri, 9 Mar 2012 12:16:58 +0100
Subject: added some tests

---
 tests/xss_filter_test.php | 116 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 90 insertions(+), 26 deletions(-)

(limited to 'tests')

diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php
index e480ef7ec..00e97cf98 100644
--- a/tests/xss_filter_test.php
+++ b/tests/xss_filter_test.php
@@ -1,16 +1,26 @@
 <?php
 /**
-* Tests, without pHPUnit by now
-* @package test.util
-*/
+ * Tests, without pHPUnit by now
+ * @package test.util
+ */
 
-require_once('include/text.php'); 
+require_once("include/template_processor.php");
+require_once('include/text.php');
 
 class AntiXSSTest extends PHPUnit_Framework_TestCase {
 
-/**
-* test no tags
-*/
+	public function setUp() {
+		set_include_path(
+				get_include_path() . PATH_SEPARATOR
+				. 'include' . PATH_SEPARATOR
+				. 'library' . PATH_SEPARATOR
+				. 'library/phpsec' . PATH_SEPARATOR
+				. '.' );
+	}
+
+	/**
+	 * test no tags
+	 */
 	public function testEscapeTags() {
 		$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />';
 
@@ -53,12 +63,12 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$autoname1=autoname(-23);
 		$this->assertEquals(0, count($autoname1));
 	}
-	
-// 	public function testAutonameMaxLength() {
-// 		$autoname2=autoname(PHP_INT_MAX);
-// 		$this->assertEquals(PHP_INT_MAX, count($autoname2));
-// 	}
-	
+
+	// 	public function testAutonameMaxLength() {
+	// 		$autoname2=autoname(PHP_INT_MAX);
+	// 		$this->assertEquals(PHP_INT_MAX, count($autoname2));
+	// 	}
+
 	public function testAutonameLength1() {
 		$autoname3=autoname(1);
 		$this->assertEquals(1, count($autoname3));
@@ -68,7 +78,7 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 	 *xmlify and unxmlify
 	 */
 	public function testXmlify() {
-		$text="<tag>I want to break\n this!11!<?hard?></tag>"; 
+		$text="<tag>I want to break\n this!11!<?hard?></tag>";
 		$xml=xmlify($text); //test whether it actually may be part of a xml document
 		$retext=unxmlify($text);
 
@@ -85,7 +95,7 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(12, hex2bin(bin2hex(12)));
 		$this->assertEquals(PHP_INT_MAX, hex2bin(bin2hex(PHP_INT_MAX)));
 	}
-	
+
 	/**
 	 * test expand_acl
 	 */
@@ -93,7 +103,7 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$text="<1><2><3>";
 		$this->assertEquals(array(1, 2, 3), expand_acl($text));
 	}
-	
+
 	public function testExpandAclBigNumber() {
 		$text="<1><279012><15>";
 		$this->assertEquals(array(1, 279012, 15), expand_acl($text));
@@ -133,19 +143,19 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$text="Another> invalid> string>"; //should be invalid
 		$this->assertEquals(array(), expand_acl($text));
 	}
-	
+
 	public function testExpandAclOpenOnly() {
 		$text="<Another< invalid string<"; //should be invalid
 		$this->assertEquals(array(), expand_acl($text));
 	}
-	
+
 	public function testExpandAclNoMatching1() {
 		$text="<Another<> invalid <string>"; //should be invalid
 		$this->assertEquals(array(), expand_acl($text));
 	}
-	
+
 	public function testExpandAclNoMatching2() {
-		$text="<1>2><3>"; 
+		$text="<1>2><3>";
 		$this->assertEquals(array(), expand_acl($text));
 	}
 
@@ -166,7 +176,7 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$this->assertTrue(attribute_contains($testAttr, "class3"));
 		$this->assertFalse(attribute_contains($testAttr, "class2"));
 	}
-	
+
 	public function testAttributeContainsEmpty() {
 		$testAttr="";
 		$this->assertFalse(attribute_contains($testAttr, "class2"));
@@ -176,17 +186,71 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$testAttr="--... %\$ä() /(=?}";
 		$this->assertFalse(attribute_contains($testAttr, "class2"));
 	}
-	
+
 	/**
 	 * test get_tags
 	 */
+	public function testGetTagsShortPerson() {
+		$text="hi @Mike"; 
+		
+		$tags=get_tags($text);
+		
+		$this->assertEquals("@Mike", $tags[0]);
+	}
+	
+	public function testGetTagsShortTag() {
+		$text="This is a #test_case";
+	
+		$tags=get_tags($text);
+	
+		$this->assertEquals("#test_case", $tags[0]);
+	}
+	
+	public function testGetTagsShortTagAndPerson() {
+		$text="hi @Mike This is a #test_case";
+	
+		$tags=get_tags($text);
+	
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("#test_case", $tags[1]);
+	}
+	
+	public function testGetTagsShortTagAndPersonSpecialChars() {
+		$text="hi @Mike, This is a #test_case.";
+	
+		$tags=get_tags($text);
+	
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("#test_case", $tags[1]);
+	}
+	
+	public function testGetTagsPersonOnly() {
+		$text="@Mike I saw the Theme Dev group was created."; 
+		
+		$tags=get_tags($text);
+		
+		$this->assertEquals("@Mike", $tags[0]);
+	}
+	
+	public function testGetTags2Persons1TagSpecialChars() {
+		$text="hi @Mike, I'm just writing #test_cases, so"
+		." so @somebody@friendica.com may change #things.";
+	
+		$tags=get_tags($text);
+	
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("#test_cases", $tags[1]);
+		$this->assertEquals("@somebody@friendica.com", $tags[2]);
+		$this->assertEquals("#things", $tags[3]);
+	}
+	
 	public function testGetTags() {
 		$text="hi @Mike, I'm just writing #test_cases, "
 		." so @somebody@friendica.com may change #things. Of course I "
 		."look for a lot of #pitfalls, like #tags at the end of a sentence "
 		."@comment. I hope noone forgets about @fullstops.because that might"
 		." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "
-		."Now, add a @first_last tag. "; 
+		."Now, add a @first_last tag. ";
 		//check whether this are all variants (no, auto-stuff is missing).
 
 		$tags=get_tags($text);
@@ -210,8 +274,8 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$tags=get_tags("");
 		$this->assertEquals(0, count($tags));
 	}
-//function qp, quick and dirty??
-//get_mentions
-//get_contact_block, bis Zeile 538
+	//function qp, quick and dirty??
+	//get_mentions
+	//get_contact_block, bis Zeile 538
 }
 ?>
-- 
cgit v1.2.3


From 21589c5eced7869d7105fa439c433e6a12c89531 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Fri, 9 Mar 2012 12:18:37 +0100
Subject: changed a test string

---
 tests/xss_filter_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php
index 00e97cf98..35d3b1be9 100644
--- a/tests/xss_filter_test.php
+++ b/tests/xss_filter_test.php
@@ -225,11 +225,11 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 	}
 	
 	public function testGetTagsPersonOnly() {
-		$text="@Mike I saw the Theme Dev group was created."; 
+		$text="@Test I saw the Theme Dev group was created."; 
 		
 		$tags=get_tags($text);
 		
-		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("@Test", $tags[0]);
 	}
 	
 	public function testGetTags2Persons1TagSpecialChars() {
-- 
cgit v1.2.3


From f8042d04451905486fb766c520736f4060ae9a12 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Fri, 9 Mar 2012 12:57:11 +0100
Subject: splitted test cases.

---
 tests/get_tags_test.php   | 147 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/xss_filter_test.php |  88 ---------------------------
 2 files changed, 147 insertions(+), 88 deletions(-)
 create mode 100644 tests/get_tags_test.php

(limited to 'tests')

diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
new file mode 100644
index 000000000..a458f0fbc
--- /dev/null
+++ b/tests/get_tags_test.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package test.util
+ */
+
+require_once 'include/template_processor.php';
+require_once 'include/text.php';
+require_once 'mod/item.php';
+
+function q($sql) {
+	return array(array('id'=>15, 'network'=>'stat', 'alias'=>'Mike', 'nick'=>'Mike', 'url'=>"http://justatest.de"));
+
+}
+function dbesc($str) {
+	echo $str; 
+}
+
+class GetTagsTest extends PHPUnit_Framework_TestCase {
+
+	public function setUp() {
+		set_include_path(
+				get_include_path() . PATH_SEPARATOR
+				. 'include' . PATH_SEPARATOR
+				. 'library' . PATH_SEPARATOR
+				. 'library/phpsec' . PATH_SEPARATOR
+				. '.' );
+	}
+
+	/**
+	 * test with one Person tag
+	 */
+	public function testGetTagsShortPerson() {
+		$text="hi @Mike";
+
+		$tags=get_tags($text);
+
+		$inform=''; 
+		$str_tags='';
+		handle_body($text, $inform, $str_tags, 11, $tags[0]);
+
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals($text, "hi @[url=http://justatest.de]Mike[/url]");
+	}
+
+	/**
+	 * Test with one hash tag.
+	 */
+	public function testGetTagsShortTag() {
+		$text="This is a #test_case";
+
+		$tags=get_tags($text);
+
+		$this->assertEquals("#test_case", $tags[0]);
+	}
+
+	/**
+	 * test with a person and a hash tag
+	 */
+	public function testGetTagsShortTagAndPerson() {
+		$text="hi @Mike This is a #test_case";
+
+		$tags=get_tags($text);
+
+		$inform='';
+		$str_tags='';
+		handle_body($text, $inform, $str_tags, 11, $tags[0]);
+		
+		$this->assertEquals("hi @[url=http://justatest.de]Mike[/url] This is a #test_case", $text); 
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("#test_case", $tags[1]);
+	}
+
+	/**
+	 * test with a person, a hash tag and some special chars.
+	 */
+	public function testGetTagsShortTagAndPersonSpecialChars() {
+		$text="hi @Mike, This is a #test_case.";
+
+		$tags=get_tags($text);
+
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("#test_case", $tags[1]);
+	}
+
+	/**
+	 * Test with a person tag and text behind it.
+	 */
+	public function testGetTagsPersonOnly() {
+		$text="@Test I saw the Theme Dev group was created.";
+
+		$tags=get_tags($text);
+
+		$this->assertEquals("@Test", $tags[0]);
+	}
+
+	/**
+	 * test with two persons and one special tag.
+	 */
+	public function testGetTags2Persons1TagSpecialChars() {
+		$text="hi @Mike, I'm just writing #test_cases, so"
+		." so @somebody@friendica.com may change #things.";
+
+		$tags=get_tags($text);
+
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("#test_cases", $tags[1]);
+		$this->assertEquals("@somebody@friendica.com", $tags[2]);
+		$this->assertEquals("#things", $tags[3]);
+	}
+
+	/**
+	 * test with a long text.
+	 */
+	public function testGetTags() {
+		$text="hi @Mike, I'm just writing #test_cases, "
+		." so @somebody@friendica.com may change #things. Of course I "
+		."look for a lot of #pitfalls, like #tags at the end of a sentence "
+		."@comment. I hope noone forgets about @fullstops.because that might"
+		." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "
+		."Now, add a @first_last tag. ";
+		//TODO check whether this are all variants (no, auto-stuff is missing).
+
+		$tags=get_tags($text);
+
+		$this->assertEquals("@Mike", $tags[0]);
+		$this->assertEquals("#test_cases", $tags[1]);
+		$this->assertEquals("@somebody@friendica.com", $tags[2]);
+		$this->assertEquals("#things", $tags[3]);
+		$this->assertEquals("#pitfalls", $tags[4]);
+		$this->assertEquals("#tags", $tags[5]);
+		$this->assertEquals("@comment", $tags[6]);
+		$this->assertEquals("@fullstops", $tags[7]);
+		$this->assertEquals("#things", $tags[8]);
+		$this->assertEquals("@Mike", $tags[9]);
+		$this->assertEquals("@campino@friendica.eu", $tags[10]);
+		$this->assertEquals("#nice", $tags[11]);
+		$this->assertEquals("@first_last", $tags[12]);
+	}
+
+	/**
+	 * test with an empty string
+	 */
+	public function testGetTagsEmpty() {
+		$tags=get_tags("");
+		$this->assertEquals(0, count($tags));
+	}
+}
\ No newline at end of file
diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php
index 35d3b1be9..fe944c2a7 100644
--- a/tests/xss_filter_test.php
+++ b/tests/xss_filter_test.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * Tests, without pHPUnit by now
  * @package test.util
  */
 
@@ -187,93 +186,6 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$this->assertFalse(attribute_contains($testAttr, "class2"));
 	}
 
-	/**
-	 * test get_tags
-	 */
-	public function testGetTagsShortPerson() {
-		$text="hi @Mike"; 
-		
-		$tags=get_tags($text);
-		
-		$this->assertEquals("@Mike", $tags[0]);
-	}
-	
-	public function testGetTagsShortTag() {
-		$text="This is a #test_case";
-	
-		$tags=get_tags($text);
-	
-		$this->assertEquals("#test_case", $tags[0]);
-	}
-	
-	public function testGetTagsShortTagAndPerson() {
-		$text="hi @Mike This is a #test_case";
-	
-		$tags=get_tags($text);
-	
-		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals("#test_case", $tags[1]);
-	}
-	
-	public function testGetTagsShortTagAndPersonSpecialChars() {
-		$text="hi @Mike, This is a #test_case.";
-	
-		$tags=get_tags($text);
-	
-		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals("#test_case", $tags[1]);
-	}
-	
-	public function testGetTagsPersonOnly() {
-		$text="@Test I saw the Theme Dev group was created."; 
-		
-		$tags=get_tags($text);
-		
-		$this->assertEquals("@Test", $tags[0]);
-	}
-	
-	public function testGetTags2Persons1TagSpecialChars() {
-		$text="hi @Mike, I'm just writing #test_cases, so"
-		." so @somebody@friendica.com may change #things.";
-	
-		$tags=get_tags($text);
-	
-		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals("#test_cases", $tags[1]);
-		$this->assertEquals("@somebody@friendica.com", $tags[2]);
-		$this->assertEquals("#things", $tags[3]);
-	}
-	
-	public function testGetTags() {
-		$text="hi @Mike, I'm just writing #test_cases, "
-		." so @somebody@friendica.com may change #things. Of course I "
-		."look for a lot of #pitfalls, like #tags at the end of a sentence "
-		."@comment. I hope noone forgets about @fullstops.because that might"
-		." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "
-		."Now, add a @first_last tag. ";
-		//check whether this are all variants (no, auto-stuff is missing).
-
-		$tags=get_tags($text);
-
-		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals("#test_cases", $tags[1]);
-		$this->assertEquals("@somebody@friendica.com", $tags[2]);
-		$this->assertEquals("#things", $tags[3]);
-		$this->assertEquals("#pitfalls", $tags[4]);
-		$this->assertEquals("#tags", $tags[5]);
-		$this->assertEquals("@comment", $tags[6]);
-		$this->assertEquals("@fullstops", $tags[7]);
-		$this->assertEquals("#things", $tags[8]);
-		$this->assertEquals("@Mike", $tags[9]);
-		$this->assertEquals("@campino@friendica.eu", $tags[10]);
-		$this->assertEquals("#nice", $tags[11]);
-		$this->assertEquals("@first_last", $tags[12]);
-	}
-
-	public function testGetTagsEmpty() {
-		$tags=get_tags("");
-		$this->assertEquals(0, count($tags));
-	}
 	//function qp, quick and dirty??
 	//get_mentions
 	//get_contact_block, bis Zeile 538
-- 
cgit v1.2.3


From bce3bfff38ad6f540dca39f6ed5b1d8cae19edb1 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Mon, 12 Mar 2012 13:59:00 +0100
Subject: get tags test improved

---
 tests/get_tags_test.php | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
index a458f0fbc..ee2daced1 100644
--- a/tests/get_tags_test.php
+++ b/tests/get_tags_test.php
@@ -8,11 +8,45 @@ require_once 'include/text.php';
 require_once 'mod/item.php';
 
 function q($sql) {
-	return array(array('id'=>15, 'network'=>'stat', 'alias'=>'Mike', 'nick'=>'Mike', 'url'=>"http://justatest.de"));
+	
+	$result=array(array('id'=>15, 
+			'attag'=>'', 'network'=>'dfrn', 
+			'name'=>'Mike Lastname', 'alias'=>'Mike', 
+			'nick'=>'Mike', 'url'=>"http://justatest.de")); 
+	
+	$args=func_get_args(); 
 
+	$str="";
+	foreach($args as $arg) {
+		$str.=", ".$arg; 
+	}
+	
+	//last parameter is always (in this test) uid, so, it should be 11
+	if($args[count($args)-1]!=11) {
+		throw new Exception("q from get_tags_test was used and uid was not 11. "); 
+	}
+	
+	if(2==count($args)) {
+		//first call in handle_body, id only
+		if($result[0]['id']===$args[1]) {
+			return $result; 
+		}
+	throw new Exception($str); 
+		//second call in handle_body, name
+		if($result[0]['name']===$args[1]) {
+			return $result;
+		}
+	}
+	throw new Exception($str);
+	//third call in handle_body, nick or attag
+	if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {
+		return $result;
+	}
+// 	throw new Exception("Nothing fitted: ".$args[1].", ".$args[2]); 
 }
+
 function dbesc($str) {
-	echo $str; 
+	return $str; 
 }
 
 class GetTagsTest extends PHPUnit_Framework_TestCase {
@@ -39,7 +73,7 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 		handle_body($text, $inform, $str_tags, 11, $tags[0]);
 
 		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals($text, "hi @[url=http://justatest.de]Mike[/url]");
+		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text);
 	}
 
 	/**
-- 
cgit v1.2.3


From 509532d168bf716eb24e030ab59476a88ab91571 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Wed, 14 Mar 2012 12:30:52 +0100
Subject: get_tags tests corrected. They test for the right things now.

---
 tests/get_tags_test.php | 243 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 188 insertions(+), 55 deletions(-)

(limited to 'tests')

diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
index ee2daced1..bde2db7d0 100644
--- a/tests/get_tags_test.php
+++ b/tests/get_tags_test.php
@@ -1,14 +1,41 @@
 <?php
 /**
+ * This file contains the tests for get_tags and the tag handling in item.php
+ * 
  * @package test.util
  */
 
-require_once 'include/template_processor.php';
+/**
+ * required, because it contains the get_tags() function
+ */
 require_once 'include/text.php';
+/**
+ * required, because it contains the tag handling
+ */
 require_once 'mod/item.php';
 
+/**
+ * A class which can be used as replacement for an app if
+ * only get_baseurl is used. 
+ * 
+ * @author Alexander Kampmann
+ * @package test.util
+ */
+class MockApp {
+	function get_baseurl() {
+		return "baseurl"; 
+	}
+}; 
+
+/**
+ * the test should not rely on a database, 
+ * so this is a replacement for the database access method q. 
+ * 
+ * It simulates the user with uid 11 has one contact, named Mike Lastname. 
+ * 
+ * @param string $sql
+ */
 function q($sql) {
-	
 	$result=array(array('id'=>15, 
 			'attag'=>'', 'network'=>'dfrn', 
 			'name'=>'Mike Lastname', 'alias'=>'Mike', 
@@ -16,48 +43,59 @@ function q($sql) {
 	
 	$args=func_get_args(); 
 
-	$str="";
-	foreach($args as $arg) {
-		$str.=", ".$arg; 
-	}
-	
 	//last parameter is always (in this test) uid, so, it should be 11
 	if($args[count($args)-1]!=11) {
-		throw new Exception("q from get_tags_test was used and uid was not 11. "); 
+		return; 
 	}
 	
-	if(2==count($args)) {
+	
+	if(3==count($args)) {
 		//first call in handle_body, id only
-		if($result[0]['id']===$args[1]) {
+		if($result[0]['id']==$args[1]) {
 			return $result; 
 		}
-	throw new Exception($str); 
 		//second call in handle_body, name
 		if($result[0]['name']===$args[1]) {
 			return $result;
 		}
 	}
-	throw new Exception($str);
 	//third call in handle_body, nick or attag
 	if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {
 		return $result;
 	}
-// 	throw new Exception("Nothing fitted: ".$args[1].", ".$args[2]); 
 }
 
+/**
+ * replacement for dbesc. 
+ * I don't want to test dbesc here, so
+ * I just return the input. It won't be a problem, because 
+ * the test does not use a real database. 
+ * 
+ * DON'T USE HAT FUNCTION OUTSIDE A TEST!
+ * 
+ * @param string $str
+ * @return input
+ */
 function dbesc($str) {
 	return $str; 
 }
 
-class GetTagsTest extends PHPUnit_Framework_TestCase {
-
+/**
+ * TestCase for tag handling. 
+ * 
+ * @author alexander
+ * @package test.util
+ */
+class GetTagsTest extends PHPUnit_Framework_TestCase {
+	/** the mock to use as app */
+	private $a; 
+
+	/**
+	 * initialize the test. That's a phpUnit function, 
+	 * don't change its name.
+	 */
 	public function setUp() {
-		set_include_path(
-				get_include_path() . PATH_SEPARATOR
-				. 'include' . PATH_SEPARATOR
-				. 'library' . PATH_SEPARATOR
-				. 'library/phpsec' . PATH_SEPARATOR
-				. '.' );
+		$this->a=new MockApp(); 
 	}
 
 	/**
@@ -70,10 +108,54 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 
 		$inform=''; 
 		$str_tags='';
-		handle_body($text, $inform, $str_tags, 11, $tags[0]);
-
-		$this->assertEquals("@Mike", $tags[0]);
+		foreach($tags as $tag) {
+			handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
+		}
+
+		//correct tags found?
+		$this->assertEquals(1, count($tags)); 
+		$this->assertTrue(in_array("@Mike", $tags));
+		
+		//correct output from handle_tag?
+		$this->assertEquals("cid:15", $inform); 
+		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
 		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text);
+	}
+	
+	/**
+	 * test with one Person tag. 
+	 * There's a minor spelling mistake...
+	 */
+	public function testGetTagsShortPersonSpelling() {
+		$text="hi @Mike.because";
+	
+		$tags=get_tags($text);
+	
+		//correct tags found?
+		$this->assertEquals(1, count($tags));
+		$this->assertTrue(in_array("@Mike.because", $tags));
+		
+		$inform='';
+		$str_tags='';
+		handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]);
+	
+		$this->assertEquals("cid:15", $inform); 
+		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
+		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);
+	}
+	
+	/**
+	 * test with two Person tags. 
+	 * There's a minor spelling mistake...
+	 */
+	public function testGetTagsPerson2Spelling() {
+		$text="hi @Mike@campino@friendica.eu";
+	
+		$tags=get_tags($text);
+	
+		$this->assertEquals(2, count($tags)); 
+		$this->assertTrue(in_array("@Mike", $tags));
+		$this->assertTrue(in_array("@campino@friendica.eu", $tags));
 	}
 
 	/**
@@ -83,8 +165,9 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 		$text="This is a #test_case";
 
 		$tags=get_tags($text);
-
-		$this->assertEquals("#test_case", $tags[0]);
+
+		$this->assertEquals(1, count($tags));
+		$this->assertTrue(in_array("#test_case", $tags));
 	}
 
 	/**
@@ -95,13 +178,21 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 
 		$tags=get_tags($text);
 
-		$inform='';
-		$str_tags='';
-		handle_body($text, $inform, $str_tags, 11, $tags[0]);
-		
-		$this->assertEquals("hi @[url=http://justatest.de]Mike[/url] This is a #test_case", $text); 
-		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals("#test_case", $tags[1]);
+		$this->assertEquals(3, count($tags));
+		$this->assertTrue(in_array("@Mike", $tags));
+		$this->assertTrue(in_array("@Mike This", $tags));
+		$this->assertTrue(in_array("#test_case", $tags));
+
+		$inform='';
+		$str_tags='';
+		foreach($tags as $tag) {
+			handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
+		}
+		
+		$this->assertEquals("cid:15", $inform); 
+		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?search=test%20case]test case[/url]", $str_tags);
+		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?search=test%20case]test case[/url]", $text); 
+		
 	}
 
 	/**
@@ -112,8 +203,9 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 
 		$tags=get_tags($text);
 
-		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals("#test_case", $tags[1]);
+		$this->assertEquals(2, count($tags));
+		$this->assertTrue(in_array("@Mike", $tags));
+		$this->assertTrue(in_array("#test_case", $tags));
 	}
 
 	/**
@@ -123,10 +215,45 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 		$text="@Test I saw the Theme Dev group was created.";
 
 		$tags=get_tags($text);
-
-		$this->assertEquals("@Test", $tags[0]);
+
+		$this->assertEquals(2, count($tags));
+		$this->assertTrue(in_array("@Test I", $tags));
+		$this->assertTrue(in_array("@Test", $tags));
 	}
 
+	/**
+	 * this test demonstrates strange behaviour by intval. 
+	 * It makes the next test fail. 
+	 */
+	public function testIntval() {
+		$this->assertEquals(15, intval("15 it")); 
+	}
+	
+	/**
+	 * test a tag with an id in it
+	 */
+	public function testIdTag() {
+		$text="Test with @mike+15 id tag"; 
+		
+		$tags=get_tags($text); 
+		
+		$this->assertEquals(2, count($tags)); 
+		$this->assertTrue(in_array("@mike+15", $tags));
+		
+		//happens right now, but it shouldn't be necessary
+		$this->assertTrue(in_array("@mike+15 id", $tags));
+		
+		$inform='';
+		$str_tags='';
+		foreach($tags as $tag) {
+			handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
+		}
+		
+		$this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);
+		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
+		$this->assertEquals("cid:15", $inform);
+	}
+	
 	/**
 	 * test with two persons and one special tag.
 	 */
@@ -135,11 +262,13 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 		." so @somebody@friendica.com may change #things.";
 
 		$tags=get_tags($text);
-
-		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals("#test_cases", $tags[1]);
-		$this->assertEquals("@somebody@friendica.com", $tags[2]);
-		$this->assertEquals("#things", $tags[3]);
+
+		$this->assertEquals(5, count($tags));
+		$this->assertTrue(in_array("@Mike", $tags));
+		$this->assertTrue(in_array("#test_cases", $tags));
+		$this->assertTrue(in_array("@somebody@friendica.com", $tags));
+		$this->assertTrue(in_array("@somebody@friendica.com may", $tags));
+		$this->assertTrue(in_array("#things", $tags));
 	}
 
 	/**
@@ -156,19 +285,23 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 
 		$tags=get_tags($text);
 
-		$this->assertEquals("@Mike", $tags[0]);
-		$this->assertEquals("#test_cases", $tags[1]);
-		$this->assertEquals("@somebody@friendica.com", $tags[2]);
-		$this->assertEquals("#things", $tags[3]);
-		$this->assertEquals("#pitfalls", $tags[4]);
-		$this->assertEquals("#tags", $tags[5]);
-		$this->assertEquals("@comment", $tags[6]);
-		$this->assertEquals("@fullstops", $tags[7]);
-		$this->assertEquals("#things", $tags[8]);
-		$this->assertEquals("@Mike", $tags[9]);
-		$this->assertEquals("@campino@friendica.eu", $tags[10]);
-		$this->assertEquals("#nice", $tags[11]);
-		$this->assertEquals("@first_last", $tags[12]);
+		$this->assertTrue(in_array("@Mike", $tags));
+		$this->assertTrue(in_array("#test_cases", $tags));
+		$this->assertTrue(in_array("@somebody@friendica.com", $tags));
+		$this->assertTrue(in_array("#things", $tags));
+		$this->assertTrue(in_array("#pitfalls", $tags));
+		$this->assertTrue(in_array("#tags", $tags));
+		$this->assertTrue(in_array("@comment", $tags));
+		$this->assertTrue(in_array("@fullstops.because", $tags));
+		$this->assertTrue(in_array("#things", $tags));
+		$this->assertTrue(in_array("@Mike", $tags));
+		$this->assertTrue(in_array("#nice", $tags));
+		$this->assertTrue(in_array("@first_last", $tags));
+		
+		//right now, none of the is matched
+		$this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));
+		$this->assertTrue(in_array("@campino@friendica.eu", $tags));
+		$this->assertTrue(in_array("@campino@friendica.eu is", $tags));
 	}
 
 	/**
-- 
cgit v1.2.3


From c0c98206ef322b3d175d5348d37e8d0b5fca140b Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Wed, 14 Mar 2012 12:31:25 +0100
Subject: removed done TODO

---
 tests/get_tags_test.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
index bde2db7d0..9051923be 100644
--- a/tests/get_tags_test.php
+++ b/tests/get_tags_test.php
@@ -281,8 +281,7 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
 		."@comment. I hope noone forgets about @fullstops.because that might"
 		." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "
 		."Now, add a @first_last tag. ";
-		//TODO check whether this are all variants (no, auto-stuff is missing).
-
+		
 		$tags=get_tags($text);
 
 		$this->assertTrue(in_array("@Mike", $tags));
-- 
cgit v1.2.3


From 509ed2604fe6860b83e02984f8b4a280496a22a8 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Wed, 14 Mar 2012 12:54:49 +0100
Subject: splitted tests into several files

---
 tests/autoname_test.php           |  73 +++++++++++++++++++
 tests/contains_attribute_test.php |  51 +++++++++++++
 tests/expand_acl_test.php         | 142 ++++++++++++++++++++++++++++++++++++
 tests/xss_filter_test.php         | 149 +-------------------------------------
 4 files changed, 269 insertions(+), 146 deletions(-)
 create mode 100755 tests/autoname_test.php
 create mode 100755 tests/contains_attribute_test.php
 create mode 100755 tests/expand_acl_test.php

(limited to 'tests')

diff --git a/tests/autoname_test.php b/tests/autoname_test.php
new file mode 100755
index 000000000..9dae920ca
--- /dev/null
+++ b/tests/autoname_test.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * this file contains tests for the autoname function
+ * 
+ * @package test.util
+ */
+
+/** required, it is the file under test */
+require_once('include/text.php');
+
+/**
+ * TestCase for the autoname function
+ * 
+ * @author Alexander Kampmann
+ * @package test.util
+ */
+class AutonameTest extends PHPUnit_Framework_TestCase {
+	/**
+	 *autonames should be random, even length
+	 */
+	public function testAutonameEven() {
+		$autoname1=autoname(10);
+		$autoname2=autoname(10);
+	
+		$this->assertNotEquals($autoname1, $autoname2);
+	}
+	
+	/**
+	 *autonames should be random, odd length
+	 */
+	public function testAutonameOdd() {
+		$autoname1=autoname(9);
+		$autoname2=autoname(9);
+	
+		$this->assertNotEquals($autoname1, $autoname2);
+	}
+	
+	/**
+	 * try to fail autonames
+	 */
+	public function testAutonameNoLength() {
+		$autoname1=autoname(0);
+		$this->assertEquals(0, count($autoname1));
+	}
+	
+	/**
+	 * try to fail it with invalid input
+	 * 
+	 * TODO: What's corect behaviour here? An exception?
+	 */
+	public function testAutonameNegativeLength() {
+		$autoname1=autoname(-23);
+		$this->assertEquals(0, count($autoname1));
+	}
+	
+	// 	public function testAutonameMaxLength() {
+	// 		$autoname2=autoname(PHP_INT_MAX);
+	// 		$this->assertEquals(PHP_INT_MAX, count($autoname2));
+	// 	}
+	
+	/**
+	 * test with a length, that may be too short
+	 */
+	public function testAutonameLength1() {
+		$autoname1=autoname(1);
+		$this->assertEquals(1, count($autoname1));
+		
+		$autoname2=autoname(1);
+		$this->assertEquals(1, count($autoname2));
+		
+		$this->assertFalse($autoname1==$autoname2); 
+	}
+}
\ No newline at end of file
diff --git a/tests/contains_attribute_test.php b/tests/contains_attribute_test.php
new file mode 100755
index 000000000..b0bb06acf
--- /dev/null
+++ b/tests/contains_attribute_test.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * this test tests the contains_attribute function
+ *
+ * @package test.util
+ */
+
+/** required, it is the file under test */
+require_once('include/text.php');
+
+/**
+ * TestCase for the contains_attribute function
+ *
+ * @author Alexander Kampmann
+ * @package test.util
+ */
+class ContainsAttributeTest extends PHPUnit_Framework_TestCase {
+	/**
+	 * test attribute contains
+	 */
+	public function testAttributeContains1() {
+		$testAttr="class1 notclass2 class3";
+		$this->assertTrue(attribute_contains($testAttr, "class3"));
+		$this->assertFalse(attribute_contains($testAttr, "class2"));
+	}
+	
+	/**
+	 * test attribute contains
+	 */
+	public function testAttributeContains2() {
+		$testAttr="class1 not-class2 class3";
+		$this->assertTrue(attribute_contains($testAttr, "class3"));
+		$this->assertFalse(attribute_contains($testAttr, "class2"));
+	}
+	
+	/**
+	 * test with empty input
+	 */
+	public function testAttributeContainsEmpty() {
+		$testAttr="";
+		$this->assertFalse(attribute_contains($testAttr, "class2"));
+	}
+	
+	/**
+	 * test input with special chars
+	 */
+	public function testAttributeContainsSpecialChars() {
+		$testAttr="--... %\$ä() /(=?}";
+		$this->assertFalse(attribute_contains($testAttr, "class2"));
+	}
+}
\ No newline at end of file
diff --git a/tests/expand_acl_test.php b/tests/expand_acl_test.php
new file mode 100755
index 000000000..b516a3f14
--- /dev/null
+++ b/tests/expand_acl_test.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * this test tests the expand_acl function
+ *
+ * @package test.util
+ */
+
+/** required, it is the file under test */
+require_once('include/text.php');
+
+/**
+ * TestCase for the expand_acl function
+ *
+ * @author Alexander Kampmann
+ * @package test.util
+ */
+class ExpandAclTest extends PHPUnit_Framework_TestCase {
+	
+	/**
+	 * test expand_acl, perfect input
+	 */
+	public function testExpandAclNormal() {
+		$text='<1><2><3>';
+		$this->assertEquals(array(1, 2, 3), expand_acl($text));
+	}
+	
+	/**
+	 * test with a big number
+	 */
+	public function testExpandAclBigNumber() {
+		$text='<1><'.PHP_INT_MAX.'><15>';
+		$this->assertEquals(array(1, PHP_INT_MAX, 15), expand_acl($text));
+	}
+	
+	/**
+	 * test with a string in it. 
+	 * 
+	 * TODO: is this valid input? Otherwise: should there be an exception?
+	 */
+	public function testExpandAclString() {
+		$text="<1><279012><tt>"; 
+		$this->assertEquals(array(1, 279012, 'tt'), expand_acl($text));
+	}
+	
+	/**
+	 * test with a ' ' in it. 
+	 * 
+	 * TODO: is this valid input? Otherwise: should there be an exception?
+	 */
+	public function testExpandAclSpace() {
+		$text="<1><279 012><32>"; 
+		$this->assertEquals(array(1, "279 012", "32"), expand_acl($text));
+	}
+	
+	/**
+	 * test empty input
+	 */
+	public function testExpandAclEmpty() {
+		$text=""; 
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	/**
+	 * test invalid input, no < at all
+	 * 
+	 * TODO: should there be an exception?
+	 */
+	public function testExpandAclNoBrackets() {
+		$text="According to documentation, that's invalid. "; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	/**
+	 * test invalid input, just open <
+	 *
+	 * TODO: should there be an exception?
+	 */
+	public function testExpandAclJustOneBracket1() {
+		$text="<Another invalid string"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	/**
+	 * test invalid input, just close >
+	 *
+	 * TODO: should there be an exception?
+	 */
+	public function testExpandAclJustOneBracket2() {
+		$text="Another invalid> string"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	/**
+	 * test invalid input, just close >
+	 *
+	 * TODO: should there be an exception?
+	 */
+	public function testExpandAclCloseOnly() {
+		$text="Another> invalid> string>"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	/**
+	 * test invalid input, just open <
+	 *
+	 * TODO: should there be an exception?
+	 */
+	public function testExpandAclOpenOnly() {
+		$text="<Another< invalid string<"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	/**
+	 * test invalid input, open and close do not match
+	 *
+	 * TODO: should there be an exception?
+	 */
+	public function testExpandAclNoMatching1() {
+		$text="<Another<> invalid <string>"; //should be invalid
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	/**
+	 * test invalid input, open and close do not match
+	 *
+	 * TODO: should there be an exception?
+	 */
+	public function testExpandAclNoMatching2() {
+		$text="<1>2><3>";
+		$this->assertEquals(array(), expand_acl($text));
+	}
+	
+	/**
+	 * test invalid input, empty <>
+	 *
+	 * TODO: should there be an exception? Or array(1, 3)
+	 */
+	public function testExpandAclEmptyMatch() {
+		$text="<1><><3>";
+		$this->assertEquals(array(), expand_acl($text));
+	}
+}
\ No newline at end of file
diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php
index fe944c2a7..d7dcf0472 100644
--- a/tests/xss_filter_test.php
+++ b/tests/xss_filter_test.php
@@ -1,24 +1,16 @@
 <?php
 /**
+ * tests several functions which are used to prevent xss attacks
+ * 
  * @package test.util
  */
 
-require_once("include/template_processor.php");
 require_once('include/text.php');
 
 class AntiXSSTest extends PHPUnit_Framework_TestCase {
 
-	public function setUp() {
-		set_include_path(
-				get_include_path() . PATH_SEPARATOR
-				. 'include' . PATH_SEPARATOR
-				. 'library' . PATH_SEPARATOR
-				. 'library/phpsec' . PATH_SEPARATOR
-				. '.' );
-	}
-
 	/**
-	 * test no tags
+	 * test, that tags are escaped
 	 */
 	public function testEscapeTags() {
 		$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />';
@@ -30,49 +22,6 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals("&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;", $escapedString);
 	}
 
-	/**
-	 *autonames should be random, even length
-	 */
-	public function testAutonameEven() {
-		$autoname1=autoname(10);
-		$autoname2=autoname(10);
-
-		$this->assertNotEquals($autoname1, $autoname2);
-	}
-
-	/**
-	 *autonames should be random, odd length
-	 */
-	public function testAutonameOdd() {
-		$autoname1=autoname(9);
-		$autoname2=autoname(9);
-
-		$this->assertNotEquals($autoname1, $autoname2);
-	}
-
-	/**
-	 * try to fail autonames
-	 */
-	public function testAutonameNoLength() {
-		$autoname1=autoname(0);
-		$this->assertEquals(0, count($autoname1));
-	}
-
-	public function testAutonameNegativeLength() {
-		$autoname1=autoname(-23);
-		$this->assertEquals(0, count($autoname1));
-	}
-
-	// 	public function testAutonameMaxLength() {
-	// 		$autoname2=autoname(PHP_INT_MAX);
-	// 		$this->assertEquals(PHP_INT_MAX, count($autoname2));
-	// 	}
-
-	public function testAutonameLength1() {
-		$autoname3=autoname(1);
-		$this->assertEquals(1, count($autoname3));
-	}
-
 	/**
 	 *xmlify and unxmlify
 	 */
@@ -87,7 +36,6 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * test hex2bin and reverse
 	 */
-
 	public function testHex2Bin() {
 		$this->assertEquals(-3, hex2bin(bin2hex(-3)));
 		$this->assertEquals(0, hex2bin(bin2hex(0)));
@@ -95,97 +43,6 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(PHP_INT_MAX, hex2bin(bin2hex(PHP_INT_MAX)));
 	}
 
-	/**
-	 * test expand_acl
-	 */
-	public function testExpandAclNormal() {
-		$text="<1><2><3>";
-		$this->assertEquals(array(1, 2, 3), expand_acl($text));
-	}
-
-	public function testExpandAclBigNumber() {
-		$text="<1><279012><15>";
-		$this->assertEquals(array(1, 279012, 15), expand_acl($text));
-	}
-
-	public function testExpandAclString() {
-		$text="<1><279012><tt>"; //maybe that's invalid
-		$this->assertEquals(array(1, 279012, 'tt'), expand_acl($text));
-	}
-
-	public function testExpandAclSpace() {
-		$text="<1><279 012><32>"; //maybe that's invalid
-		$this->assertEquals(array(1, "279 012", "32"), expand_acl($text));
-	}
-
-	public function testExpandAclEmpty() {
-		$text=""; //maybe that's invalid
-		$this->assertEquals(array(), expand_acl($text));
-	}
-
-	public function testExpandAclNoBrackets() {
-		$text="According to documentation, that's invalid. "; //should be invalid
-		$this->assertEquals(array(), expand_acl($text));
-	}
-
-	public function testExpandAclJustOneBracket1() {
-		$text="<Another invalid string"; //should be invalid
-		$this->assertEquals(array(), expand_acl($text));
-	}
-
-	public function testExpandAclJustOneBracket2() {
-		$text="Another invalid> string"; //should be invalid
-		$this->assertEquals(array(), expand_acl($text));
-	}
-
-	public function testExpandAclCloseOnly() {
-		$text="Another> invalid> string>"; //should be invalid
-		$this->assertEquals(array(), expand_acl($text));
-	}
-
-	public function testExpandAclOpenOnly() {
-		$text="<Another< invalid string<"; //should be invalid
-		$this->assertEquals(array(), expand_acl($text));
-	}
-
-	public function testExpandAclNoMatching1() {
-		$text="<Another<> invalid <string>"; //should be invalid
-		$this->assertEquals(array(), expand_acl($text));
-	}
-
-	public function testExpandAclNoMatching2() {
-		$text="<1>2><3>";
-		$this->assertEquals(array(), expand_acl($text));
-	}
-
-	/**
-	 * test attribute contains
-	 */
-	public function testAttributeContains1() {
-		$testAttr="class1 notclass2 class3";
-		$this->assertTrue(attribute_contains($testAttr, "class3"));
-		$this->assertFalse(attribute_contains($testAttr, "class2"));
-	}
-
-	/**
-	 * test attribute contains
-	 */
-	public function testAttributeContains2() {
-		$testAttr="class1 not-class2 class3";
-		$this->assertTrue(attribute_contains($testAttr, "class3"));
-		$this->assertFalse(attribute_contains($testAttr, "class2"));
-	}
-
-	public function testAttributeContainsEmpty() {
-		$testAttr="";
-		$this->assertFalse(attribute_contains($testAttr, "class2"));
-	}
-
-	public function testAttributeContainsSpecialChars() {
-		$testAttr="--... %\$ä() /(=?}";
-		$this->assertFalse(attribute_contains($testAttr, "class2"));
-	}
-
 	//function qp, quick and dirty??
 	//get_mentions
 	//get_contact_block, bis Zeile 538
-- 
cgit v1.2.3