SF: Shuffle test mocks into subdirs
This shuffles the various GMock files into a subdir mock/ that also
mirrors the subdirectory hierarchy of the implementation being mocked.
Test: libsurfaceflinger_unittest passes on Pixel XL
Bug: 74827900
Change-Id: I4c90228993a44c27708c703763e0315322fef0ce
diff --git a/services/surfaceflinger/tests/unittests/Android.bp b/services/surfaceflinger/tests/unittests/Android.bp
index 8ffc5ad..bcabe0d 100644
--- a/services/surfaceflinger/tests/unittests/Android.bp
+++ b/services/surfaceflinger/tests/unittests/Android.bp
@@ -20,17 +20,17 @@
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",
diff --git a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
index 2551a9c..7257b46 100644
--- a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
+++ b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
@@ -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 {
diff --git a/services/surfaceflinger/tests/unittests/MockComposer.cpp b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.cpp
similarity index 94%
rename from services/surfaceflinger/tests/unittests/MockComposer.cpp
rename to services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.cpp
index 318519b..7ed57b9 100644
--- a/services/surfaceflinger/tests/unittests/MockComposer.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockComposer.h"
+#include "mock/DisplayHardware/MockComposer.h"
namespace android {
namespace Hwc2 {
diff --git a/services/surfaceflinger/tests/unittests/MockComposer.h b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockComposer.h
rename to services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h
diff --git a/services/surfaceflinger/tests/unittests/MockDisplaySurface.cpp b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockDisplaySurface.cpp
similarity index 93%
rename from services/surfaceflinger/tests/unittests/MockDisplaySurface.cpp
rename to services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockDisplaySurface.cpp
index 507626b..e6ac6bf 100644
--- a/services/surfaceflinger/tests/unittests/MockDisplaySurface.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockDisplaySurface.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockDisplaySurface.h"
+#include "mock/DisplayHardware/MockDisplaySurface.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockDisplaySurface.h b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockDisplaySurface.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockDisplaySurface.h
rename to services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockDisplaySurface.h
diff --git a/services/surfaceflinger/tests/unittests/MockEventControlThread.cpp b/services/surfaceflinger/tests/unittests/mock/MockEventControlThread.cpp
similarity index 95%
rename from services/surfaceflinger/tests/unittests/MockEventControlThread.cpp
rename to services/surfaceflinger/tests/unittests/mock/MockEventControlThread.cpp
index 398fd42..f9bacc8 100644
--- a/services/surfaceflinger/tests/unittests/MockEventControlThread.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/MockEventControlThread.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockEventControlThread.h"
+#include "mock/MockEventControlThread.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockEventControlThread.h b/services/surfaceflinger/tests/unittests/mock/MockEventControlThread.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockEventControlThread.h
rename to services/surfaceflinger/tests/unittests/mock/MockEventControlThread.h
diff --git a/services/surfaceflinger/tests/unittests/MockEventThread.cpp b/services/surfaceflinger/tests/unittests/mock/MockEventThread.cpp
similarity index 95%
rename from services/surfaceflinger/tests/unittests/MockEventThread.cpp
rename to services/surfaceflinger/tests/unittests/mock/MockEventThread.cpp
index 6b5ea4b..408cd35 100644
--- a/services/surfaceflinger/tests/unittests/MockEventThread.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/MockEventThread.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockEventThread.h"
+#include "mock/MockEventThread.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockEventThread.h b/services/surfaceflinger/tests/unittests/mock/MockEventThread.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockEventThread.h
rename to services/surfaceflinger/tests/unittests/mock/MockEventThread.h
diff --git a/services/surfaceflinger/tests/unittests/MockMessageQueue.cpp b/services/surfaceflinger/tests/unittests/mock/MockMessageQueue.cpp
similarity index 95%
rename from services/surfaceflinger/tests/unittests/MockMessageQueue.cpp
rename to services/surfaceflinger/tests/unittests/mock/MockMessageQueue.cpp
index 62f45ed..97a13e4 100644
--- a/services/surfaceflinger/tests/unittests/MockMessageQueue.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/MockMessageQueue.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockMessageQueue.h"
+#include "mock/MockMessageQueue.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockMessageQueue.h b/services/surfaceflinger/tests/unittests/mock/MockMessageQueue.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockMessageQueue.h
rename to services/surfaceflinger/tests/unittests/mock/MockMessageQueue.h
diff --git a/services/surfaceflinger/tests/unittests/MockNativeWindowSurface.cpp b/services/surfaceflinger/tests/unittests/mock/MockNativeWindowSurface.cpp
similarity index 95%
rename from services/surfaceflinger/tests/unittests/MockNativeWindowSurface.cpp
rename to services/surfaceflinger/tests/unittests/mock/MockNativeWindowSurface.cpp
index 0314568..25ff39b 100644
--- a/services/surfaceflinger/tests/unittests/MockNativeWindowSurface.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/MockNativeWindowSurface.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockNativeWindowSurface.h"
+#include "mock/MockNativeWindowSurface.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockNativeWindowSurface.h b/services/surfaceflinger/tests/unittests/mock/MockNativeWindowSurface.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockNativeWindowSurface.h
rename to services/surfaceflinger/tests/unittests/mock/MockNativeWindowSurface.h
diff --git a/services/surfaceflinger/tests/unittests/MockSurfaceInterceptor.cpp b/services/surfaceflinger/tests/unittests/mock/MockSurfaceInterceptor.cpp
similarity index 95%
rename from services/surfaceflinger/tests/unittests/MockSurfaceInterceptor.cpp
rename to services/surfaceflinger/tests/unittests/mock/MockSurfaceInterceptor.cpp
index b2ec721..4129328 100644
--- a/services/surfaceflinger/tests/unittests/MockSurfaceInterceptor.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/MockSurfaceInterceptor.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockSurfaceInterceptor.h"
+#include "mock/MockSurfaceInterceptor.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockSurfaceInterceptor.h b/services/surfaceflinger/tests/unittests/mock/MockSurfaceInterceptor.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockSurfaceInterceptor.h
rename to services/surfaceflinger/tests/unittests/mock/MockSurfaceInterceptor.h
diff --git a/services/surfaceflinger/tests/unittests/MockRenderEngine.cpp b/services/surfaceflinger/tests/unittests/mock/RenderEngine/MockRenderEngine.cpp
similarity index 95%
rename from services/surfaceflinger/tests/unittests/MockRenderEngine.cpp
rename to services/surfaceflinger/tests/unittests/mock/RenderEngine/MockRenderEngine.cpp
index e69f4cf..a98bece 100644
--- a/services/surfaceflinger/tests/unittests/MockRenderEngine.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/RenderEngine/MockRenderEngine.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockRenderEngine.h"
+#include "mock/RenderEngine/MockRenderEngine.h"
namespace android {
namespace RE {
diff --git a/services/surfaceflinger/tests/unittests/MockRenderEngine.h b/services/surfaceflinger/tests/unittests/mock/RenderEngine/MockRenderEngine.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockRenderEngine.h
rename to services/surfaceflinger/tests/unittests/mock/RenderEngine/MockRenderEngine.h
diff --git a/services/surfaceflinger/tests/unittests/MockGraphicBufferConsumer.cpp b/services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferConsumer.cpp
similarity index 94%
rename from services/surfaceflinger/tests/unittests/MockGraphicBufferConsumer.cpp
rename to services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferConsumer.cpp
index 4b27e75..a17b73f 100644
--- a/services/surfaceflinger/tests/unittests/MockGraphicBufferConsumer.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferConsumer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockGraphicBufferConsumer.h"
+#include "mock/gui/MockGraphicBufferConsumer.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockGraphicBufferConsumer.h b/services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferConsumer.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockGraphicBufferConsumer.h
rename to services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferConsumer.h
diff --git a/services/surfaceflinger/tests/unittests/MockGraphicBufferProducer.cpp b/services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferProducer.cpp
similarity index 94%
rename from services/surfaceflinger/tests/unittests/MockGraphicBufferProducer.cpp
rename to services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferProducer.cpp
index e6f0c63..a7fd667 100644
--- a/services/surfaceflinger/tests/unittests/MockGraphicBufferProducer.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferProducer.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockGraphicBufferProducer.h"
+#include "mock/gui/MockGraphicBufferProducer.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockGraphicBufferProducer.h b/services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferProducer.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockGraphicBufferProducer.h
rename to services/surfaceflinger/tests/unittests/mock/gui/MockGraphicBufferProducer.h
diff --git a/services/surfaceflinger/tests/unittests/MockNativeWindow.cpp b/services/surfaceflinger/tests/unittests/mock/system/window/MockNativeWindow.cpp
similarity index 98%
rename from services/surfaceflinger/tests/unittests/MockNativeWindow.cpp
rename to services/surfaceflinger/tests/unittests/mock/system/window/MockNativeWindow.cpp
index 61038f4..a490b92 100644
--- a/services/surfaceflinger/tests/unittests/MockNativeWindow.cpp
+++ b/services/surfaceflinger/tests/unittests/mock/system/window/MockNativeWindow.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "MockNativeWindow.h"
+#include "mock/system/window/MockNativeWindow.h"
namespace android {
namespace mock {
diff --git a/services/surfaceflinger/tests/unittests/MockNativeWindow.h b/services/surfaceflinger/tests/unittests/mock/system/window/MockNativeWindow.h
similarity index 100%
rename from services/surfaceflinger/tests/unittests/MockNativeWindow.h
rename to services/surfaceflinger/tests/unittests/mock/system/window/MockNativeWindow.h