Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fdeef70 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Automerger Merge Worker
Browse files

Merge "Fix "Attempt to delete released memory" warning." am: 0a5c0b43 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2323086



Change-Id: Ie731fdbc2cb9f8902e880f78ca7aa2b8e19b3cac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d1460be 0a5c0b43

fastboot/socket_test.cpp

+20 −20
Original line number Diff line number Diff line
@@ -293,23 +293,23 @@ TEST(SocketMockTest, TestSendSuccess) { 
}



TEST(SocketMockTest, TestSendFailure) {

    SocketMock* mock = new SocketMock;

    std::unique_ptr<SocketMock> mock(new SocketMock);



    mock->ExpectSendFailure("foo");

    EXPECT_FALSE(SendString(mock, "foo"));

    EXPECT_FALSE(SendString(mock.get(), "foo"));



    EXPECT_NONFATAL_FAILURE(SendString(mock, "foo"), "no message was expected");

    EXPECT_NONFATAL_FAILURE(SendString(mock.get(), "foo"), "no message was expected");



    mock->ExpectSend("foo");

    EXPECT_NONFATAL_FAILURE(SendString(mock, "bar"), "expected foo, but got bar");

    EXPECT_TRUE(SendString(mock, "foo"));

    EXPECT_NONFATAL_FAILURE(SendString(mock.get(), "bar"), "expected foo, but got bar");

    EXPECT_TRUE(SendString(mock.get(), "foo"));



    mock->AddReceive("foo");

    EXPECT_NONFATAL_FAILURE(SendString(mock, "foo"), "called out-of-order");

    EXPECT_TRUE(ReceiveString(mock, "foo"));

    EXPECT_NONFATAL_FAILURE(SendString(mock.get(), "foo"), "called out-of-order");

    EXPECT_TRUE(ReceiveString(mock.get(), "foo"));



    mock->ExpectSend("foo");

    EXPECT_NONFATAL_FAILURE(delete mock, "1 event(s) were not handled");

    EXPECT_NONFATAL_FAILURE(mock.reset(), "1 event(s) were not handled");

}



TEST(SocketMockTest, TestReceiveSuccess) {
@@ -331,33 +331,33 @@ TEST(SocketMockTest, TestReceiveSuccess) { 
}



TEST(SocketMockTest, TestReceiveFailure) {

    SocketMock* mock = new SocketMock;

    std::unique_ptr<SocketMock> mock(new SocketMock);



    mock->AddReceiveFailure();

    EXPECT_FALSE(ReceiveString(mock, "foo"));

    EXPECT_FALSE(ReceiveString(mock.get(), "foo"));

    EXPECT_FALSE(mock->ReceiveTimedOut());



    mock->AddReceiveTimeout();

    EXPECT_FALSE(ReceiveString(mock, "foo"));

    EXPECT_FALSE(ReceiveString(mock.get(), "foo"));

    EXPECT_TRUE(mock->ReceiveTimedOut());



    mock->AddReceive("foo");

    mock->AddReceiveFailure();

    EXPECT_FALSE(ReceiveString(mock, "foobar"));

    EXPECT_FALSE(ReceiveString(mock.get(), "foobar"));



    EXPECT_NONFATAL_FAILURE(ReceiveString(mock, "foo"), "no message was ready");

    EXPECT_NONFATAL_FAILURE(ReceiveString(mock.get(), "foo"), "no message was ready");



    mock->ExpectSend("foo");

    EXPECT_NONFATAL_FAILURE(ReceiveString(mock, "foo"), "called out-of-order");

    EXPECT_TRUE(SendString(mock, "foo"));

    EXPECT_NONFATAL_FAILURE(ReceiveString(mock.get(), "foo"), "called out-of-order");

    EXPECT_TRUE(SendString(mock.get(), "foo"));



    char c;

    mock->AddReceive("foo");

    EXPECT_NONFATAL_FAILURE(mock->Receive(&c, 1, 0), "not enough bytes (1) for foo");

    EXPECT_TRUE(ReceiveString(mock, "foo"));

    EXPECT_TRUE(ReceiveString(mock.get(), "foo"));



    mock->AddReceive("foo");

    EXPECT_NONFATAL_FAILURE(delete mock, "1 event(s) were not handled");

    EXPECT_NONFATAL_FAILURE(mock.reset(), "1 event(s) were not handled");

}



TEST(SocketMockTest, TestAcceptSuccess) {
@@ -372,14 +372,14 @@ TEST(SocketMockTest, TestAcceptSuccess) { 
}



TEST(SocketMockTest, TestAcceptFailure) {

    SocketMock* mock = new SocketMock;

    std::unique_ptr<SocketMock> mock(new SocketMock);



    EXPECT_NONFATAL_FAILURE(mock->Accept(), "no socket was ready");



    mock->ExpectSend("foo");

    EXPECT_NONFATAL_FAILURE(mock->Accept(), "called out-of-order");

    EXPECT_TRUE(SendString(mock, "foo"));

    EXPECT_TRUE(SendString(mock.get(), "foo"));



    mock->AddAccept(nullptr);

    EXPECT_NONFATAL_FAILURE(delete mock, "1 event(s) were not handled");

    EXPECT_NONFATAL_FAILURE(mock.reset(), "1 event(s) were not handled");

}