Index: ppapi/tests/test_websocket.cc |
diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc |
index e8e55581d272f11cae4880d1e689cd7a313d7964..c990113110e8f6e0a34fe63b6e7a98f17a466628 100644 |
--- a/ppapi/tests/test_websocket.cc |
+++ b/ppapi/tests/test_websocket.cc |
@@ -6,6 +6,7 @@ |
#include <string.h> |
+#include "ppapi/c/dev/ppb_testing_dev.h" |
#include "ppapi/c/dev/ppb_websocket_dev.h" |
#include "ppapi/c/pp_errors.h" |
#include "ppapi/c/pp_var.h" |
@@ -47,20 +48,20 @@ bool TestWebSocket::Init() { |
if (!websocket_interface_ || !var_interface_ || !core_interface_) |
return false; |
- return true; |
+ return InitTestingInterface(); |
} |
void TestWebSocket::RunTests(const std::string& filter) { |
- RUN_TEST(IsWebSocket, filter); |
- RUN_TEST(UninitializedPropertiesAccess, filter); |
- RUN_TEST(InvalidConnect, filter); |
- RUN_TEST(Protocols, filter); |
- RUN_TEST(GetURL, filter); |
- RUN_TEST(ValidConnect, filter); |
- RUN_TEST(InvalidClose, filter); |
- RUN_TEST(ValidClose, filter); |
- RUN_TEST(GetProtocol, filter); |
- RUN_TEST(TextSendReceive, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(IsWebSocket, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(UninitializedPropertiesAccess, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(InvalidConnect, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(Protocols, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(GetURL, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(ValidConnect, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(InvalidClose, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(ValidClose, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(GetProtocol, filter); |
+ RUN_TEST_WITH_REFERENCE_CHECK(TextSendReceive, filter); |
} |
PP_Var TestWebSocket::CreateVar(const char* string) { |
@@ -138,15 +139,18 @@ std::string TestWebSocket::TestUninitializedPropertiesAccess() { |
PP_Var close_reason = websocket_interface_->GetCloseReason(ws); |
ASSERT_TRUE(AreEqual(close_reason, "")); |
+ ReleaseVar(close_reason); |
PP_Bool close_was_clean = websocket_interface_->GetCloseWasClean(ws); |
ASSERT_EQ(PP_FALSE, close_was_clean); |
PP_Var extensions = websocket_interface_->GetExtensions(ws); |
ASSERT_TRUE(AreEqual(extensions, "")); |
+ ReleaseVar(extensions); |
PP_Var protocol = websocket_interface_->GetProtocol(ws); |
ASSERT_TRUE(AreEqual(protocol, "")); |
+ ReleaseVar(protocol); |
PP_WebSocketReadyState_Dev ready_state = |
websocket_interface_->GetReadyState(ws); |
@@ -154,6 +158,9 @@ std::string TestWebSocket::TestUninitializedPropertiesAccess() { |
PP_Var url = websocket_interface_->GetURL(ws); |
ASSERT_TRUE(AreEqual(url, "")); |
+ ReleaseVar(url); |
+ |
+ core_interface_->ReleaseResource(ws); |
PASS(); |
} |