From 99decddb66f97b6ac4829bd6469356fd3a2f264d Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 20 Jun 2019 16:31:28 -0700
Subject: [PATCH] Move settingslib testutils to its own target

Bug: 135698296
Test: rebuild
Change-Id: I6bfff17ccdcf94890f714956343247f11634f207
---
 packages/SettingsLib/tests/robotests/Android.bp              | 5 ++++-
 .../android/settingslib/testutils/DrawableTestHelper.java    | 0
 .../settingslib/testutils/shadow/ShadowActivityManager.java  | 0
 .../settingslib/testutils/shadow/ShadowBluetoothAdapter.java | 0
 .../testutils/shadow/ShadowDefaultDialerManager.java         | 2 +-
 .../settingslib/testutils/shadow/ShadowSmsApplication.java   | 2 +-
 .../settingslib/testutils/shadow/ShadowUserManager.java      | 0
 7 files changed, 6 insertions(+), 3 deletions(-)
 rename packages/SettingsLib/tests/robotests/{src => testutils}/com/android/settingslib/testutils/DrawableTestHelper.java (100%)
 rename packages/SettingsLib/tests/robotests/{src => testutils}/com/android/settingslib/testutils/shadow/ShadowActivityManager.java (100%)
 rename packages/SettingsLib/tests/robotests/{src => testutils}/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java (100%)
 rename packages/SettingsLib/tests/robotests/{src => testutils}/com/android/settingslib/testutils/shadow/ShadowDefaultDialerManager.java (99%)
 rename packages/SettingsLib/tests/robotests/{src => testutils}/com/android/settingslib/testutils/shadow/ShadowSmsApplication.java (99%)
 rename packages/SettingsLib/tests/robotests/{src => testutils}/com/android/settingslib/testutils/shadow/ShadowUserManager.java (100%)

diff --git a/packages/SettingsLib/tests/robotests/Android.bp b/packages/SettingsLib/tests/robotests/Android.bp
index 25c80faf98e37..3756c3bf7704a 100644
--- a/packages/SettingsLib/tests/robotests/Android.bp
+++ b/packages/SettingsLib/tests/robotests/Android.bp
@@ -32,6 +32,9 @@ android_app {
 android_robolectric_test {
     name: "SettingsLibRoboTests",
     srcs: ["src/**/*.java"],
+    static_libs: [
+        "SettingsLib-robo-testutils",
+    ],
     java_resource_dirs: ["config"],
     instrumentation_for: "SettingsLibShell",
     coverage_libs: ["SettingsLib"],
@@ -43,7 +46,7 @@ android_robolectric_test {
 java_library {
     name: "SettingsLib-robo-testutils",
     srcs: [
-        "src/com/android/settingslib/testutils/**/*.java",
+        "testutils/com/android/settingslib/testutils/**/*.java",
     ],
 
     libs: [
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/DrawableTestHelper.java b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/DrawableTestHelper.java
similarity index 100%
rename from packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/DrawableTestHelper.java
rename to packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/DrawableTestHelper.java
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowActivityManager.java b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowActivityManager.java
similarity index 100%
rename from packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowActivityManager.java
rename to packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowActivityManager.java
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java
similarity index 100%
rename from packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java
rename to packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowBluetoothAdapter.java
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowDefaultDialerManager.java b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowDefaultDialerManager.java
similarity index 99%
rename from packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowDefaultDialerManager.java
rename to packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowDefaultDialerManager.java
index d8fc8613d8611..2c0792fd57bdd 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowDefaultDialerManager.java
+++ b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowDefaultDialerManager.java
@@ -41,4 +41,4 @@ public class ShadowDefaultDialerManager {
     public static void setDefaultDialerApplication(String dialer) {
         sDefaultDialer = dialer;
     }
-}
\ No newline at end of file
+}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowSmsApplication.java b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowSmsApplication.java
similarity index 99%
rename from packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowSmsApplication.java
rename to packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowSmsApplication.java
index c8c4526e66ff9..381d072b6fe1d 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowSmsApplication.java
+++ b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowSmsApplication.java
@@ -43,4 +43,4 @@ public class ShadowSmsApplication {
     public static void setDefaultSmsApplication(ComponentName cn) {
         sDefaultSmsApplication = cn;
     }
-}
\ No newline at end of file
+}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowUserManager.java b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowUserManager.java
similarity index 100%
rename from packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowUserManager.java
rename to packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowUserManager.java