Fix exceptions and tests

Author: scaytrase

src/ScayTrase/WebSMS/Connection/AbstractWebSMSConnection.php

@@ -81,7 +81,7 @@ protected function doSendRequest(MessageInterface $message)
         if ($status[DriverInterface::NORMALIZED_CODE] !== DriverInterface::STATUS_OK) {
             throw new DeliveryException(
                 $message,
-                $status[DriverInterface::STATUS_OK],
+                $status[DriverInterface::NORMALIZED_MESSAGE],
                 $status[DriverInterface::NORMALIZED_CODE]
             );
         }

src/ScayTrase/WebSMS/Exception/ConnectionException.php

@@ -8,7 +8,7 @@
 
 namespace ScayTrase\WebSMS\Exception;
 
-class ConnectionException extends \Exception
+class ConnectionException extends WebSMSException
 {
 
 }

src/ScayTrase/WebSMS/Exception/DriverException.php

@@ -8,7 +8,7 @@
 
 namespace ScayTrase\WebSMS\Exception;
 
-class DriverException extends \Exception
+class DriverException extends WebSMSException
 {
 
 }

src/ScayTrase/WebSMS/Exception/WebSMSException.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Pavel
+ * Date: 2015-05-25
+ * Time: 20:37
+ */
+
+namespace ScayTrase\WebSMS\Exception;
+
+class WebSMSException extends \Exception
+{
+
+}

src/ScayTrase/WebSMS/Tests/DriverTest.php

@@ -10,6 +10,9 @@
 
 use ScayTrase\WebSMS\Connection\Connection;
 use ScayTrase\WebSMS\Driver\DriverInterface;
+use ScayTrase\WebSMS\Exception\DeliveryException;
+use ScayTrase\WebSMS\Exception\DriverException;
+use ScayTrase\WebSMS\Exception\WebSMSException;
 
 class DriverTest extends AbstractWebSMSTest
 {
@@ -60,8 +63,6 @@ public function invalidCredentialsProvider()
     }
 
     /**
-     * @expectedException \ScayTrase\WebSMS\Exception\DriverException
-     *
      * @param DriverInterface $driver
      * @param                 $username
      * @param                 $password
@@ -73,6 +74,17 @@ public function testInvalidCredentialsHandling(DriverInterface $driver, $usernam
         $connection = new Connection($driver, $username, $password, Connection::TEST_ENABLED);
         $message    = $this->getMessageMock();
 
-        $connection->send($message);
+        try {
+            $connection->send($message);
+        } catch (WebSMSException $exception) {
+            if ($exception instanceof DeliveryException){
+                return;
+            } elseif ($exception instanceof DriverException){
+                return;
+            } else {
+                $this->fail('Unexpected exception');
+            }
+
+        }
     }
 }