Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
  roll protocol version due to ssl_policy settings
  force login to ssl on SSL_POLICY_SELFSIGN
  basic ssl_policy for important modules
  ssl_policy stuff
  revup
  splitted tests into several files
  removed done TODO
  get_tags tests corrected. They test for the right things now.
  addon settings form error
  more work on filer, comment level and file tag removal
  added slack-NS, non-scrolly, slackr-based theme.
  get tags test improved
  splitted test cases.
  changed a test string
  added some tests
  added library and include to .htaccess
  excludes reports from git
  better tests
  added test blueprints, fixed? encoding issues

* master:

1 files changed, 73 insertions, 0 deletions

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