keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix expand_acl tests

Browse source 
- Space containing values aren't valid anymore
- Return values are strings
This commit is contained in:
Hypolite Petovan 2019-07-16 00:27:42 -04:00
parent 496b02bdd2
commit 8485874a87
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/include/TextTest.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Test; namespace Friendica\Test;
use Friendica\Model\Group;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
/** /**
@ -55,8 +56,8 @@ class TextTest extends TestCase
*/ */
public function testExpandAclNormal() public function testExpandAclNormal()
{ {
$text='<1><2><3>'; $text='<1><2><3><' . Group::FOLLOWERS . '><' . Group::MUTUALS . '>';
$this->assertEquals(array(1, 2, 3), expand_acl($text)); $this->assertEquals(array('1', '2', '3', Group::FOLLOWERS, Group::MUTUALS), expand_acl($text));
} }
/** /**
@ -65,7 +66,7 @@ class TextTest extends TestCase
public function testExpandAclBigNumber() public function testExpandAclBigNumber()
{ {
$text='<1><' . PHP_INT_MAX . '><15>'; $text='<1><' . PHP_INT_MAX . '><15>';
$this->assertEquals(array(1, PHP_INT_MAX, 15), expand_acl($text)); $this->assertEquals(array('1', (string)PHP_INT_MAX, '15'), expand_acl($text));
} }
/** /**
@ -76,7 +77,7 @@ class TextTest extends TestCase
public function testExpandAclString() public function testExpandAclString()
{ {
$text="<1><279012><tt>"; $text="<1><279012><tt>";
$this->assertEquals(array(1, 279012), expand_acl($text)); $this->assertEquals(array('1', '279012'), expand_acl($text));
} }
/** /**
@ -87,7 +88,7 @@ class TextTest extends TestCase
public function testExpandAclSpace() public function testExpandAclSpace()
{ {
$text="<1><279 012><32>"; $text="<1><279 012><32>";
$this->assertEquals(array(1, "279", "32"), expand_acl($text)); $this->assertEquals(array('1', '32'), expand_acl($text));
} }
/** /**
@ -174,7 +175,7 @@ class TextTest extends TestCase
public function testExpandAclEmptyMatch() public function testExpandAclEmptyMatch()
{ {
$text="<1><><3>"; $text="<1><><3>";
$this->assertEquals(array(1,3), expand_acl($text)); $this->assertEquals(array('1', '3'), expand_acl($text));
} }
/** /**