Fix tests

OskarStark · OskarStark · commit 17e3a56159b3 · 2020-12-11T12:30:42.000+01:00
diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportFactoryTest.php
@@ -30,7 +30,7 @@ public function testCreateWithDsn()
 
         $transport = $factory->create(Dsn::fromString(sprintf('esendex://%s@%s/?accountreference=%s&from=%s', $token, $host, $accountReference, $from)));
 
-        $this->assertSame(sprintf('discord://%s?accountreference=%s&from=%s', $host, $accountReference, $from), (string) $transport);
+        $this->assertSame(sprintf('esendex://%s', $host), (string) $transport);
     }
 
     public function testCreateWithMissingOptionAccountreferenceThrowsIncompleteDsnException()
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransportFactory.php
@@ -35,7 +35,7 @@ public function create(Dsn $dsn): TransportInterface
             throw new UnsupportedSchemeException($dsn, 'smsapi', $this->getSupportedSchemes());
         }
 
-        $authToken = $dsn->getUser();
+        $authToken = $this->getUser($dsn);
         $from = $dsn->getOption('from');
 
         if (!$from) {
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php
@@ -14,8 +14,8 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Notifier\Bridge\Smsapi\SmsapiTransport;
 use Symfony\Component\Notifier\Exception\LogicException;
-use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 final class SmsapiTransportTest extends TestCase
@@ -27,11 +27,11 @@ public function testToStringContainsProperties()
         $this->assertSame('smsapi://test.host?from=testFrom', (string) $transport);
     }
 
-    public function testSupportsChatMessage()
+    public function testSupportsMessageInterface()
     {
         $transport = $this->createTransport();
 
-        $this->assertTrue($transport->supports(new ChatMessage('testChatMessage')));
+        $this->assertTrue($transport->supports(new SmsMessage('0611223344', 'Hello!')));
         $this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function testCreateWithDsn()`
`30`	`30`
`31`	`31`	`$transport = $factory->create(Dsn::fromString(sprintf('esendex://%s@%s/?accountreference=%s&from=%s', $token, $host, $accountReference, $from)));`
`32`	`32`
`33`		`- $this->assertSame(sprintf('discord://%s?accountreference=%s&from=%s', $host, $accountReference, $from), (string) $transport);`
	`33`	`+ $this->assertSame(sprintf('esendex://%s', $host), (string) $transport);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function testCreateWithMissingOptionAccountreferenceThrowsIncompleteDsnException()`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function create(Dsn $dsn): TransportInterface`
`35`	`35`	`throw new UnsupportedSchemeException($dsn, 'smsapi', $this->getSupportedSchemes());`
`36`	`36`	`}`
`37`	`37`
`38`		`- $authToken = $dsn->getUser();`
	`38`	`+ $authToken = $this->getUser($dsn);`
`39`	`39`	`$from = $dsn->getOption('from');`
`40`	`40`
`41`	`41`	`if (!$from) {`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\Notifier\Bridge\Smsapi\SmsapiTransport;`
`16`	`16`	`use Symfony\Component\Notifier\Exception\LogicException;`
`17`		`-use Symfony\Component\Notifier\Message\ChatMessage;`
`18`	`17`	`use Symfony\Component\Notifier\Message\MessageInterface;`
	`18`	`+use Symfony\Component\Notifier\Message\SmsMessage;`
`19`	`19`	`use Symfony\Contracts\HttpClient\HttpClientInterface;`
`20`	`20`
`21`	`21`	`final class SmsapiTransportTest extends TestCase`
`@@ -27,11 +27,11 @@ public function testToStringContainsProperties()`
`27`	`27`	`$this->assertSame('smsapi://test.host?from=testFrom', (string) $transport);`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function testSupportsChatMessage()`
	`30`	`+ public function testSupportsMessageInterface()`
`31`	`31`	`{`
`32`	`32`	`$transport = $this->createTransport();`
`33`	`33`
`34`		`- $this->assertTrue($transport->supports(new ChatMessage('testChatMessage')));`
	`34`	`+ $this->assertTrue($transport->supports(new SmsMessage('0611223344', 'Hello!')));`
`35`	`35`	`$this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));`
`36`	`36`	`}`
`37`	`37`