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

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

Merge "SF: Shuffle test mocks into subdirs" into pi-dev

parents a66dca4b cbe00014

services/surfaceflinger/tests/unittests/Android.bp

+11 −11
Original line number Diff line number Diff line
@@ -20,17 +20,17 @@ cc_test { 
    srcs: [

        ":libsurfaceflinger_sources",

        "DisplayTransactionTest.cpp",

        "MockComposer.cpp",

        "MockDisplaySurface.cpp",

        "MockEventControlThread.cpp",

        "MockEventThread.cpp",

        "MockGraphicBufferConsumer.cpp",

        "MockGraphicBufferProducer.cpp",

        "MockMessageQueue.cpp",

        "MockNativeWindow.cpp",

        "MockNativeWindowSurface.cpp",

        "MockRenderEngine.cpp",

        "MockSurfaceInterceptor.cpp",

        "mock/DisplayHardware/MockComposer.cpp",

        "mock/DisplayHardware/MockDisplaySurface.cpp",

        "mock/gui/MockGraphicBufferConsumer.cpp",

        "mock/gui/MockGraphicBufferProducer.cpp",

        "mock/MockEventControlThread.cpp",

        "mock/MockEventThread.cpp",

        "mock/MockMessageQueue.cpp",

        "mock/MockNativeWindowSurface.cpp",

        "mock/MockSurfaceInterceptor.cpp",

        "mock/RenderEngine/MockRenderEngine.cpp",

        "mock/system/window/MockNativeWindow.cpp",

    ],

    static_libs: [

        "libgmock",

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

+12 −13
Original line number Diff line number Diff line
@@ -21,20 +21,19 @@ 
#include <gtest/gtest.h>



#include <log/log.h>

#include "system/window.h"



#include "MockComposer.h"

#include "MockDisplaySurface.h"

#include "MockEventControlThread.h"

#include "MockEventThread.h"

#include "MockGraphicBufferConsumer.h"

#include "MockGraphicBufferProducer.h"

#include "MockMessageQueue.h"

#include "MockNativeWindow.h"

#include "MockNativeWindowSurface.h"

#include "MockRenderEngine.h"

#include "MockSurfaceInterceptor.h"



#include "TestableSurfaceFlinger.h"

#include "mock/DisplayHardware/MockComposer.h"

#include "mock/DisplayHardware/MockDisplaySurface.h"

#include "mock/MockEventControlThread.h"

#include "mock/MockEventThread.h"

#include "mock/MockMessageQueue.h"

#include "mock/MockNativeWindowSurface.h"

#include "mock/MockSurfaceInterceptor.h"

#include "mock/RenderEngine/MockRenderEngine.h"

#include "mock/gui/MockGraphicBufferConsumer.h"

#include "mock/gui/MockGraphicBufferProducer.h"

#include "mock/system/window/MockNativeWindow.h"



namespace android {

namespace {

services/surfaceflinger/tests/unittests/MockComposer.cpp→services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "MockComposer.h"

#include "mock/DisplayHardware/MockComposer.h"



namespace android {

namespace Hwc2 {

services/surfaceflinger/tests/unittests/MockDisplaySurface.cpp→services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockDisplaySurface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "MockDisplaySurface.h"

#include "mock/DisplayHardware/MockDisplaySurface.h"



namespace android {

namespace mock {