You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/07/13 20:24:33 UTC
[6/7] mesos git commit: Fixed libprocess tests to use smart pointers.
Fixed libprocess tests to use smart pointers.
This ensures that dynamically allocated memory is released when
a test aborts prematurely due to an EXPECT_XXX failure.
Review: https://reviews.apache.org/r/46146/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5dfc00eb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5dfc00eb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5dfc00eb
Branch: refs/heads/master
Commit: 5dfc00eb23733d368f08c8474d9268aee85fd666
Parents: ca24554
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Jul 13 11:37:35 2016 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Wed Jul 13 13:21:07 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/tests/decoder_tests.cpp | 15 ++++-----------
3rdparty/libprocess/src/tests/process_tests.cpp | 3 +--
3rdparty/libprocess/src/tests/sequence_tests.cpp | 8 +++++---
3 files changed, 10 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5dfc00eb/3rdparty/libprocess/src/tests/decoder_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/decoder_tests.cpp b/3rdparty/libprocess/src/tests/decoder_tests.cpp
index 62e29c9..4535614 100644
--- a/3rdparty/libprocess/src/tests/decoder_tests.cpp
+++ b/3rdparty/libprocess/src/tests/decoder_tests.cpp
@@ -52,7 +52,7 @@ TEST(DecoderTest, Request)
ASSERT_FALSE(decoder.failed());
ASSERT_EQ(1, requests.size());
- http::Request* request = requests[0];
+ Owned<http::Request> request(requests[0]);
EXPECT_EQ("GET", request->method);
EXPECT_EQ("/path/file.json", request->url.path);
@@ -68,8 +68,6 @@ TEST(DecoderTest, Request)
EXPECT_SOME_EQ("localhost", request->headers.get("Host"));
EXPECT_SOME_EQ("close", request->headers.get("Connection"));
EXPECT_SOME_EQ("compress, gzip", request->headers.get("Accept-Encoding"));
-
- delete request;
}
@@ -91,10 +89,9 @@ TEST(DecoderTest, RequestHeaderContinuation)
ASSERT_FALSE(decoder.failed());
ASSERT_EQ(1, requests.size());
- http::Request* request = requests[0];
+ Owned<http::Request> request(requests[0]);
EXPECT_SOME_EQ("compress, gzip",
request->headers.get("Accept-Encoding"));
- delete request;
}
@@ -115,12 +112,10 @@ TEST(DecoderTest, RequestHeaderCaseInsensitive)
ASSERT_FALSE(decoder.failed());
ASSERT_EQ(1, requests.size());
- http::Request* request = requests[0];
+ Owned<http::Request> request(requests[0]);
EXPECT_FALSE(request->keepAlive);
EXPECT_SOME_EQ("compress, gzip", request->headers.get("Accept-Encoding"));
-
- delete request;
}
@@ -140,15 +135,13 @@ TEST(DecoderTest, Response)
ASSERT_FALSE(decoder.failed());
ASSERT_EQ(1, responses.size());
- http::Response* response = responses[0];
+ Owned<http::Response> response(responses[0]);
EXPECT_EQ("200 OK", response->status);
EXPECT_EQ(http::Response::BODY, response->type);
EXPECT_EQ("hi", response->body);
EXPECT_EQ(3, response->headers.size());
-
- delete response;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/5dfc00eb/3rdparty/libprocess/src/tests/process_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/process_tests.cpp b/3rdparty/libprocess/src/tests/process_tests.cpp
index 6083b4c..b9feec7 100644
--- a/3rdparty/libprocess/src/tests/process_tests.cpp
+++ b/3rdparty/libprocess/src/tests/process_tests.cpp
@@ -105,11 +105,10 @@ using testing::ReturnArg;
TEST(ProcessTest, Event)
{
- Event* event = new TerminateEvent(UPID());
+ Owned<Event> event(new TerminateEvent(UPID()));
EXPECT_FALSE(event->is<MessageEvent>());
EXPECT_FALSE(event->is<ExitedEvent>());
EXPECT_TRUE(event->is<TerminateEvent>());
- delete event;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/5dfc00eb/3rdparty/libprocess/src/tests/sequence_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/sequence_tests.cpp b/3rdparty/libprocess/src/tests/sequence_tests.cpp
index 2286312..43911b6 100644
--- a/3rdparty/libprocess/src/tests/sequence_tests.cpp
+++ b/3rdparty/libprocess/src/tests/sequence_tests.cpp
@@ -17,8 +17,9 @@
#include <process/defer.hpp>
#include <process/dispatch.hpp>
#include <process/future.hpp>
-#include <process/gtest.hpp>
#include <process/gmock.hpp>
+#include <process/gtest.hpp>
+#include <process/owned.hpp>
#include <process/process.hpp>
#include <process/sequence.hpp>
@@ -27,6 +28,7 @@
using process::Clock;
using process::Future;
+using process::Owned;
using process::Process;
using process::Promise;
using process::Sequence;
@@ -168,7 +170,7 @@ TEST(SequenceTest, DiscardAll)
DiscardProcess process;
spawn(process);
- Sequence* sequence = new Sequence();
+ Owned<Sequence> sequence(new Sequence());
lambda::function<Future<Nothing>()> f;
@@ -200,7 +202,7 @@ TEST(SequenceTest, DiscardAll)
Clock::resume();
// This should cancel all pending callbacks.
- delete sequence;
+ sequence.reset();
// Start the sequence of calls.
process.promise.set(Nothing());