mirror of
https://github.com/danielstjules/Stringy.git
synced 2025-08-12 00:04:11 +02:00
Merge branch 'trim'
This commit is contained in:
@@ -590,7 +590,7 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
}
|
||||
|
||||
public function trimProvider()
|
||||
public function trimProviderWithoutParams()
|
||||
{
|
||||
return array(
|
||||
array('foo bar', ' foo bar '),
|
||||
@@ -604,6 +604,23 @@ abstract class CommonTest extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
}
|
||||
|
||||
public function trimProviderWithParams()
|
||||
{
|
||||
return array(
|
||||
array('foo bar', ' foo bar ', " \t\n\r\0\x0B", 'trim'),
|
||||
array('foo bar', ' foo bar', " \t\n\r\0\x0B", 'trim'),
|
||||
array('foo bar', 'foo bar ', " \t\n\r\0\x0B", 'trim'),
|
||||
array('foo bar', "\n\t foo bar \n\t", " \t\n\r\0\x0B", 'trim'),
|
||||
array('fòô bàř', ' fòô bàř ', " \t\n\r\0\x0B", 'trim'),
|
||||
array('fòô bàř', ' fòô bàř', " \t\n\r\0\x0B", 'trim'),
|
||||
array('fòô bàř', 'fòô bàř ', " \t\n\r\0\x0B", 'trim'),
|
||||
array('fòô bàř', "\n\t fòô bàř \n\t", " \t\n\r\0\x0B", 'trim'),
|
||||
array(' foo bar', ' foo bar ', " \t\n\r\0\x0B", 'rtrim'),
|
||||
array('foo bar ', ' foo bar ', " \t\n\r\0\x0B", 'ltrim'),
|
||||
array(' foo bar ', ' foo bar ', "\t\n\r\0\x0B", 'ltrim')
|
||||
);
|
||||
}
|
||||
|
||||
public function longestCommonPrefixProvider()
|
||||
{
|
||||
return array(
|
||||
|
@@ -382,7 +382,7 @@ class StaticStringyTestCase extends CommonTest
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider trimProvider()
|
||||
* @dataProvider trimProviderWithoutParams()
|
||||
*/
|
||||
public function testTrim($expected, $str)
|
||||
{
|
||||
|
@@ -594,9 +594,9 @@ class StringyTestCase extends CommonTest
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider trimProvider()
|
||||
* @dataProvider trimProviderWithoutParams()
|
||||
*/
|
||||
public function testTrim($expected, $str)
|
||||
public function testTrimWithoutParams($expected, $str)
|
||||
{
|
||||
$stringy = S::create($str);
|
||||
$result = $stringy->trim();
|
||||
@@ -605,6 +605,40 @@ class StringyTestCase extends CommonTest
|
||||
$this->assertEquals($str, $stringy);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider trimProviderWithParams()
|
||||
*/
|
||||
public function testTrimWithParams($expected, $str, $charList, $type)
|
||||
{
|
||||
$stringy = S::create($str);
|
||||
$result = $stringy->trim($charList, $type);
|
||||
$this->assertStringy($result);
|
||||
$this->assertEquals($expected, $result);
|
||||
$this->assertEquals($str, $stringy);
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException InvalidArgumentException
|
||||
*/
|
||||
public function testTrimWithInvalidCharset()
|
||||
{
|
||||
$stringy = S::create('test');
|
||||
$stringy->trim(array('test1', 'test2'), 'trim');
|
||||
$this->fail('Expecting exception when the first argument passed is not a string');
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException InvalidArgumentException
|
||||
*/
|
||||
public function testTrimWithInvalidType()
|
||||
{
|
||||
$stringy = S::create('test');
|
||||
$stringy->trim(' test ', 'aa');
|
||||
$stringy->trim('btest ', 'Trim');
|
||||
$stringy->trim(' btest', 'RTrim');
|
||||
$this->fail('Expecting exception when the first argument passed is not a string');
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider longestCommonPrefixProvider()
|
||||
*/
|
||||
|
Reference in New Issue
Block a user