chore(firestore): fix risky tests (GoogleCloudPlatform#1221)

Author: bshaffer

firestore/src/collection_ref.php

@@ -40,4 +40,5 @@ function collection_ref($projectId)
     # [START fs_collection_ref]
     $collection = $db->collection('users');
     # [END fs_collection_ref]
+    printf('Retrieved collection: %s' . PHP_EOL, $collection->name());
 }

firestore/src/document_path_ref.php

@@ -40,4 +40,5 @@ function document_path_ref($projectId)
     # [START fs_document_path_ref]
     $document = $db->document('users/lovelace');
     # [END fs_document_path_ref]
+    printf('Retrieved document from path: %s' . PHP_EOL, $document->name());
 }

firestore/src/document_ref.php

@@ -40,4 +40,5 @@ function document_ref($projectId)
     # [START fs_document_ref]
     $document = $db->collection('users')->document('lovelace');
     # [END fs_document_ref]
+    printf('Retrieved document: %s' . PHP_EOL, $document->name());
 }

firestore/src/invalid_range_order_by_query.php

@@ -39,8 +39,11 @@ function invalid_range_order_by_query($projectId)
     ]);
     $citiesRef = $db->collection('cities');
     # [START fs_invalid_range_order_by_query]
-    $query = $citiesRef
+    $invalidRangeQuery = $citiesRef
         ->where('population', '>', 2500000)
         ->orderBy('country');
     # [END fs_invalid_range_order_by_query]
+
+    // This will throw an exception
+    $invalidRangeQuery->documents();
 }

firestore/src/invalid_range_query.php

@@ -43,4 +43,7 @@ function invalid_range_query($projectId)
         ->where('state', '>=', 'CA')
         ->where('population', '>', 1000000);
     # [END fs_invalid_range_query]
+
+    // This will throw an exception
+    $invalidRangeQuery->documents();
 }

firestore/src/subcollection_ref.php

@@ -44,4 +44,5 @@ function subcollection_ref($projectId)
         ->collection('messages')
         ->document('message1');
     # [END fs_subcollection_ref]
+    printf('Retrieved document from subcollection: %s' . PHP_EOL, $document->name());
 }

firestore/test/firestoreTest.php

@@ -20,6 +20,7 @@
 use Google\Cloud\Firestore\FirestoreClient;
 use Google\Cloud\TestUtils\TestTrait;
 use Google\Cloud\TestUtils\ExecuteCommandTrait;
+use Google\Cloud\Core\Exception\BadRequestException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -246,7 +247,11 @@ public function testRangeQuery()
      */
     public function testInvalidRangeQuery()
     {
-        $output = $this->runFirestoreCommand('invalid-range-query');
+        $this->expectException(BadRequestException::class);
+        $this->expectExceptionMessage(
+            'Cannot have inequality filters on multiple properties'
+        );
+        $this->runFirestoreCommand('invalid-range-query');
     }
 
     /**
@@ -426,27 +431,35 @@ public function testRangeOrderByQuery()
      */
     public function testInvalidRangeOrderByQuery()
     {
-        $output = $this->runFirestoreCommand('invalid-range-order-by-query');
+        $this->expectException(BadRequestException::class);
+        $this->expectExceptionMessage(
+            'inequality filter property and first sort order must be the same'
+        );
+        $this->runFirestoreCommand('invalid-range-order-by-query');
     }
 
     public function testDocumentRef()
     {
         $output = $this->runFirestoreCommand('document-ref');
+        $this->assertContains('Retrieved document: ', $output);
     }
 
     public function testCollectionRef()
     {
         $output = $this->runFirestoreCommand('collection-ref');
+        $this->assertContains('Retrieved collection: ', $output);
     }
 
     public function testDocumentPathRef()
     {
         $output = $this->runFirestoreCommand('document-path-ref');
+        $this->assertContains('Retrieved document from path: ', $output);
     }
 
     public function testSubcollectionRef()
     {
         $output = $this->runFirestoreCommand('subcollection-ref');
+        $this->assertContains('Retrieved document from subcollection: ', $output);
     }
 
     /**
@@ -568,6 +581,7 @@ public function testPaginatedQueryCursor()
     public function testMultipleCursorConditions()
     {
         $output = $this->runFirestoreCommand('multiple-cursor-conditions');
+        $this->assertContains('Document TOK returned by start at ', $output);
     }
 
     private static function runFirestoreCommand($commandName)