Continued rewriting:
- use dba::is_result() everywhere (where I found the old, bad way) - converted some spaces -> tabs for code - converted some CRLF -> LF as mixures of both is not good Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
parent
56a2bbc740
commit
3e701b90ac
93 changed files with 451 additions and 450 deletions
|
@ -55,13 +55,13 @@ function q($sql) {
|
|||
return $result;
|
||||
}
|
||||
//second call in handle_body, name
|
||||
if($result[0]['name']===$args[1]) {
|
||||
return $result;
|
||||
if($result[0]['name']===$args[1]) {
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
//third call in handle_body, nick or attag
|
||||
if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {
|
||||
return $result;
|
||||
if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -88,23 +88,23 @@ function dbesc($str) {
|
|||
*/
|
||||
class GetTagsTest extends PHPUnit_Framework_TestCase {
|
||||
/** the mock to use as app */
|
||||
private $a;
|
||||
private $a;
|
||||
|
||||
/**
|
||||
* initialize the test. That's a phpUnit function,
|
||||
* don't change its name.
|
||||
*/
|
||||
public function setUp() {
|
||||
*/
|
||||
public function setUp() {
|
||||
$this->a=new MockApp();
|
||||
}
|
||||
|
||||
/**
|
||||
* test with one Person tag
|
||||
*/
|
||||
public function testGetTagsShortPerson() {
|
||||
$text="hi @Mike";
|
||||
|
||||
$tags=get_tags($text);
|
||||
/**
|
||||
* test with one Person tag
|
||||
*/
|
||||
public function testGetTagsShortPerson() {
|
||||
$text="hi @Mike";
|
||||
|
||||
$tags=get_tags($text);
|
||||
|
||||
$inform='';
|
||||
$str_tags='';
|
||||
|
@ -113,32 +113,32 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
|
|||
}
|
||||
|
||||
//correct tags found?
|
||||
$this->assertEquals(1, count($tags));
|
||||
$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);
|
||||
$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);
|
||||
* There's a minor spelling mistake...
|
||||
*/
|
||||
public function testGetTagsShortPersonSpelling() {
|
||||
$text="hi @Mike.because";
|
||||
|
||||
//correct tags found?
|
||||
$this->assertEquals(1, count($tags));
|
||||
$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]);
|
||||
|
||||
|
||||
$inform='';
|
||||
$str_tags='';
|
||||
handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]);
|
||||
|
||||
// (mike) - This is a tricky case.
|
||||
// we support mentions as in @mike@example.com - which contains a period.
|
||||
// This shouldn't match anything unless you have a contact named "Mike.because".
|
||||
|
@ -147,91 +147,91 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
|
|||
|
||||
// $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);
|
||||
// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);
|
||||
|
||||
$this->assertEquals("", $inform);
|
||||
$this->assertEquals("", $str_tags);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* test with two Person tags.
|
||||
* There's a minor spelling mistake...
|
||||
*/
|
||||
* There's a minor spelling mistake...
|
||||
*/
|
||||
|
||||
public function testGetTagsPerson2Spelling() {
|
||||
$text="hi @Mike@campino@friendica.eu";
|
||||
|
||||
$tags=get_tags($text);
|
||||
public function testGetTagsPerson2Spelling() {
|
||||
$text="hi @Mike@campino@friendica.eu";
|
||||
|
||||
$tags=get_tags($text);
|
||||
|
||||
// This construct is not supported. Results are indeterminate
|
||||
// $this->assertEquals(2, count($tags));
|
||||
// $this->assertEquals(2, count($tags));
|
||||
// $this->assertTrue(in_array("@Mike", $tags));
|
||||
// $this->assertTrue(in_array("@campino@friendica.eu", $tags));
|
||||
}
|
||||
// $this->assertTrue(in_array("@campino@friendica.eu", $tags));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test with one hash tag.
|
||||
*/
|
||||
public function testGetTagsShortTag() {
|
||||
$text="This is a #test_case";
|
||||
|
||||
$tags=get_tags($text);
|
||||
*/
|
||||
public function testGetTagsShortTag() {
|
||||
$text="This is a #test_case";
|
||||
|
||||
$this->assertEquals(1, count($tags));
|
||||
$this->assertTrue(in_array("#test_case", $tags));
|
||||
}
|
||||
$tags=get_tags($text);
|
||||
|
||||
$this->assertEquals(1, count($tags));
|
||||
$this->assertTrue(in_array("#test_case", $tags));
|
||||
}
|
||||
|
||||
/**
|
||||
* test with a person and a hash tag
|
||||
*/
|
||||
public function testGetTagsShortTagAndPerson() {
|
||||
$text="hi @Mike This is a #test_case";
|
||||
|
||||
$tags=get_tags($text);
|
||||
*/
|
||||
public function testGetTagsShortTagAndPerson() {
|
||||
$text="hi @Mike This is a #test_case";
|
||||
|
||||
$tags=get_tags($text);
|
||||
|
||||
$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));
|
||||
$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?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);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 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);
|
||||
|
||||
*/
|
||||
public function testGetTagsShortTagAndPersonSpecialChars() {
|
||||
$text="hi @Mike, This is a #test_case.";
|
||||
|
||||
$tags=get_tags($text);
|
||||
|
||||
$this->assertEquals(2, count($tags));
|
||||
$this->assertTrue(in_array("@Mike", $tags));
|
||||
$this->assertTrue(in_array("#test_case", $tags));
|
||||
}
|
||||
$this->assertTrue(in_array("#test_case", $tags));
|
||||
}
|
||||
|
||||
/**
|
||||
* 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);
|
||||
*/
|
||||
public function testGetTagsPersonOnly() {
|
||||
$text="@Test I saw the Theme Dev group was created.";
|
||||
|
||||
$this->assertEquals(2, count($tags));
|
||||
$tags=get_tags($text);
|
||||
|
||||
$this->assertEquals(2, count($tags));
|
||||
$this->assertTrue(in_array("@Test I", $tags));
|
||||
$this->assertTrue(in_array("@Test", $tags));
|
||||
}
|
||||
$this->assertTrue(in_array("@Test", $tags));
|
||||
}
|
||||
|
||||
/**
|
||||
* this test demonstrates strange behaviour by intval.
|
||||
|
@ -255,72 +255,72 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
|
|||
//happens right now, but it shouldn't be necessary
|
||||
$this->assertTrue(in_array("@mike+15 id", $tags));
|
||||
|
||||
$inform='';
|
||||
$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("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);
|
||||
$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
|
||||
// this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery
|
||||
$this->assertContains("cid:15",$inform);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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);
|
||||
*/
|
||||
public function testGetTags2Persons1TagSpecialChars() {
|
||||
$text="hi @Mike, I'm just writing #test_cases, so"
|
||||
." so @somebody@friendica.com may change #things.";
|
||||
|
||||
$this->assertEquals(5, count($tags));
|
||||
$this->assertTrue(in_array("@Mike", $tags));
|
||||
$tags=get_tags($text);
|
||||
|
||||
$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));
|
||||
}
|
||||
$this->assertTrue(in_array("@somebody@friendica.com", $tags));
|
||||
$this->assertTrue(in_array("@somebody@friendica.com may", $tags));
|
||||
$this->assertTrue(in_array("#things", $tags));
|
||||
}
|
||||
|
||||
/**
|
||||
* 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. ";
|
||||
|
||||
$tags=get_tags($text);
|
||||
|
||||
$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));
|
||||
*/
|
||||
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. ";
|
||||
|
||||
$tags=get_tags($text);
|
||||
|
||||
$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 (unsupported)
|
||||
// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));
|
||||
// $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));
|
||||
}
|
||||
// $this->assertTrue(in_array("@campino@friendica.eu is", $tags));
|
||||
}
|
||||
|
||||
/**
|
||||
* test with an empty string
|
||||
*/
|
||||
public function testGetTagsEmpty() {
|
||||
$tags=get_tags("");
|
||||
$this->assertEquals(0, count($tags));
|
||||
*/
|
||||
public function testGetTagsEmpty() {
|
||||
$tags=get_tags("");
|
||||
$this->assertEquals(0, count($tags));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue