From 796270a254dcf635b48291a083a5e9eb38903626 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Sat, 8 Jan 2022 16:49:43 -0600 Subject: [PATCH] Tests: update for 3.0 branch --- tests/Functional/Net/SFTPUserStoryTest.php | 8 -------- tests/PhpseclibTestCase.php | 20 -------------------- 2 files changed, 28 deletions(-) diff --git a/tests/Functional/Net/SFTPUserStoryTest.php b/tests/Functional/Net/SFTPUserStoryTest.php index f7cc32bf..24481715 100644 --- a/tests/Functional/Net/SFTPUserStoryTest.php +++ b/tests/Functional/Net/SFTPUserStoryTest.php @@ -25,14 +25,6 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase self::$exampleDataLength = 10000; } - public function testBadHostname() - { - $this->setExpectedException('PHPUnit_Framework_Error_Notice'); - - $sftp = new SFTP('bad host name'); - $sftp->login('username', 'password'); - } - public function testConstructor() { $sftp = new SFTP($this->getEnv('SSH_HOSTNAME')); diff --git a/tests/PhpseclibTestCase.php b/tests/PhpseclibTestCase.php index e946a652..3eaff1c7 100644 --- a/tests/PhpseclibTestCase.php +++ b/tests/PhpseclibTestCase.php @@ -183,24 +183,4 @@ abstract class PhpseclibTestCase extends PHPUnit\Framework\TestCase parent::assertNotContains($needle, $haystack, $message); } - - public function setExpectedException($name, $message = null, $code = null) - { - if (version_compare(PHP_VERSION, '7.0.0') < 0) { - parent::setExpectedException($name, $message, $code); - return; - } - switch ($name) { - case 'PHPUnit_Framework_Error_Notice': - case 'PHPUnit_Framework_Error_Warning': - $name = str_replace('_', '\\', $name); - } - $this->expectException($name); - if (!empty($message)) { - $this->expectExceptionMessage($message); - } - if (!empty($code)) { - $this->expectExceptionCode($code); - } - } }