robin/streams
1
0
Fork 0
mirror of https://codeberg.org/icewind/streams.git synced 2026-06-03 08:34:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14 from open-source-contributions/assertion_enhancement

Browse source 
Improve PHPUnit assertions
This commit is contained in:
Robin Appelman 2020-08-27 11:13:14 +00:00 • committed by GitHub
commit eaf1768cd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/CallbackWrapperTest.php
View file

@ -42,11 +42,11 @@ class CallbackWrapperTest extends WrapperTest {
rewind($source); rewind($source);
$wrapped = $this->wrapSource($source, $callBack); $wrapped = $this->wrapSource($source, $callBack);
$this->assertEquals('foo', fread($wrapped, 3)); $this->assertSame('foo', fread($wrapped, 3));
$this->assertTrue($called); $this->assertTrue($called);
$this->assertEquals('bar', fread($wrapped, 1000)); $this->assertSame('bar', fread($wrapped, 1000));
$this->assertEquals(6, $bytesRead); $this->assertSame(6, $bytesRead);
} }
public function testWriteCallback() { public function testWriteCallback() {
@ -59,7 +59,7 @@ class CallbackWrapperTest extends WrapperTest {
$wrapped = $this->wrapSource($source, null, $callBack); $wrapped = $this->wrapSource($source, null, $callBack);
fwrite($wrapped, 'foobar'); fwrite($wrapped, 'foobar');
$this->assertEquals('foobar', $lastData); $this->assertSame('foobar', $lastData);
} }
public function testCloseCallback() { public function testCloseCallback() {

4
tests/CountWrapperTest.php
View file

@ -46,7 +46,7 @@ class CountWrapperTest extends WrapperTest {
stream_get_contents($wrapped); stream_get_contents($wrapped);
fclose($wrapped); fclose($wrapped);
$this->assertEquals(6, $count); $this->assertSame(6, $count);
} }
public function testWriteCount() { public function testWriteCount() {
@ -60,6 +60,6 @@ class CountWrapperTest extends WrapperTest {
fwrite($wrapped, 'foobar'); fwrite($wrapped, 'foobar');
fclose($wrapped); fclose($wrapped);
$this->assertEquals(6, $count); $this->assertSame(6, $count);
} }
} }

2
tests/PathWrapper.php
View file

@ -19,6 +19,6 @@ class PathWrapper extends \PHPUnit_Framework_TestCase {
$data = 'foobar'; $data = 'foobar';
$stream = $this->getDataStream($data); $stream = $this->getDataStream($data);
$path = \Icewind\Streams\PathWrapper::getPath($stream); $path = \Icewind\Streams\PathWrapper::getPath($stream);
$this->assertEquals($data, file_get_contents($path)); $this->assertSame($data, file_get_contents($path));
} }
} }

14
tests/SeekableWrapper.php
View file

@ -32,11 +32,11 @@ class SeekableWrapper extends \PHPUnit_Framework_TestCase {
$source = $this->getSource(); $source = $this->getSource();
$wrapped = $this->wrapSource($source); $wrapped = $this->wrapSource($source);
fseek($wrapped, 6); fseek($wrapped, 6);
$this->assertEquals(6, ftell($source)); $this->assertSame(6, ftell($source));
$this->assertEquals(6, ftell($wrapped)); $this->assertSame(6, ftell($wrapped));
$this->assertEquals('ipsum', fread($wrapped, '5')); $this->assertSame('ipsum', fread($wrapped, '5'));
fseek($wrapped, 6); fseek($wrapped, 6);
$this->assertEquals(6, ftell($wrapped)); $this->assertSame(6, ftell($wrapped));
$this->assertGreaterThan(6, ftell($source)); $this->assertGreaterThan(6, ftell($source));
} }
@ -45,8 +45,8 @@ class SeekableWrapper extends \PHPUnit_Framework_TestCase {
$wrapped = $this->wrapSource($source); $wrapped = $this->wrapSource($source);
fseek($wrapped, 6); fseek($wrapped, 6);
fseek($wrapped, 6, SEEK_CUR); fseek($wrapped, 6, SEEK_CUR);
$this->assertEquals(12, ftell($source)); $this->assertSame(12, ftell($source));
$this->assertEquals(12, ftell($wrapped)); $this->assertSame(12, ftell($wrapped));
$this->assertEquals('dolor', fread($wrapped, '5')); $this->assertSame('dolor', fread($wrapped, '5'));
} }
} }

10
tests/UrlCallback.php
View file

@ -70,7 +70,7 @@ class UrlCallback extends \PHPUnit_Framework_TestCase {
$dir = $this->getTempDir() . '/test'; $dir = $this->getTempDir() . '/test';
$path = \Icewind\Streams\UrlCallback::wrap($dir, null, null, $callback); $path = \Icewind\Streams\UrlCallback::wrap($dir, null, null, $callback);
mkdir($path); mkdir($path);
$this->assertTrue(file_exists($dir)); $this->assertFileExists($dir);
$this->assertTrue($called); $this->assertTrue($called);
} }
@ -83,7 +83,7 @@ class UrlCallback extends \PHPUnit_Framework_TestCase {
mkdir($dir); mkdir($dir);
$path = \Icewind\Streams\UrlCallback::wrap($dir, null, null, null, null, $callback); $path = \Icewind\Streams\UrlCallback::wrap($dir, null, null, null, null, $callback);
rmdir($path); rmdir($path);
$this->assertFalse(file_exists($dir)); $this->assertFileNotExists($dir);
$this->assertTrue($called); $this->assertTrue($called);
} }
@ -97,7 +97,7 @@ class UrlCallback extends \PHPUnit_Framework_TestCase {
$path = \Icewind\Streams\UrlCallback::wrap($source, null, null, null, $callback); $path = \Icewind\Streams\UrlCallback::wrap($source, null, null, null, $callback);
$target = $path->wrapPath($source . '_rename'); $target = $path->wrapPath($source . '_rename');
rename($path, $target); rename($path, $target);
$this->assertTrue(file_exists($source . '_rename')); $this->assertFileExists($source . '_rename');
$this->assertTrue($called); $this->assertTrue($called);
} }
@ -110,7 +110,7 @@ class UrlCallback extends \PHPUnit_Framework_TestCase {
touch($file); touch($file);
$path = \Icewind\Streams\UrlCallback::wrap($file, null, null, null, null, null, $callback); $path = \Icewind\Streams\UrlCallback::wrap($file, null, null, null, null, null, $callback);
unlink($path); unlink($path);
$this->assertFalse(file_exists($file)); $this->assertFileNotExists($file);
$this->assertTrue($called); $this->assertTrue($called);
} }
@ -134,6 +134,6 @@ class UrlCallback extends \PHPUnit_Framework_TestCase {
$dir = $this->getTempDir() . '/test/sad'; $dir = $this->getTempDir() . '/test/sad';
$path = \Icewind\Streams\UrlCallback::wrap($dir); $path = \Icewind\Streams\UrlCallback::wrap($dir);
mkdir($path, 0700, true); mkdir($path, 0700, true);
$this->assertTrue(file_exists($dir)); $this->assertFileExists($dir);
} }
} }

34
tests/WrapperTest.php
View file

@ -20,9 +20,9 @@ abstract class WrapperTest extends \PHPUnit_Framework_TestCase {
rewind($source); rewind($source);
$wrapped = $this->wrapSource($source); $wrapped = $this->wrapSource($source);
$this->assertEquals('foo', fread($wrapped, 3)); $this->assertSame('foo', fread($wrapped, 3));
$this->assertEquals('bar', fread($wrapped, 3)); $this->assertSame('bar', fread($wrapped, 3));
$this->assertEquals('', fread($wrapped, 3)); $this->assertSame('', fread($wrapped, 3));
} }
public function testWrite() { public function testWrite() {
@ -31,9 +31,9 @@ abstract class WrapperTest extends \PHPUnit_Framework_TestCase {
$wrapped = $this->wrapSource($source); $wrapped = $this->wrapSource($source);
$this->assertEquals(6, fwrite($wrapped, 'foobar')); $this->assertSame(6, fwrite($wrapped, 'foobar'));
rewind($source); rewind($source);
$this->assertEquals('foobar', stream_get_contents($source)); $this->assertSame('foobar', stream_get_contents($source));
} }
public function testClose() { public function testClose() {
@ -53,19 +53,19 @@ abstract class WrapperTest extends \PHPUnit_Framework_TestCase {
$wrapped = $this->wrapSource($source); $wrapped = $this->wrapSource($source);
$this->assertEquals(0, ftell($wrapped)); $this->assertSame(0, ftell($wrapped));
fseek($wrapped, 2); fseek($wrapped, 2);
$this->assertEquals(2, ftell($source)); $this->assertSame(2, ftell($source));
$this->assertEquals(2, ftell($wrapped)); $this->assertSame(2, ftell($wrapped));
fseek($wrapped, 2, SEEK_CUR); fseek($wrapped, 2, SEEK_CUR);
$this->assertEquals(4, ftell($source)); $this->assertSame(4, ftell($source));
$this->assertEquals(4, ftell($wrapped)); $this->assertSame(4, ftell($wrapped));
fseek($wrapped, -1, SEEK_END); fseek($wrapped, -1, SEEK_END);
$this->assertEquals(5, ftell($source)); $this->assertSame(5, ftell($source));
$this->assertEquals(5, ftell($wrapped)); $this->assertSame(5, ftell($wrapped));
} }
public function testStat() { public function testStat() {
@ -84,7 +84,7 @@ abstract class WrapperTest extends \PHPUnit_Framework_TestCase {
$wrapped = $this->wrapSource($source); $wrapped = $this->wrapSource($source);
ftruncate($wrapped, 2); ftruncate($wrapped, 2);
$this->assertEquals('fo', fread($wrapped, 10)); $this->assertSame('fo', fread($wrapped, 10));
} }
public function testLock() { public function testLock() {
@ -130,10 +130,10 @@ abstract class WrapperTest extends \PHPUnit_Framework_TestCase {
$source = opendir(__DIR__); $source = opendir(__DIR__);
$wrapped = $this->wrapSource($source); $wrapped = $this->wrapSource($source);
$this->assertEquals($content[0], readdir($wrapped)); $this->assertSame($content[0], readdir($wrapped));
$this->assertEquals($content[1], readdir($wrapped)); $this->assertSame($content[1], readdir($wrapped));
$this->assertEquals($content[2], readdir($wrapped)); $this->assertSame($content[2], readdir($wrapped));
rewinddir($wrapped); rewinddir($wrapped);
$this->assertEquals($content[0], readdir($wrapped)); $this->assertSame($content[0], readdir($wrapped));
} }
} }