fixup tests

icewind1991 · Mar 2, 2021 · 1c6d181 · 1c6d181
1 parent b8bea69
commit 1c6d181
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 20 deletions.
diff --git a/tests/DirectoryFilter.php → tests/DirectoryFilterTest.php b/tests/DirectoryFilter.php → tests/DirectoryFilterTest.php
@@ -7,7 +7,9 @@
 
 namespace Icewind\Streams\Tests;
 
-class DirectoryFilter extends \PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+
+class DirectoryFilterTest extends TestCase {
 	public function testFilterAcceptAll() {
 		$this->filter(
 			['a', 'b', 'c'],

diff --git a/tests/DirectoryWrapper.php → tests/DirectoryTestWrapperTest.php b/tests/DirectoryWrapper.php → tests/DirectoryTestWrapperTest.php
@@ -7,7 +7,7 @@
 
 namespace Icewind\Streams\Tests;
 
-class DirectoryWrapper extends IteratorDirectory {
+class DirectoryTestWrapperTest extends IteratorDirectoryTest {
 
 	/**
 	 * @param \Iterator | array $source

diff --git a/tests/IteratorDirectory.php → tests/IteratorDirectoryTest.php b/tests/IteratorDirectory.php → tests/IteratorDirectoryTest.php
@@ -7,7 +7,10 @@
 
 namespace Icewind\Streams\Tests;
 
-class IteratorDirectory extends \PHPUnit_Framework_TestCase {
+use \BadMethodCallException;
+use PHPUnit\Framework\TestCase;
+
+class IteratorDirectoryTest extends TestCase {
 
 	/**
 	 * @param \Iterator | array $source
@@ -17,10 +20,8 @@ protected function wrapSource($source) {
 		return \Icewind\Streams\IteratorDirectory::wrap($source);
 	}
 
-	/**
-	 * @expectedException \BadMethodCallException
-	 */
 	public function testNoContext() {
+		$this->expectException(BadMethodCallException::class);
 		$context = stream_context_create([]);
 		stream_wrapper_register('iterator', '\Icewind\Streams\IteratorDirectory');
 		try {
@@ -32,10 +33,8 @@ public function testNoContext() {
 		}
 	}
 
-	/**
-	 * @expectedException \BadMethodCallException
-	 */
 	public function testNoSource() {
+		$this->expectException(BadMethodCallException::class);
 		$context = stream_context_create([
 			'dir' => [
 				'foo' => 'bar'
@@ -51,10 +50,8 @@ public function testNoSource() {
 		}
 	}
 
-	/**
-	 * @expectedException \BadMethodCallException
-	 */
 	public function testWrapInvalidSource() {
+		$this->expectException(BadMethodCallException::class);
 		$this->wrapSource(2);
 	}
 

diff --git a/tests/PathWrapper.php → tests/PathWrapperTest.php b/tests/PathWrapper.php → tests/PathWrapperTest.php
@@ -7,7 +7,9 @@
 
 namespace Icewind\Streams\Tests;
 
-class PathWrapper extends \PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+
+class PathWrapperTest extends TestCase {
 	private function getDataStream($data) {
 		$stream = fopen('php://temp', 'w+');
 		fwrite($stream, $data);

diff --git a/tests/RetryWrapper.php → tests/RetryWrapperTest.php b/tests/RetryWrapper.php → tests/RetryWrapperTest.php
@@ -7,7 +7,7 @@
 
 namespace Icewind\Streams\Tests;
 
-class RetryWrapper extends WrapperTest {
+class RetryWrapperTest extends WrapperTest {
 
 	/**
 	 * @param resource $source
@@ -34,6 +34,6 @@ public function testFailedRead() {
 	public function testFailedWrite() {
 		$source = fopen('php://temp', 'w');
 		$wrapped = \Icewind\Streams\RetryWrapper::wrap(FailWrapper::wrap($source));
-		fwrite($wrapped, 'foo');
+		$this->assertFalse(fwrite($wrapped, 'foo'));
 	}
 }
diff --git a/tests/SeekableWrapper.php → tests/SeekableWrapperTest.php b/tests/SeekableWrapper.php → tests/SeekableWrapperTest.php
@@ -7,7 +7,9 @@
 
 namespace Icewind\Streams\Tests;
 
-class SeekableWrapper extends \PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+
+class SeekableWrapperTest extends TestCase {
 	/**
 	 * @param resource $source
 	 * @return resource

diff --git a/tests/UrlCallback.php → tests/UrlCallbackTest.php b/tests/UrlCallback.php → tests/UrlCallbackTest.php
@@ -7,7 +7,9 @@
 
 namespace Icewind\Streams\Tests;
 
-class UrlCallback extends \PHPUnit_Framework_TestCase {
+use PHPUnit\Framework\TestCase;
+
+class UrlCallbackTest extends TestCase {
 	protected $tempDirs = [];
 
 	protected function getTempDir() {
@@ -17,7 +19,7 @@ protected function getTempDir() {
 		return $dir;
 	}
 
-	public function tearDown() {
+	public function tearDown(): void {
 		foreach ($this->tempDirs as $dir) {
 			$this->rmdir($dir);
 		}
@@ -83,7 +85,7 @@ public function testRMDirCallBack() {
 		mkdir($dir);
 		$path = \Icewind\Streams\UrlCallback::wrap($dir, null, null, null, null, $callback);
 		rmdir($path);
-		$this->assertFileNotExists($dir);
+		$this->assertFileDoesNotExist($dir);
 		$this->assertTrue($called);
 	}
 
@@ -110,7 +112,7 @@ public function testUnlinkCallBack() {
 		touch($file);
 		$path = \Icewind\Streams\UrlCallback::wrap($file, null, null, null, null, null, $callback);
 		unlink($path);
-		$this->assertFileNotExists($file);
+		$this->assertFileDoesNotExist($file);
 		$this->assertTrue($called);
 	}