From dc713a3e6f884b62e660f816764c14f004e9ffa4 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Sun, 9 Mar 2014 19:19:38 +1030
Subject: [PATCH] Apply more of #4

---
 tests/basic.phpt | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/basic.phpt b/tests/basic.phpt
index 46ab7d0..bca9701 100644
--- a/tests/basic.phpt
+++ b/tests/basic.phpt
@@ -12,7 +12,9 @@ if (! ($smtp = new Net_SMTP(TEST_HOSTNAME, TEST_PORT, TEST_LOCALHOST))) {
 	die("Unable to instantiate Net_SMTP object\n");
 }
 
-if (PEAR::isError($e = $smtp->connect())) {
+try {
+    $e = $smtp->connect();
+} catch (Exception $e) {
 	die($e->getMessage() . "\n");
 }
 
@@ -20,16 +22,21 @@ if (PEAR::isError($e = $smtp->auth(TEST_AUTH_USER, TEST_AUTH_PASS))) {
     die("Authentication failure\n");
 }
 
-if (PEAR::isError($smtp->mailFrom(TEST_FROM))) {
+try {
+    $smtp->mailFrom(TEST_FROM);
+} catch (Exception $e) {
 	die('Unable to set sender to <' . TEST_FROM . ">\n");
 }
 
-if (PEAR::isError($res = $smtp->rcptTo(TEST_TO))) {
-	die('Unable to add recipient <' . TEST_TO . '>: ' .
-		$res->getMessage() . "\n");
+try {
+    $smtp->rcptTo(TEST_TO);
+} catch (Exception $e) {	die('Unable to add recipient <' . TEST_TO . '>: ' .
+		$e->getMessage() . "\n");
 }
 
-if (PEAR::isError($smtp->data('Subject: ' . TEST_SUBJECT . "\r\n\r\n" . TEST_BODY))) {
+try {
+    $smtp->data(TEST_SUBJECT . "\r\n" . TEST_BODY);
+} catch (Exception $e) {
 	die("Unable to send data\n");
 }