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

Commit 51304028 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "transcoding: fix client number in unit tests"

parents f8701c40 4fe34f9b

services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h

+2 −7
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ public: 
            ALOGE("Failed to connect to the media.trascoding service.");

            return;

        }



        mClient1 = ::ndk::SharedRefBase::make<TestClientCallback>(kClientPackageA, 1);

        mClient2 = ::ndk::SharedRefBase::make<TestClientCallback>(kClientPackageB, 2);

        mClient3 = ::ndk::SharedRefBase::make<TestClientCallback>(kClientPackageC, 3);
@@ -469,7 +470,7 @@ public: 
        int32_t numOfClients;

        Status status = mService->getNumOfClients(&numOfClients);

        EXPECT_TRUE(status.isOk());

        EXPECT_EQ(3, numOfClients);

        EXPECT_GE(numOfClients, 3);

    }



    void unregisterMultipleClients() {
@@ -477,12 +478,6 @@ public: 
        EXPECT_TRUE(mClient1->unregisterClient().isOk());

        EXPECT_TRUE(mClient2->unregisterClient().isOk());

        EXPECT_TRUE(mClient3->unregisterClient().isOk());



        // Check the number of clients.

        int32_t numOfClients;

        Status status = mService->getNumOfClients(&numOfClients);

        EXPECT_TRUE(status.isOk());

        EXPECT_EQ(0, numOfClients);

    }



    void deleteFile(const char* path) { unlink(path); }

services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp

+1 −6
Original line number Diff line number Diff line
@@ -104,16 +104,11 @@ TEST_F(MediaTranscodingServiceSimulatedTest, TestRegisterOneClient) { 
    int32_t numOfClients;

    status = mService->getNumOfClients(&numOfClients);

    EXPECT_TRUE(status.isOk());

    EXPECT_EQ(1, numOfClients);

    EXPECT_GE(numOfClients, 1);



    // Unregister the client.

    status = client->unregister();

    EXPECT_TRUE(status.isOk());



    // Check the number of Clients.

    status = mService->getNumOfClients(&numOfClients);

    EXPECT_TRUE(status.isOk());

    EXPECT_EQ(0, numOfClients);

}



TEST_F(MediaTranscodingServiceSimulatedTest, TestRegisterClientTwice) {