commit 48f794e8ce8033abd7df52cf8063efa559208e42
author Don Turner <donturner@google.com> Fri Aug 24 12:53:05 2018 +0100
committer Don Turner <donturner@google.com> Fri Aug 24 12:53:05 2018 +0100
tree fcb941d6eb60ccf8ff8a204a958b95e7861fc999
parent fc65df023a78041623e48c250143420ffaac06b2

closeStream now checks for null to avoid segfaults

tests/testStreamClosedMethods.cpp

diff --git a/tests/testStreamClosedMethods.cpp b/tests/testStreamClosedMethods.cpp
index 3f56d76..b26788f 100644
--- a/tests/testStreamClosedMethods.cpp
+++ b/tests/testStreamClosedMethods.cpp
@@ -43,9 +43,11 @@
     }
 
     void closeStream(){
-        Result r = mStream->close();
-        if (r != Result::OK){
-            FAIL() << "Failed to close stream. " << convertToText(r);
+        if (mStream != nullptr){
+            Result r = mStream->close();
+            if (r != Result::OK){
+                FAIL() << "Failed to close stream. " << convertToText(r);
+            }
         }
     }
 

tests/testStreamStates.cpp

diff --git a/tests/testStreamStates.cpp b/tests/testStreamStates.cpp
index 5d2bae8..54b05a5 100644
--- a/tests/testStreamStates.cpp
+++ b/tests/testStreamStates.cpp
@@ -41,9 +41,11 @@
     }
 
     void closeStream(){
-        Result r = mStream->close();
-        if (r != Result::OK){
-            FAIL() << "Failed to close stream. " << convertToText(r);
+        if (mStream != nullptr){
+            Result r = mStream->close();
+            if (r != Result::OK){
+                FAIL() << "Failed to close stream. " << convertToText(r);
+            }
         }
     }
 
@@ -164,11 +166,13 @@
 
     StreamState next = StreamState::Unknown;
     auto r = mStream->requestStart();
-    EXPECT_EQ(r, Result::OK);
+    EXPECT_EQ(r, Result::OK) << "requestStart returned: " << convertToText(r);
 
     r = mStream->requestStop();
+    EXPECT_EQ(r, Result::OK) << "requestStop returned: " << convertToText(r);
+
     r = mStream->waitForStateChange(StreamState::Stopping, &next, kTimeoutInNanos);
-    EXPECT_EQ(r, Result::OK);
+    EXPECT_EQ(r, Result::OK) << "waitForStateChange returned: " << convertToText(r);
 
     ASSERT_EQ(next, StreamState::Stopped);
 

tests/testXRunBehaviour.cpp

diff --git a/tests/testXRunBehaviour.cpp b/tests/testXRunBehaviour.cpp
index c8e506b..9534c06 100644
--- a/tests/testXRunBehaviour.cpp
+++ b/tests/testXRunBehaviour.cpp
@@ -45,9 +45,11 @@
     }
 
     void closeStream(){
-        Result r = mStream->close();
-        if (r != Result::OK){
-            FAIL() << "Failed to close stream. " << convertToText(r);
+        if (mStream != nullptr){
+            Result r = mStream->close();
+            if (r != Result::OK){
+                FAIL() << "Failed to close stream. " << convertToText(r);
+            }
         }
     }