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

Commit 9b2f0cf9 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "libs/ui: Add MockFence"

parents a1738869 d430202b

libs/ui/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,7 @@ cc_library_static { 




    export_include_dirs: [

    export_include_dirs: [

        "include",

        "include",

        "include_mock",

        "include_private",

        "include_private",

        "include_types",

        "include_types",

    ],

    ],

libs/ui/include/ui/Fence.h

+9 −2
Original line number Original line Diff line number Diff line
@@ -26,6 +26,10 @@ 




namespace android {

namespace android {





namespace mock {

class MockFence;

}



class String8;

class String8;





// ===========================================================================

// ===========================================================================
@@ -109,7 +113,7 @@ public: 
    // fence transitioned to the signaled state.  If the fence is not signaled

    // fence transitioned to the signaled state.  If the fence is not signaled

    // then SIGNAL_TIME_PENDING is returned.  If the fence is invalid or if an

    // then SIGNAL_TIME_PENDING is returned.  If the fence is invalid or if an

    // error occurs then SIGNAL_TIME_INVALID is returned.

    // error occurs then SIGNAL_TIME_INVALID is returned.

    nsecs_t getSignalTime() const;

    virtual nsecs_t getSignalTime() const;





    enum class Status {

    enum class Status {

        Invalid,     // Fence is invalid

        Invalid,     // Fence is invalid
@@ -144,7 +148,10 @@ public: 
private:

private:

    // Only allow instantiation using ref counting.

    // Only allow instantiation using ref counting.

    friend class LightRefBase<Fence>;

    friend class LightRefBase<Fence>;

    ~Fence() = default;

    virtual ~Fence() = default;



    // Allow mocking for unit testing

    friend class mock::MockFence;





    base::unique_fd mFenceFd;

    base::unique_fd mFenceFd;

};

};

libs/ui/include_mock/ui/MockFence.h

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <gmock/gmock.h>

#include <ui/Fence.h>



namespace android::mock {



class MockFence : public android::Fence {

public:

    MockFence() = default;

    virtual ~MockFence() = default;



    MOCK_METHOD(nsecs_t, getSignalTime, (), (const, override));

};



}; // namespace android::mock

libs/ui/tests/Android.bp

+9 −0
Original line number Original line Diff line number Diff line
@@ -115,3 +115,12 @@ cc_test { 
    srcs: ["Size_test.cpp"],

    srcs: ["Size_test.cpp"],

    cflags: ["-Wall", "-Werror"],

    cflags: ["-Wall", "-Werror"],

}

}



cc_test {

    name: "MockFence_test",

    shared_libs: ["libui"],

    static_libs: ["libgmock"],

    srcs: ["MockFence_test.cpp"],

    cflags: ["-Wall", "-Werror"],

}

libs/ui/tests/MockFence_test.cpp

0 → 100644
+45 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <ui/MockFence.h>



#include <gtest/gtest.h>



namespace android::ui {



using testing::Return;



class MockFenceTest : public testing::Test {

public:

    sp<Fence> getFenceForTesting() const { return mMockFence; }



    const mock::MockFence& getMockFence() const { return *mMockFence; }



private:

    sp<mock::MockFence> mMockFence = sp<mock::MockFence>::make();

};



TEST_F(MockFenceTest, getSignalTime) {

    sp<Fence> fence = getFenceForTesting();



    EXPECT_CALL(getMockFence(), getSignalTime).WillOnce(Return(Fence::SIGNAL_TIME_PENDING));

    EXPECT_EQ(Fence::SIGNAL_TIME_PENDING, fence->getSignalTime());



    EXPECT_CALL(getMockFence(), getSignalTime).WillOnce(Return(1234));

    EXPECT_EQ(1234, fence->getSignalTime());

}



} // namespace android::ui