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

24 files changed, 34 insertions, 35 deletions

diff --git a/services/surfaceflinger/tests/unittests/Android.bp b/services/surfaceflinger/tests/unittests/Android.bp
index 8ffc5ad00e..bcabe0dffc 100644
--- a/services/surfaceflinger/tests/unittests/Android.bp
+++ b/services/surfaceflinger/tests/unittests/Android.bp
@@ -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",
diff --git a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
index 2551a9cccd..7257b46501 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
index 318519bf19..7ed57b9d96 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
index 8be277915e..8be277915e 100644
--- a/services/surfaceflinger/tests/unittests/MockComposer.h
+++ b/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
index 507626bf8f..e6ac6bfb00 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
index d6c9aa46b4..d6c9aa46b4 100644
--- a/services/surfaceflinger/tests/unittests/MockDisplaySurface.h
+++ b/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
index 398fd42542..f9bacc8b20 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
index 8ac09a962d..8ac09a962d 100644
--- a/services/surfaceflinger/tests/unittests/MockEventControlThread.h
+++ b/services/surfaceflinger/tests/unittests/mock/MockEventControlThread.h
diff --git a/services/surfaceflinger/tests/unittests/MockEventThread.cpp b/services/surfaceflinger/tests/unittests/mock/MockEventThread.cpp
index 6b5ea4bb3f..408cd35f29 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
index e6ea6634c0..e6ea6634c0 100644
--- a/services/surfaceflinger/tests/unittests/MockEventThread.h
+++ b/services/surfaceflinger/tests/unittests/mock/MockEventThread.h
diff --git a/services/surfaceflinger/tests/unittests/MockMessageQueue.cpp b/services/surfaceflinger/tests/unittests/mock/MockMessageQueue.cpp
index 62f45edd31..97a13e4d3e 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
index cf07cf7ba9..cf07cf7ba9 100644
--- a/services/surfaceflinger/tests/unittests/MockMessageQueue.h
+++ b/services/surfaceflinger/tests/unittests/mock/MockMessageQueue.h
diff --git a/services/surfaceflinger/tests/unittests/MockNativeWindowSurface.cpp b/services/surfaceflinger/tests/unittests/mock/MockNativeWindowSurface.cpp
index 0314568519..25ff39bbd1 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
index 88d1a9fc51..88d1a9fc51 100644
--- a/services/surfaceflinger/tests/unittests/MockNativeWindowSurface.h
+++ b/services/surfaceflinger/tests/unittests/mock/MockNativeWindowSurface.h
diff --git a/services/surfaceflinger/tests/unittests/MockSurfaceInterceptor.cpp b/services/surfaceflinger/tests/unittests/mock/MockSurfaceInterceptor.cpp
index b2ec721f44..4129328ba9 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
index 458b2f3da2..458b2f3da2 100644
--- a/services/surfaceflinger/tests/unittests/MockSurfaceInterceptor.h
+++ b/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
index e69f4cfb83..a98beceebd 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
index 9bb2a3c961..9bb2a3c961 100644
--- a/services/surfaceflinger/tests/unittests/MockRenderEngine.h
+++ b/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
index 4b27e75129..a17b73f0fc 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
index 98f24c2d44..98f24c2d44 100644
--- a/services/surfaceflinger/tests/unittests/MockGraphicBufferConsumer.h
+++ b/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
index e6f0c631e1..a7fd667b54 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
index c98f39f43c..c98f39f43c 100644
--- a/services/surfaceflinger/tests/unittests/MockGraphicBufferProducer.h
+++ b/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
index 61038f4879..a490b92a8c 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
index 561fd5869e..561fd5869e 100644
--- a/services/surfaceflinger/tests/unittests/MockNativeWindow.h
+++ b/services/surfaceflinger/tests/unittests/mock/system/window/MockNativeWindow.h