mirror of
https://github.com/friendica/friendica
synced 2025-05-01 19:04:23 +02:00
Fix wrong $this->assert...() with `self::assert...()
This commit is contained in:
Philipp
parent
b3e5621d37
commit
efaec26b1d
63 changed files with 1192 additions and 1192 deletions
|
|
@ -37,18 +37,18 @@ class ACLFormaterTest extends TestCase
|
|||
|
||||
$acl = $aclFormatter->expand($text);
|
||||
|
||||
$this->assertEquals($assert, $acl);
|
||||
self::assertEquals($assert, $acl);
|
||||
|
||||
$this->assertMergable($acl);
|
||||
self::assertMergable($acl);
|
||||
}
|
||||
|
||||
public function assertMergable(array $aclOne, array $aclTwo = [])
|
||||
{
|
||||
$this->assertTrue(is_array($aclOne));
|
||||
$this->assertTrue(is_array($aclTwo));
|
||||
self::assertTrue(is_array($aclOne));
|
||||
self::assertTrue(is_array($aclTwo));
|
||||
|
||||
$aclMerged = array_unique(array_merge($aclOne, $aclTwo));
|
||||
$this->assertTrue(is_array($aclMerged));
|
||||
self::assertTrue(is_array($aclMerged));
|
||||
|
||||
return $aclMerged;
|
||||
}
|
||||
|
|
@ -118,7 +118,7 @@ class ACLFormaterTest extends TestCase
|
|||
*/
|
||||
public function testExpand($input, array $assert)
|
||||
{
|
||||
$this->assertAcl($input, $assert);
|
||||
self::assertAcl($input, $assert);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -131,11 +131,11 @@ class ACLFormaterTest extends TestCase
|
|||
$allow_people = $aclFormatter->expand();
|
||||
$allow_groups = $aclFormatter->expand();
|
||||
|
||||
$this->assertEmpty($aclFormatter->expand(null));
|
||||
$this->assertEmpty($aclFormatter->expand());
|
||||
self::assertEmpty($aclFormatter->expand(null));
|
||||
self::assertEmpty($aclFormatter->expand());
|
||||
|
||||
$recipients = array_unique(array_merge($allow_people, $allow_groups));
|
||||
$this->assertEmpty($recipients);
|
||||
self::assertEmpty($recipients);
|
||||
}
|
||||
|
||||
public function dataAclToString()
|
||||
|
|
@ -188,6 +188,6 @@ class ACLFormaterTest extends TestCase
|
|||
{
|
||||
$aclFormatter = new ACLFormatter();
|
||||
|
||||
$this->assertEquals($assert, $aclFormatter->toString($input));
|
||||
self::assertEquals($assert, $aclFormatter->toString($input));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class ArraysTest extends TestCase
|
|||
public function testEmptyArrayEmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([], '');
|
||||
$this->assertEmpty($str);
|
||||
self::assertEmpty($str);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -44,7 +44,7 @@ class ArraysTest extends TestCase
|
|||
public function testEmptyArrayNonEmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([], ',');
|
||||
$this->assertEmpty($str);
|
||||
self::assertEmpty($str);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -53,7 +53,7 @@ class ArraysTest extends TestCase
|
|||
public function testNonEmptyArrayEmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([1], '');
|
||||
$this->assertSame($str, '1');
|
||||
self::assertSame($str, '1');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -62,7 +62,7 @@ class ArraysTest extends TestCase
|
|||
public function testNonEmptyArray2EmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([1, 2], '');
|
||||
$this->assertSame($str, '12');
|
||||
self::assertSame($str, '12');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -71,7 +71,7 @@ class ArraysTest extends TestCase
|
|||
public function testNonEmptyArrayNonEmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([1], ',');
|
||||
$this->assertSame($str, '1');
|
||||
self::assertSame($str, '1');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -80,7 +80,7 @@ class ArraysTest extends TestCase
|
|||
public function testNonEmptyArray2NonEmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([1, 2], ',');
|
||||
$this->assertSame($str, '1,2');
|
||||
self::assertSame($str, '1,2');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -89,7 +89,7 @@ class ArraysTest extends TestCase
|
|||
public function testEmptyMultiArray2EmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([[1], []], '');
|
||||
$this->assertSame($str, '{1}{}');
|
||||
self::assertSame($str, '{1}{}');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -98,7 +98,7 @@ class ArraysTest extends TestCase
|
|||
public function testEmptyMulti2Array2EmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([[1], [2]], '');
|
||||
$this->assertSame($str, '{1}{2}');
|
||||
self::assertSame($str, '{1}{2}');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -107,7 +107,7 @@ class ArraysTest extends TestCase
|
|||
public function testEmptyMultiArray2NonEmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([[1], []], ',');
|
||||
$this->assertSame($str, '{1},{}');
|
||||
self::assertSame($str, '{1},{}');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -116,7 +116,7 @@ class ArraysTest extends TestCase
|
|||
public function testEmptyMulti2Array2NonEmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([[1], [2]], ',');
|
||||
$this->assertSame($str, '{1},{2}');
|
||||
self::assertSame($str, '{1},{2}');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -125,6 +125,6 @@ class ArraysTest extends TestCase
|
|||
public function testEmptyMulti3Array2NonEmptyDelimiter()
|
||||
{
|
||||
$str = Arrays::recursiveImplode([[1], [2, [3]]], ',');
|
||||
$this->assertSame($str, '{1},{2,{3}}');
|
||||
self::assertSame($str, '{1},{2,{3}}');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ class BasePathTest extends MockedTest
|
|||
public function testDetermineBasePath(array $server, $input, $output)
|
||||
{
|
||||
$basepath = new BasePath($input, $server);
|
||||
$this->assertEquals($output, $basepath->getPath());
|
||||
self::assertEquals($output, $basepath->getPath());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -201,11 +201,11 @@ class BaseURLTest extends MockedTest
|
|||
|
||||
$baseUrl = new BaseURL($configMock, $server);
|
||||
|
||||
$this->assertEquals($assert['hostname'], $baseUrl->getHostname());
|
||||
$this->assertEquals($assert['urlPath'], $baseUrl->getUrlPath());
|
||||
$this->assertEquals($assert['sslPolicy'], $baseUrl->getSSLPolicy());
|
||||
$this->assertEquals($assert['scheme'], $baseUrl->getScheme());
|
||||
$this->assertEquals($assert['url'], $baseUrl->get());
|
||||
self::assertEquals($assert['hostname'], $baseUrl->getHostname());
|
||||
self::assertEquals($assert['urlPath'], $baseUrl->getUrlPath());
|
||||
self::assertEquals($assert['sslPolicy'], $baseUrl->getSSLPolicy());
|
||||
self::assertEquals($assert['scheme'], $baseUrl->getScheme());
|
||||
self::assertEquals($assert['url'], $baseUrl->get());
|
||||
}
|
||||
|
||||
public function dataSave()
|
||||
|
|
@ -320,7 +320,7 @@ class BaseURLTest extends MockedTest
|
|||
|
||||
$baseUrl->save($save['hostname'], $save['sslPolicy'], $save['urlPath']);
|
||||
|
||||
$this->assertEquals($url, $baseUrl->get());
|
||||
self::assertEquals($url, $baseUrl->get());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -358,7 +358,7 @@ class BaseURLTest extends MockedTest
|
|||
|
||||
$baseUrl->saveByURL($url);
|
||||
|
||||
$this->assertEquals($url, $baseUrl->get());
|
||||
self::assertEquals($url, $baseUrl->get());
|
||||
}
|
||||
|
||||
public function dataGetBaseUrl()
|
||||
|
|
@ -417,7 +417,7 @@ class BaseURLTest extends MockedTest
|
|||
|
||||
$baseUrl = new BaseURL($configMock, []);
|
||||
|
||||
$this->assertEquals($assert, $baseUrl->get($ssl));
|
||||
self::assertEquals($assert, $baseUrl->get($ssl));
|
||||
}
|
||||
|
||||
public function dataCheckRedirectHTTPS()
|
||||
|
|
@ -476,7 +476,7 @@ class BaseURLTest extends MockedTest
|
|||
|
||||
$baseUrl = new BaseURL($configMock, $server);
|
||||
|
||||
$this->assertEquals($redirect, $baseUrl->checkRedirectHttps());
|
||||
self::assertEquals($redirect, $baseUrl->checkRedirectHttps());
|
||||
}
|
||||
|
||||
public function dataWrongSave()
|
||||
|
|
@ -531,12 +531,12 @@ class BaseURLTest extends MockedTest
|
|||
}
|
||||
|
||||
$baseUrl = new BaseURL($configMock, []);
|
||||
$this->assertFalse($baseUrl->save('test', 10, 'nope'));
|
||||
self::assertFalse($baseUrl->save('test', 10, 'nope'));
|
||||
|
||||
// nothing should have changed because we never successfully saved anything
|
||||
$this->assertEquals($baseUrl->getHostname(), 'friendica.local');
|
||||
$this->assertEquals($baseUrl->getUrlPath(), 'new/test');
|
||||
$this->assertEquals($baseUrl->getSSLPolicy(), BaseURL::DEFAULT_SSL_SCHEME);
|
||||
$this->assertEquals($baseUrl->get(), 'http://friendica.local/new/test');
|
||||
self::assertEquals($baseUrl->getHostname(), 'friendica.local');
|
||||
self::assertEquals($baseUrl->getUrlPath(), 'new/test');
|
||||
self::assertEquals($baseUrl->getSSLPolicy(), BaseURL::DEFAULT_SSL_SCHEME);
|
||||
self::assertEquals($baseUrl->get(), 'http://friendica.local/new/test');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
|
||||
$configFileLoader->setupCache($configCache);
|
||||
|
||||
$this->assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
|
||||
self::assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -95,13 +95,13 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
|
||||
$configFileLoader->setupCache($configCache);
|
||||
|
||||
$this->assertEquals('testhost', $configCache->get('database', 'hostname'));
|
||||
$this->assertEquals('testuser', $configCache->get('database', 'username'));
|
||||
$this->assertEquals('testpw', $configCache->get('database', 'password'));
|
||||
$this->assertEquals('testdb', $configCache->get('database', 'database'));
|
||||
self::assertEquals('testhost', $configCache->get('database', 'hostname'));
|
||||
self::assertEquals('testuser', $configCache->get('database', 'username'));
|
||||
self::assertEquals('testpw', $configCache->get('database', 'password'));
|
||||
self::assertEquals('testdb', $configCache->get('database', 'database'));
|
||||
|
||||
$this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
|
||||
$this->assertEquals('Friendica Social Network', $configCache->get('config', 'sitename'));
|
||||
self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
|
||||
self::assertEquals('Friendica Social Network', $configCache->get('config', 'sitename'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -127,12 +127,12 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
|
||||
$configFileLoader->setupCache($configCache);
|
||||
|
||||
$this->assertEquals('testhost', $configCache->get('database', 'hostname'));
|
||||
$this->assertEquals('testuser', $configCache->get('database', 'username'));
|
||||
$this->assertEquals('testpw', $configCache->get('database', 'password'));
|
||||
$this->assertEquals('testdb', $configCache->get('database', 'database'));
|
||||
self::assertEquals('testhost', $configCache->get('database', 'hostname'));
|
||||
self::assertEquals('testuser', $configCache->get('database', 'username'));
|
||||
self::assertEquals('testpw', $configCache->get('database', 'password'));
|
||||
self::assertEquals('testdb', $configCache->get('database', 'database'));
|
||||
|
||||
$this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
|
||||
self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -158,25 +158,25 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
|
||||
$configFileLoader->setupCache($configCache);
|
||||
|
||||
$this->assertEquals('testhost', $configCache->get('database', 'hostname'));
|
||||
$this->assertEquals('testuser', $configCache->get('database', 'username'));
|
||||
$this->assertEquals('testpw', $configCache->get('database', 'password'));
|
||||
$this->assertEquals('testdb', $configCache->get('database', 'database'));
|
||||
$this->assertEquals('anotherCharset', $configCache->get('database', 'charset'));
|
||||
self::assertEquals('testhost', $configCache->get('database', 'hostname'));
|
||||
self::assertEquals('testuser', $configCache->get('database', 'username'));
|
||||
self::assertEquals('testpw', $configCache->get('database', 'password'));
|
||||
self::assertEquals('testdb', $configCache->get('database', 'database'));
|
||||
self::assertEquals('anotherCharset', $configCache->get('database', 'charset'));
|
||||
|
||||
$this->assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile'));
|
||||
$this->assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone'));
|
||||
$this->assertEquals('fr', $configCache->get('system', 'language'));
|
||||
self::assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile'));
|
||||
self::assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone'));
|
||||
self::assertEquals('fr', $configCache->get('system', 'language'));
|
||||
|
||||
$this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
|
||||
$this->assertEquals('Friendly admin', $configCache->get('config', 'admin_nickname'));
|
||||
self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
|
||||
self::assertEquals('Friendly admin', $configCache->get('config', 'admin_nickname'));
|
||||
|
||||
$this->assertEquals('/another/php', $configCache->get('config', 'php_path'));
|
||||
$this->assertEquals('999', $configCache->get('config', 'max_import_size'));
|
||||
$this->assertEquals('666', $configCache->get('system', 'maximagesize'));
|
||||
self::assertEquals('/another/php', $configCache->get('config', 'php_path'));
|
||||
self::assertEquals('999', $configCache->get('config', 'max_import_size'));
|
||||
self::assertEquals('666', $configCache->get('system', 'maximagesize'));
|
||||
|
||||
$this->assertEquals('quattro,vier,duepuntozero', $configCache->get('system', 'allowed_themes'));
|
||||
$this->assertEquals('1', $configCache->get('system', 'no_regfullname'));
|
||||
self::assertEquals('quattro,vier,duepuntozero', $configCache->get('system', 'allowed_themes'));
|
||||
self::assertEquals('1', $configCache->get('system', 'no_regfullname'));
|
||||
}
|
||||
|
||||
public function testLoadAddonConfig()
|
||||
|
|
@ -206,12 +206,12 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
|
||||
$conf = $configFileLoader->loadAddonConfig('test');
|
||||
|
||||
$this->assertEquals('testhost', $conf['database']['hostname']);
|
||||
$this->assertEquals('testuser', $conf['database']['username']);
|
||||
$this->assertEquals('testpw', $conf['database']['password']);
|
||||
$this->assertEquals('testdb', $conf['database']['database']);
|
||||
self::assertEquals('testhost', $conf['database']['hostname']);
|
||||
self::assertEquals('testuser', $conf['database']['username']);
|
||||
self::assertEquals('testpw', $conf['database']['password']);
|
||||
self::assertEquals('testdb', $conf['database']['database']);
|
||||
|
||||
$this->assertEquals('admin@test.it', $conf['config']['admin_email']);
|
||||
self::assertEquals('admin@test.it', $conf['config']['admin_email']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -239,8 +239,8 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
|
||||
$configFileLoader->setupCache($configCache);
|
||||
|
||||
$this->assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
|
||||
$this->assertEquals('newValue', $configCache->get('system', 'newKey'));
|
||||
self::assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
|
||||
self::assertEquals('newValue', $configCache->get('system', 'newKey'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -268,8 +268,8 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
|
||||
$configFileLoader->setupCache($configCache);
|
||||
|
||||
$this->assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
|
||||
$this->assertEquals('newValue', $configCache->get('system', 'newKey'));
|
||||
self::assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
|
||||
self::assertEquals('newValue', $configCache->get('system', 'newKey'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -297,7 +297,7 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
|
||||
$configFileLoader->setupCache($configCache);
|
||||
|
||||
$this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
|
||||
$this->assertEmpty($configCache->get('system', 'NewKey'));
|
||||
self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
|
||||
self::assertEmpty($configCache->get('system', 'NewKey'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,23 +35,23 @@ class CryptoTest extends TestCase
|
|||
{
|
||||
global $phpMock;
|
||||
$phpMock['random_int'] = function ($mMin, $mMax) use ($min, $max) {
|
||||
$this->assertEquals($min, $mMin);
|
||||
$this->assertEquals($max, $mMax);
|
||||
self::assertEquals($min, $mMin);
|
||||
self::assertEquals($max, $mMax);
|
||||
return 1;
|
||||
};
|
||||
}
|
||||
|
||||
public function testRandomDigitsRandomInt()
|
||||
{
|
||||
$this->assertRandomInt(0, 9);
|
||||
self::assertRandomInt(0, 9);
|
||||
|
||||
$test = Crypto::randomDigits(1);
|
||||
$this->assertEquals(1, strlen($test));
|
||||
$this->assertEquals(1, $test);
|
||||
self::assertEquals(1, strlen($test));
|
||||
self::assertEquals(1, $test);
|
||||
|
||||
$test = Crypto::randomDigits(8);
|
||||
$this->assertEquals(8, strlen($test));
|
||||
$this->assertEquals(11111111, $test);
|
||||
self::assertEquals(8, strlen($test));
|
||||
self::assertEquals(11111111, $test);
|
||||
}
|
||||
|
||||
public function dataRsa()
|
||||
|
|
@ -69,7 +69,7 @@ class CryptoTest extends TestCase
|
|||
*/
|
||||
public function testPubRsaToMe(string $key, string $expected)
|
||||
{
|
||||
$this->assertEquals($expected, Crypto::rsaToPem(base64_decode($key)));
|
||||
self::assertEquals($expected, Crypto::rsaToPem(base64_decode($key)));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ class CryptoTest extends TestCase
|
|||
'n' => new BigInteger($m, 256)
|
||||
]);
|
||||
|
||||
$this->assertEquals($expectedRSA->getPublicKey(), $key);
|
||||
self::assertEquals($expectedRSA->getPublicKey(), $key);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -107,7 +107,7 @@ class CryptoTest extends TestCase
|
|||
|
||||
$checkKey = Crypto::meToPem($m, $e);
|
||||
|
||||
$this->assertEquals($key, $checkKey);
|
||||
self::assertEquals($key, $checkKey);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,6 +75,6 @@ class DateTimeFormatTest extends MockedTest
|
|||
{
|
||||
$dtFormat = new DateTimeFormat();
|
||||
|
||||
$this->assertEquals($assert, $dtFormat->isYearMonth($input));
|
||||
self::assertEquals($assert, $dtFormat->isYearMonth($input));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,21 +81,21 @@ class EMailerTest extends MockedTest
|
|||
|
||||
$emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
|
||||
|
||||
$this->assertTrue($emailer->send($testEmail));
|
||||
self::assertTrue($emailer->send($testEmail));
|
||||
|
||||
$this->assertContains("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
|
||||
$this->assertContains("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
|
||||
$this->assertContains("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
|
||||
$this->assertContains("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
|
||||
$this->assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
|
||||
$this->assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
|
||||
self::assertContains("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
|
||||
self::assertContains("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
|
||||
self::assertContains("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
|
||||
self::assertContains("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
|
||||
self::assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
|
||||
self::assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
|
||||
// Base64 "Test Text"
|
||||
$this->assertContains(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
|
||||
self::assertContains(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
|
||||
// Base64 "Test Message<b>Bold</b>"
|
||||
$this->assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
|
||||
$this->assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
|
||||
$this->assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
|
||||
$this->assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);
|
||||
self::assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
|
||||
self::assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
|
||||
self::assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
|
||||
self::assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);
|
||||
}
|
||||
|
||||
public function testTwoMessageIds()
|
||||
|
|
@ -124,10 +124,10 @@ class EMailerTest extends MockedTest
|
|||
$emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
|
||||
|
||||
// even in case there are two message ids, send the mail anyway
|
||||
$this->assertTrue($emailer->send($testEmail));
|
||||
self::assertTrue($emailer->send($testEmail));
|
||||
|
||||
// check case sensitive key problem
|
||||
$this->assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
|
||||
$this->assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
|
||||
self::assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
|
||||
self::assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,15 +67,15 @@ class MailBuilderTest extends MockedTest
|
|||
|
||||
public function assertEmail(IEmail $email, array $asserts)
|
||||
{
|
||||
$this->assertEquals($asserts['subject'] ?? $email->getSubject(), $email->getSubject());
|
||||
$this->assertEquals($asserts['html'] ?? $email->getMessage(), $email->getMessage());
|
||||
$this->assertEquals($asserts['text'] ?? $email->getMessage(true), $email->getMessage(true));
|
||||
$this->assertEquals($asserts['toAddress'] ?? $email->getToAddress(), $email->getToAddress());
|
||||
$this->assertEquals($asserts['fromAddress'] ?? $email->getFromAddress(), $email->getFromAddress());
|
||||
$this->assertEquals($asserts['fromName'] ?? $email->getFromName(), $email->getFromName());
|
||||
$this->assertEquals($asserts['replyTo'] ?? $email->getReplyTo(), $email->getReplyTo());
|
||||
$this->assertEquals($asserts['uid'] ?? $email->getRecipientUid(), $email->getRecipientUid());
|
||||
$this->assertEquals($asserts['header'] ?? $email->getAdditionalMailHeader(), $email->getAdditionalMailHeader());
|
||||
self::assertEquals($asserts['subject'] ?? $email->getSubject(), $email->getSubject());
|
||||
self::assertEquals($asserts['html'] ?? $email->getMessage(), $email->getMessage());
|
||||
self::assertEquals($asserts['text'] ?? $email->getMessage(true), $email->getMessage(true));
|
||||
self::assertEquals($asserts['toAddress'] ?? $email->getToAddress(), $email->getToAddress());
|
||||
self::assertEquals($asserts['fromAddress'] ?? $email->getFromAddress(), $email->getFromAddress());
|
||||
self::assertEquals($asserts['fromName'] ?? $email->getFromName(), $email->getFromName());
|
||||
self::assertEquals($asserts['replyTo'] ?? $email->getReplyTo(), $email->getReplyTo());
|
||||
self::assertEquals($asserts['uid'] ?? $email->getRecipientUid(), $email->getRecipientUid());
|
||||
self::assertEquals($asserts['header'] ?? $email->getAdditionalMailHeader(), $email->getAdditionalMailHeader());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -85,7 +85,7 @@ class MailBuilderTest extends MockedTest
|
|||
{
|
||||
$builder = new SampleMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger());
|
||||
|
||||
$this->assertInstanceOf(MailBuilder::class, $builder);
|
||||
self::assertInstanceOf(MailBuilder::class, $builder);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -112,7 +112,7 @@ class MailBuilderTest extends MockedTest
|
|||
->forUser(['uid' => 100])
|
||||
->build(true);
|
||||
|
||||
$this->assertEmail($testEmail, [
|
||||
self::assertEmail($testEmail, [
|
||||
'subject' => 'Subject',
|
||||
'html' => 'Html',
|
||||
'text' => 'text',
|
||||
|
|
@ -165,7 +165,7 @@ class MailBuilderTest extends MockedTest
|
|||
->withSender('Sender', 'sender@friendica.local')
|
||||
->build(true);
|
||||
|
||||
$this->assertEmail($testEmail, [
|
||||
self::assertEmail($testEmail, [
|
||||
'toAddress' => 'recipient@friendica.local',
|
||||
'fromName' => 'Sender',
|
||||
'fromAddress' => 'sender@friendica.local',
|
||||
|
|
@ -186,7 +186,7 @@ class MailBuilderTest extends MockedTest
|
|||
->withSender('Sender', 'sender@friendica.local')
|
||||
->build(true);
|
||||
|
||||
$this->assertEmail($testEmail, [
|
||||
self::assertEmail($testEmail, [
|
||||
'toAddress' => 'recipient@friendica.local',
|
||||
'fromName' => 'Sender',
|
||||
'fromAddress' => 'sender@friendica.local',
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ class SystemMailBuilderTest extends MockedTest
|
|||
{
|
||||
$builder = new SystemMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger(), 'moreply@friendica.local', 'FriendicaSite');
|
||||
|
||||
$this->assertInstanceOf(MailBuilder::class, $builder);
|
||||
$this->assertInstanceOf(SystemMailBuilder::class, $builder);
|
||||
self::assertInstanceOf(MailBuilder::class, $builder);
|
||||
self::assertInstanceOf(SystemMailBuilder::class, $builder);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class HTTPSignatureTest extends TestCase
|
|||
YWuxyvBa0Z6NdOb0di70cdrSDEsL5Gz7LBY5J2N9KdGg=="';
|
||||
|
||||
$headers = HTTPSignature::parseSigheader($header);
|
||||
$this->assertSame([
|
||||
self::assertSame([
|
||||
'keyId' => 'test-key-a',
|
||||
'algorithm' => 'hs2019',
|
||||
'created' => '1402170695',
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class JsonLDTest extends TestCase
|
|||
$object = [];
|
||||
|
||||
$data = JsonLD::fetchElementArray($object, 'field');
|
||||
$this->assertNull($data);
|
||||
self::assertNull($data);
|
||||
}
|
||||
|
||||
public function testFetchElementArrayFoundEmptyArray()
|
||||
|
|
@ -42,7 +42,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['field' => []];
|
||||
|
||||
$data = JsonLD::fetchElementArray($object, 'field');
|
||||
$this->assertSame([[]], $data);
|
||||
self::assertSame([[]], $data);
|
||||
}
|
||||
|
||||
public function testFetchElementArrayFoundID()
|
||||
|
|
@ -50,7 +50,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['field' => ['value1', ['@id' => 'value2'], ['@id' => 'value3']]];
|
||||
|
||||
$data = JsonLD::fetchElementArray($object, 'field', '@id');
|
||||
$this->assertSame(['value1', 'value2', 'value3'], $data);
|
||||
self::assertSame(['value1', 'value2', 'value3'], $data);
|
||||
}
|
||||
|
||||
public function testFetchElementArrayFoundID2()
|
||||
|
|
@ -60,7 +60,7 @@ class JsonLDTest extends TestCase
|
|||
'value3', ['@id' => 'value4', 'subfield42' => 'value42']]];
|
||||
|
||||
$data = JsonLD::fetchElementArray($object, 'field', '@id');
|
||||
$this->assertSame(['value3', 'value4'], $data);
|
||||
self::assertSame(['value3', 'value4'], $data);
|
||||
}
|
||||
public function testFetchElementArrayFoundArrays()
|
||||
{
|
||||
|
|
@ -71,7 +71,7 @@ class JsonLDTest extends TestCase
|
|||
['subfield21' => 'value21', 'subfield22' => 'value22']];
|
||||
|
||||
$data = JsonLD::fetchElementArray($object, 'field');
|
||||
$this->assertSame($expect, $data);
|
||||
self::assertSame($expect, $data);
|
||||
}
|
||||
|
||||
public function testFetchElementNotFound()
|
||||
|
|
@ -79,7 +79,7 @@ class JsonLDTest extends TestCase
|
|||
$object = [];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'field');
|
||||
$this->assertNull($data);
|
||||
self::assertNull($data);
|
||||
}
|
||||
|
||||
public function testFetchElementFound()
|
||||
|
|
@ -87,7 +87,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['field' => 'value'];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'field');
|
||||
$this->assertSame('value', $data);
|
||||
self::assertSame('value', $data);
|
||||
}
|
||||
|
||||
public function testFetchElementFoundEmptyString()
|
||||
|
|
@ -95,7 +95,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['field' => ''];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'field');
|
||||
$this->assertSame('', $data);
|
||||
self::assertSame('', $data);
|
||||
}
|
||||
|
||||
public function testFetchElementKeyFoundEmptyArray()
|
||||
|
|
@ -103,7 +103,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['field' => ['content' => []]];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'field', 'content');
|
||||
$this->assertSame([], $data);
|
||||
self::assertSame([], $data);
|
||||
}
|
||||
|
||||
public function testFetchElementFoundID()
|
||||
|
|
@ -111,7 +111,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['field' => ['field2' => 'value2', '@id' => 'value', 'field3' => 'value3']];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'field');
|
||||
$this->assertSame('value', $data);
|
||||
self::assertSame('value', $data);
|
||||
}
|
||||
|
||||
public function testFetchElementType()
|
||||
|
|
@ -119,7 +119,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['source' => ['content' => 'body', 'mediaType' => 'text/bbcode']];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
|
||||
$this->assertSame('body', $data);
|
||||
self::assertSame('body', $data);
|
||||
}
|
||||
|
||||
public function testFetchElementTypeValueNotFound()
|
||||
|
|
@ -127,7 +127,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['source' => ['content' => 'body', 'mediaType' => 'text/html']];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
|
||||
$this->assertNull($data);
|
||||
self::assertNull($data);
|
||||
}
|
||||
|
||||
public function testFetchElementTypeNotFound()
|
||||
|
|
@ -135,7 +135,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['source' => ['content' => 'body', 'mediaType' => 'text/html']];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType2', 'text/html');
|
||||
$this->assertNull($data);
|
||||
self::assertNull($data);
|
||||
}
|
||||
|
||||
public function testFetchElementKeyWithoutType()
|
||||
|
|
@ -143,7 +143,7 @@ class JsonLDTest extends TestCase
|
|||
$object = ['source' => ['content' => 'body', 'mediaType' => 'text/bbcode']];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'source', 'content');
|
||||
$this->assertSame('body', $data);
|
||||
self::assertSame('body', $data);
|
||||
}
|
||||
|
||||
public function testFetchElementTypeArray()
|
||||
|
|
@ -152,7 +152,7 @@ class JsonLDTest extends TestCase
|
|||
['content' => 'body', 'mediaType' => 'text/bbcode']]];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
|
||||
$this->assertSame('body', $data);
|
||||
self::assertSame('body', $data);
|
||||
}
|
||||
|
||||
public function testFetchElementTypeValueArrayNotFound()
|
||||
|
|
@ -161,7 +161,7 @@ class JsonLDTest extends TestCase
|
|||
['content' => 'body', 'mediaType' => 'text/bbcode']]];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/markdown');
|
||||
$this->assertNull($data);
|
||||
self::assertNull($data);
|
||||
}
|
||||
|
||||
public function testFetchElementTypeArrayNotFound()
|
||||
|
|
@ -170,6 +170,6 @@ class JsonLDTest extends TestCase
|
|||
['content' => 'body', 'mediaType' => 'text/bbcode']]];
|
||||
|
||||
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType2', 'text/bbcode');
|
||||
$this->assertNull($data);
|
||||
self::assertNull($data);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,12 +72,12 @@ abstract class AbstractLoggerTest extends MockedTest
|
|||
|
||||
public function assertLogline($string)
|
||||
{
|
||||
$this->assertRegExp(self::LOGLINE, $string);
|
||||
self::assertRegExp(self::LOGLINE, $string);
|
||||
}
|
||||
|
||||
public function assertLoglineNums($assertNum, $string)
|
||||
{
|
||||
$this->assertEquals($assertNum, preg_match_all(self::LOGLINE, $string));
|
||||
self::assertEquals($assertNum, preg_match_all(self::LOGLINE, $string));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -92,8 +92,8 @@ abstract class AbstractLoggerTest extends MockedTest
|
|||
$logger->notice('message', ['an' => 'context']);
|
||||
|
||||
$text = $this->getContent();
|
||||
$this->assertLogline($text);
|
||||
$this->assertLoglineNums(4, $text);
|
||||
self::assertLogline($text);
|
||||
self::assertLoglineNums(4, $text);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -106,8 +106,8 @@ abstract class AbstractLoggerTest extends MockedTest
|
|||
$logger->emergency('A {psr} test', ['psr' => 'working']);
|
||||
$logger->alert('An {array} test', ['array' => ['it', 'is', 'working']]);
|
||||
$text = $this->getContent();
|
||||
$this->assertContains('A working test', $text);
|
||||
$this->assertContains('An ["it","is","working"] test', $text);
|
||||
self::assertContains('A working test', $text);
|
||||
self::assertContains('An ["it","is","working"] test', $text);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -119,9 +119,9 @@ abstract class AbstractLoggerTest extends MockedTest
|
|||
$logger->emergency('A test');
|
||||
|
||||
$text = $this->getContent();
|
||||
$this->assertContains('"file":"' . self::FILE . '"', $text);
|
||||
$this->assertContains('"line":' . self::LINE, $text);
|
||||
$this->assertContains('"function":"' . self::FUNC . '"', $text);
|
||||
self::assertContains('"file":"' . self::FILE . '"', $text);
|
||||
self::assertContains('"line":' . self::LINE, $text);
|
||||
self::assertContains('"function":"' . self::FUNC . '"', $text);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -141,7 +141,7 @@ abstract class AbstractLoggerTest extends MockedTest
|
|||
|
||||
$text = $this->getContent();
|
||||
|
||||
$this->assertLoglineNums(5, $text);
|
||||
self::assertLoglineNums(5, $text);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -155,8 +155,8 @@ abstract class AbstractLoggerTest extends MockedTest
|
|||
|
||||
$text = $this->getContent();
|
||||
|
||||
$this->assertLogline($text);
|
||||
self::assertLogline($text);
|
||||
|
||||
$this->assertContains(@json_encode($context), $text);
|
||||
self::assertContains(@json_encode($context), $text);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ class StreamLoggerTest extends AbstractLoggerTest
|
|||
|
||||
$text = $logfile->getContent();
|
||||
|
||||
$this->assertLogline($text);
|
||||
self::assertLogline($text);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -111,7 +111,7 @@ class StreamLoggerTest extends AbstractLoggerTest
|
|||
|
||||
$text = $logfile->getContent();
|
||||
|
||||
$this->assertLoglineNums(2, $text);
|
||||
self::assertLoglineNums(2, $text);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class WorkerLoggerTest extends MockedTest
|
|||
{
|
||||
private function assertUid($uid, $length = 7)
|
||||
{
|
||||
$this->assertRegExp('/^[a-zA-Z0-9]{' . $length . '}+$/', $uid);
|
||||
self::assertRegExp('/^[a-zA-Z0-9]{' . $length . '}+$/', $uid);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -51,7 +51,7 @@ class WorkerLoggerTest extends MockedTest
|
|||
for ($i = 1; $i < 14; $i++) {
|
||||
$workLogger = new WorkerLogger($logger, 'test', $i);
|
||||
$uid = $workLogger->getWorkerId();
|
||||
$this->assertUid($uid, $i);
|
||||
self::assertUid($uid, $i);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ class WorkerLoggerTest extends MockedTest
|
|||
$testContext = $context;
|
||||
$testContext['worker_id'] = $workLogger->getWorkerId();
|
||||
$testContext['worker_cmd'] = 'test';
|
||||
$this->assertUid($testContext['worker_id']);
|
||||
self::assertUid($testContext['worker_id']);
|
||||
$logger
|
||||
->shouldReceive($func)
|
||||
->with($msg, $testContext)
|
||||
|
|
@ -125,7 +125,7 @@ class WorkerLoggerTest extends MockedTest
|
|||
$context = $testContext = ['test' => 'it'];
|
||||
$testContext['worker_id'] = $workLogger->getWorkerId();
|
||||
$testContext['worker_cmd'] = 'test';
|
||||
$this->assertUid($testContext['worker_id']);
|
||||
self::assertUid($testContext['worker_id']);
|
||||
$logger
|
||||
->shouldReceive('log')
|
||||
->with('debug', 'a test', $testContext)
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ class ProfilerTest extends MockedTest
|
|||
$profiler->saveTimestamp($timestamp, $name, $function);
|
||||
}
|
||||
|
||||
$this->assertGreaterThanOrEqual(0, $profiler->get($name));
|
||||
self::assertGreaterThanOrEqual(0, $profiler->get($name));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -154,7 +154,7 @@ class ProfilerTest extends MockedTest
|
|||
$profiler->saveTimestamp($timestamp, $name);
|
||||
$profiler->reset();
|
||||
|
||||
$this->assertEquals(0, $profiler->get($name));
|
||||
self::assertEquals(0, $profiler->get($name));
|
||||
}
|
||||
|
||||
public function dataBig()
|
||||
|
|
@ -227,7 +227,7 @@ class ProfilerTest extends MockedTest
|
|||
foreach ($data as $perf => $items) {
|
||||
foreach ($items['functions'] as $function) {
|
||||
// assert that the output contains the functions
|
||||
$this->assertRegExp('/' . $function . ': \d+/', $output);
|
||||
self::assertRegExp('/' . $function . ': \d+/', $output);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -249,8 +249,8 @@ class ProfilerTest extends MockedTest
|
|||
|
||||
$profiler = new Profiler($configCache);
|
||||
|
||||
$this->assertFalse($profiler->isRendertime());
|
||||
$this->assertEmpty($profiler->getRendertimeString());
|
||||
self::assertFalse($profiler->isRendertime());
|
||||
self::assertEmpty($profiler->getRendertimeString());
|
||||
|
||||
$profiler->saveTimestamp(time(), 'network', 'test1');
|
||||
|
||||
|
|
@ -266,8 +266,8 @@ class ProfilerTest extends MockedTest
|
|||
|
||||
$profiler->update($config);
|
||||
|
||||
$this->assertFalse($profiler->isRendertime());
|
||||
$this->assertEmpty($profiler->getRendertimeString());
|
||||
self::assertFalse($profiler->isRendertime());
|
||||
self::assertEmpty($profiler->getRendertimeString());
|
||||
|
||||
$config->shouldReceive('get')
|
||||
->with('system', 'profiler')
|
||||
|
|
@ -282,9 +282,9 @@ class ProfilerTest extends MockedTest
|
|||
|
||||
$profiler->saveTimestamp(time(), 'database', 'test2');
|
||||
|
||||
$this->assertTrue($profiler->isRendertime());
|
||||
self::assertTrue($profiler->isRendertime());
|
||||
$output = $profiler->getRendertimeString();
|
||||
$this->assertRegExp('/test1: \d+/', $output);
|
||||
$this->assertRegExp('/test2: \d+/', $output);
|
||||
self::assertRegExp('/test1: \d+/', $output);
|
||||
self::assertRegExp('/test2: \d+/', $output);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class StringsTest extends TestCase
|
|||
$randomname1 = Strings::getRandomName(10);
|
||||
$randomname2 = Strings::getRandomName(10);
|
||||
|
||||
$this->assertNotEquals($randomname1, $randomname2);
|
||||
self::assertNotEquals($randomname1, $randomname2);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -48,7 +48,7 @@ class StringsTest extends TestCase
|
|||
$randomname1 = Strings::getRandomName(9);
|
||||
$randomname2 = Strings::getRandomName(9);
|
||||
|
||||
$this->assertNotEquals($randomname1, $randomname2);
|
||||
self::assertNotEquals($randomname1, $randomname2);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -57,7 +57,7 @@ class StringsTest extends TestCase
|
|||
public function testRandomNameNoLength()
|
||||
{
|
||||
$randomname1 = Strings::getRandomName(0);
|
||||
$this->assertEquals(0, strlen($randomname1));
|
||||
self::assertEquals(0, strlen($randomname1));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -68,7 +68,7 @@ class StringsTest extends TestCase
|
|||
public function testRandomNameNegativeLength()
|
||||
{
|
||||
$randomname1 = Strings::getRandomName(-23);
|
||||
$this->assertEquals(0, strlen($randomname1));
|
||||
self::assertEquals(0, strlen($randomname1));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -77,10 +77,10 @@ class StringsTest extends TestCase
|
|||
public function testRandomNameLength1()
|
||||
{
|
||||
$randomname1 = Strings::getRandomName(1);
|
||||
$this->assertEquals(1, strlen($randomname1));
|
||||
self::assertEquals(1, strlen($randomname1));
|
||||
|
||||
$randomname2 = Strings::getRandomName(1);
|
||||
$this->assertEquals(1, strlen($randomname2));
|
||||
self::assertEquals(1, strlen($randomname2));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -93,8 +93,8 @@ class StringsTest extends TestCase
|
|||
$validstring = Strings::escapeTags($invalidstring);
|
||||
$escapedString = Strings::escapeHtml($invalidstring);
|
||||
|
||||
$this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
|
||||
$this->assertEquals(
|
||||
self::assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
|
||||
self::assertEquals(
|
||||
"<submit type="button" onclick="alert('failed!');" />",
|
||||
$escapedString
|
||||
);
|
||||
|
|
@ -132,7 +132,7 @@ class StringsTest extends TestCase
|
|||
*/
|
||||
public function testIsHex($input, $valid)
|
||||
{
|
||||
$this->assertEquals($valid, Strings::isHex($input));
|
||||
self::assertEquals($valid, Strings::isHex($input));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -142,13 +142,13 @@ class StringsTest extends TestCase
|
|||
public function testSubstringReplaceASCII()
|
||||
{
|
||||
for ($start = -10; $start <= 10; $start += 5) {
|
||||
$this->assertEquals(
|
||||
self::assertEquals(
|
||||
substr_replace('string', 'replacement', $start),
|
||||
Strings::substringReplace('string', 'replacement', $start)
|
||||
);
|
||||
|
||||
for ($length = -10; $length <= 10; $length += 5) {
|
||||
$this->assertEquals(
|
||||
self::assertEquals(
|
||||
substr_replace('string', 'replacement', $start, $length),
|
||||
Strings::substringReplace('string', 'replacement', $start, $length)
|
||||
);
|
||||
|
|
@ -184,7 +184,7 @@ class StringsTest extends TestCase
|
|||
*/
|
||||
public function testSubstringReplaceMultiByte(string $expected, string $string, string $replacement, int $start, int $length = null)
|
||||
{
|
||||
$this->assertEquals(
|
||||
self::assertEquals(
|
||||
$expected,
|
||||
Strings::substringReplace(
|
||||
$string,
|
||||
|
|
@ -203,7 +203,7 @@ class StringsTest extends TestCase
|
|||
return $text;
|
||||
});
|
||||
|
||||
$this->assertEquals($originalText, $text);
|
||||
self::assertEquals($originalText, $text);
|
||||
}
|
||||
|
||||
public function testPerformWithEscapedBlocksNested()
|
||||
|
|
@ -218,6 +218,6 @@ class StringsTest extends TestCase
|
|||
return $text;
|
||||
});
|
||||
|
||||
$this->assertEquals($originalText, $text);
|
||||
self::assertEquals($originalText, $text);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class XmlTest extends TestCase
|
|||
$text="<tag>I want to break\n this!11!<?hard?></tag>";
|
||||
$xml=XML::escape($text);
|
||||
$retext=XML::unescape($text);
|
||||
$this->assertEquals($text, $retext);
|
||||
self::assertEquals($text, $retext);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -52,12 +52,12 @@ class XmlTest extends TestCase
|
|||
//should be possible to parse it
|
||||
$values=array();
|
||||
$index=array();
|
||||
$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
|
||||
$this->assertEquals(
|
||||
self::assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
|
||||
self::assertEquals(
|
||||
array('TEXT'=>array(0)),
|
||||
$index
|
||||
);
|
||||
$this->assertEquals(
|
||||
self::assertEquals(
|
||||
array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
|
||||
$values
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue