rawurlencode solution arguments before interpolationorigin/urlencode-url-parts

  - URL segments are generally sids, but in the case that they are phone
     numbers or sid-likes, they should be `rawurlencode()`d
  - Updates the Holodeck assertions so they produce better failure messages.
  - Updates appropriate tests to assert correct behavior.

17 files changed, 110 insertions, 110 deletions

diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/ActivityTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/ActivityTest.php
index aaa3ea6..10442aa 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/ActivityTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/ActivityTest.php
@@ -25,10 +25,10 @@ class ActivityTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities/WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -67,12 +67,12 @@ class ActivityTest extends HolodeckTestCase {
             'FriendlyName' => "friendlyName",
         );
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities/WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
             null,
             $values
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
@@ -107,10 +107,10 @@ class ActivityTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'delete',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities/WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testDeleteResponse() {
@@ -134,10 +134,10 @@ class ActivityTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -174,7 +174,7 @@ class ActivityTest extends HolodeckTestCase {
         $actual = $this->twilio->taskrouter->v1->workspaces("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->activities->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -217,12 +217,12 @@ class ActivityTest extends HolodeckTestCase {
             'Available' => True,
         );
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities',
             null,
             $values
-        )));
+        ));
     }
 
     public function testCreateResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/EventTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/EventTest.php
index deb0eb5..88638d7 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/EventTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/EventTest.php
@@ -25,10 +25,10 @@ class EventTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Events/EVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -79,10 +79,10 @@ class EventTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Events'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -134,7 +134,7 @@ class EventTest extends HolodeckTestCase {
         $actual = $this->twilio->taskrouter->v1->workspaces("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->events->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Task/ReservationTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Task/ReservationTest.php
index 9a7baef..9280ae1 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Task/ReservationTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Task/ReservationTest.php
@@ -26,10 +26,10 @@ class ReservationTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -73,7 +73,7 @@ class ReservationTest extends HolodeckTestCase {
                                                ->tasks("WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->reservations->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -112,10 +112,10 @@ class ReservationTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations/WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -159,10 +159,10 @@ class ReservationTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations/WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskChannelTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskChannelTest.php
index a595ec6..288e3c8 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskChannelTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskChannelTest.php
@@ -25,10 +25,10 @@ class TaskChannelTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskChannels/TCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -63,10 +63,10 @@ class TaskChannelTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskChannels'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -103,7 +103,7 @@ class TaskChannelTest extends HolodeckTestCase {
         $actual = $this->twilio->taskrouter->v1->workspaces("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->taskChannels->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsTest.php
index 672db87..3c8a069 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsTest.php
@@ -26,10 +26,10 @@ class TaskQueueStatisticsTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues/WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Statistics'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsTest.php
index 85e03d8..4b51dd8 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsTest.php
@@ -26,10 +26,10 @@ class TaskQueuesStatisticsTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues/Statistics'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -120,7 +120,7 @@ class TaskQueuesStatisticsTest extends HolodeckTestCase {
                                                ->taskQueues
                                                ->statistics->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueueTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueueTest.php
index cda4703..256ebc0 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueueTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskQueueTest.php
@@ -25,10 +25,10 @@ class TaskQueueTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues/WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -73,10 +73,10 @@ class TaskQueueTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues/WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
@@ -121,10 +121,10 @@ class TaskQueueTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -170,7 +170,7 @@ class TaskQueueTest extends HolodeckTestCase {
         $actual = $this->twilio->taskrouter->v1->workspaces("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->taskQueues->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -213,12 +213,12 @@ class TaskQueueTest extends HolodeckTestCase {
             'AssignmentActivitySid' => "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         );
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues',
             null,
             $values
-        )));
+        ));
     }
 
     public function testCreateResponse() {
@@ -263,10 +263,10 @@ class TaskQueueTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'delete',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues/WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testDeleteResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskTest.php
index e77d748..f74f49c 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/TaskTest.php
@@ -25,10 +25,10 @@ class TaskTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -71,10 +71,10 @@ class TaskTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
@@ -117,10 +117,10 @@ class TaskTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'delete',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testDeleteResponse() {
@@ -144,10 +144,10 @@ class TaskTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -192,7 +192,7 @@ class TaskTest extends HolodeckTestCase {
         $actual = $this->twilio->taskrouter->v1->workspaces("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->tasks->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -235,12 +235,12 @@ class TaskTest extends HolodeckTestCase {
             'WorkflowSid' => "WFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         );
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks',
             null,
             $values
-        )));
+        ));
     }
 
     public function testCreateResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/ReservationTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/ReservationTest.php
index 442482d..ee4e2eb 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/ReservationTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/ReservationTest.php
@@ -26,10 +26,10 @@ class ReservationTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -73,7 +73,7 @@ class ReservationTest extends HolodeckTestCase {
                                                ->workers("WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->reservations->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -112,10 +112,10 @@ class ReservationTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations/WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -159,10 +159,10 @@ class ReservationTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations/WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkerChannelTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkerChannelTest.php
index 67c97a3..75e9c0d 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkerChannelTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkerChannelTest.php
@@ -26,10 +26,10 @@ class WorkerChannelTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Channels'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -76,7 +76,7 @@ class WorkerChannelTest extends HolodeckTestCase {
                                                ->workers("WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->workerChannels->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -115,10 +115,10 @@ class WorkerChannelTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Channels/WCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -165,10 +165,10 @@ class WorkerChannelTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Channels/WCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkerStatisticsTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkerStatisticsTest.php
index 8e85d32..b90d012 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkerStatisticsTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkerStatisticsTest.php
@@ -26,10 +26,10 @@ class WorkerStatisticsTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Statistics'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkersStatisticsTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkersStatisticsTest.php
index c194e5c..cf45cc2 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkersStatisticsTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Worker/WorkersStatisticsTest.php
@@ -26,10 +26,10 @@ class WorkersStatisticsTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/Statistics'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkerTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkerTest.php
index bd1b037..d74f8fc 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkerTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkerTest.php
@@ -25,10 +25,10 @@ class WorkerTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -72,7 +72,7 @@ class WorkerTest extends HolodeckTestCase {
         $actual = $this->twilio->taskrouter->v1->workspaces("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->workers->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -113,12 +113,12 @@ class WorkerTest extends HolodeckTestCase {
             'FriendlyName' => "friendlyName",
         );
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers',
             null,
             $values
-        )));
+        ));
     }
 
     public function testCreateResponse() {
@@ -157,10 +157,10 @@ class WorkerTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -199,10 +199,10 @@ class WorkerTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
@@ -241,10 +241,10 @@ class WorkerTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'delete',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testDeleteResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsTest.php
index 2e9927b..2792113 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsTest.php
@@ -26,10 +26,10 @@ class WorkflowStatisticsTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workflows/WFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Statistics'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkflowTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkflowTest.php
index d99af2a..16a35a0 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkflowTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkflowTest.php
@@ -25,10 +25,10 @@ class WorkflowTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workflows/WFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -67,10 +67,10 @@ class WorkflowTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workflows/WFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
@@ -109,10 +109,10 @@ class WorkflowTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'delete',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workflows/WFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testDeleteResponse() {
@@ -136,10 +136,10 @@ class WorkflowTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workflows'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -180,7 +180,7 @@ class WorkflowTest extends HolodeckTestCase {
         $actual = $this->twilio->taskrouter->v1->workspaces("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
                                                ->workflows->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -224,12 +224,12 @@ class WorkflowTest extends HolodeckTestCase {
             'AssignmentCallbackUrl' => "https://example.com",
         );
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workflows',
             null,
             $values
-        )));
+        ));
     }
 
     public function testCreateResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkspaceStatisticsTest.php b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkspaceStatisticsTest.php
index 92dddb4..6409306 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkspaceStatisticsTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/Workspace/WorkspaceStatisticsTest.php
@@ -25,10 +25,10 @@ class WorkspaceStatisticsTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Statistics'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
diff --git a/Twilio/Tests/Integration/Taskrouter/V1/WorkspaceTest.php b/Twilio/Tests/Integration/Taskrouter/V1/WorkspaceTest.php
index 049314e..27079e6 100644
--- a/Twilio/Tests/Integration/Taskrouter/V1/WorkspaceTest.php
+++ b/Twilio/Tests/Integration/Taskrouter/V1/WorkspaceTest.php
@@ -24,10 +24,10 @@ class WorkspaceTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testFetchResponse() {
@@ -71,10 +71,10 @@ class WorkspaceTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testUpdateResponse() {
@@ -118,10 +118,10 @@ class WorkspaceTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'get',
             'https://taskrouter.twilio.com/v1/Workspaces'
-        )));
+        ));
     }
 
     public function testReadFullResponse() {
@@ -167,7 +167,7 @@ class WorkspaceTest extends HolodeckTestCase {
         
         $actual = $this->twilio->taskrouter->v1->workspaces->read();
         
-        $this->assertTrue(count($actual) > 0);
+        $this->assertGreaterThan(0, count($actual));
     }
 
     public function testReadEmptyResponse() {
@@ -206,12 +206,12 @@ class WorkspaceTest extends HolodeckTestCase {
             'FriendlyName' => "friendlyName",
         );
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'post',
             'https://taskrouter.twilio.com/v1/Workspaces',
             null,
             $values
-        )));
+        ));
     }
 
     public function testCreateResponse() {
@@ -255,10 +255,10 @@ class WorkspaceTest extends HolodeckTestCase {
         } catch (DeserializeException $e) {}
           catch (TwilioException $e) {}
         
-        $this->assertTrue($this->holodeck->hasRequest(new Request(
+        $this->assertRequest(new Request(
             'delete',
             'https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
-        )));
+        ));
     }
 
     public function testDeleteResponse() {