diff options
| author | Michael <icarus@dabo.de> | 2012-05-19 16:55:33 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-19 16:55:33 +0200 |
| commit | 6342b3e0bdd5774857a8fca809994f05e0208d25 (patch) | |
| tree | 54114a005e74c8a6d8bad8a490e1d1e41bc4178f /tests | |
| parent | 2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (diff) | |
| parent | 9a940786c18c1c2bd772aec93f1828f67dc45667 (diff) | |
| download | volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.gz volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.bz2 volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/autoname_test.php | 7 | ||||
| -rw-r--r-- | tests/get_tags_test.php | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/autoname_test.php b/tests/autoname_test.php index c83e4a471..702e05bef 100644 --- a/tests/autoname_test.php +++ b/tests/autoname_test.php @@ -67,7 +67,10 @@ class AutonameTest extends PHPUnit_Framework_TestCase { $autoname2=autoname(1);
$this->assertEquals(1, count($autoname2)); - - $this->assertFalse($autoname1==$autoname2);
+ + // The following test is problematic, with only 26 possibilities + // generating the same thing twice happens often aka + // birthday paradox +// $this->assertFalse($autoname1==$autoname2);
} }
\ No newline at end of file diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index e5c6485de..40f016747 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -202,8 +202,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { } $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); + $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags); + $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); }
|