Move directories around for testapp to match other bedstead components.
Test: atest TestAppTest
Bug: 188894962
Change-Id: Iba0f0afdc0b324a09276640f773558ef77b486d5
diff --git a/common/device-side/bedstead/testapp/Android.bp b/common/device-side/bedstead/testapp/Android.bp
index fe708ac..9ba143f 100644
--- a/common/device-side/bedstead/testapp/Android.bp
+++ b/common/device-side/bedstead/testapp/Android.bp
@@ -6,7 +6,7 @@
name: "TestApp_TestApps",
sdk_version: "test_current",
srcs: [
- "src/main/testapps/java/**/*.java"
+ "src/testapps/main/java/**/*.java"
],
static_libs: [
"Nene",
@@ -15,8 +15,9 @@
"ConnectedAppsSDK",
"ConnectedAppsSDK_Annotations",
"androidx.annotation_annotation",
+ "RemoteFrameworkClasses"
],
- manifest: "src/main/testapps/AndroidManifest.xml",
+ manifest: "src/testapps/main/AndroidManifest.xml",
min_sdk_version: "28",
plugins: ["ConnectedAppsSDK_Processor", "TestApp_Processor"],
}
@@ -25,7 +26,7 @@
name: "TestApp",
sdk_version: "test_current",
srcs: [
- "src/main/library/java/**/*.java"
+ "src/library/main/java/**/*.java"
],
static_libs: [
"Nene",
@@ -37,7 +38,7 @@
"androidx.annotation_annotation",
"TestApp_TestApps"
],
- manifest: "src/main/library/AndroidManifest.xml",
+ manifest: "src/library/main/AndroidManifest.xml",
min_sdk_version: "28",
resource_zips: [":TestApp_Apps"],
plugins: ["ConnectedAppsSDK_Processor", "TestApp_Processor"],
diff --git a/common/device-side/bedstead/testapp/src/main/library/AndroidManifest.xml b/common/device-side/bedstead/testapp/src/library/main/AndroidManifest.xml
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/AndroidManifest.xml
rename to common/device-side/bedstead/testapp/src/library/main/AndroidManifest.xml
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/NotFoundException.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/NotFoundException.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/NotFoundException.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/NotFoundException.java
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestApp.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestApp.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestApp.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestApp.java
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivities.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
similarity index 92%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivities.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
index 141f6f8..3281a28 100644
--- a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivities.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
@@ -18,7 +18,6 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.util.Log;
import com.android.bedstead.nene.TestApis;
import com.android.queryable.info.ActivityInfo;
@@ -55,7 +54,8 @@
PackageManager p = sTestApis.context().instrumentedContext().getPackageManager();
try {
- PackageInfo packageInfo = p.getPackageInfo(mInstance.testApp().packageName(), /* flags= */ PackageManager.GET_ACTIVITIES);
+ PackageInfo packageInfo = p.getPackageInfo(
+ mInstance.testApp().packageName(), /* flags= */ PackageManager.GET_ACTIVITIES);
for (android.content.pm.ActivityInfo activityInfo : packageInfo.activities) {
if (activityInfo.name.startsWith("androidx")) {
// Special case: androidx adds non-logging activities
@@ -80,6 +80,9 @@
return query().get();
}
+ /**
+ * Query for an Activity.
+ */
public TestAppActivitiesQueryBuilder query() {
return new TestAppActivitiesQueryBuilder(this);
}
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
similarity index 82%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
index 97ccfbe..07e5d94 100644
--- a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
@@ -40,18 +40,25 @@
mTestAppActivities = testAppActivities;
}
+ /** Query by activity. */
public ActivityQuery<TestAppActivitiesQueryBuilder> whereActivity() {
return mActivity;
}
+ /** Get the activity which matches the query. */
public TestAppActivityReference get() {
- Iterator<com.android.queryable.info.ActivityInfo> activityIterator = mTestAppActivities.activities().iterator();
+ Iterator<com.android.queryable.info.ActivityInfo> activityIterator =
+ mTestAppActivities.activities().iterator();
while (activityIterator.hasNext()) {
com.android.queryable.info.ActivityInfo activity = activityIterator.next();
if (ActivityQueryHelper.matches(mActivity, activity)) {
activityIterator.remove();
- return new UnresolvedTestAppActivity(mTestAppActivities.mInstance, sTestApis.packages().component(new ComponentName(mTestAppActivities.mInstance.testApp().packageName(), activity.className())));
+ return new UnresolvedTestAppActivity(mTestAppActivities.mInstance,
+ sTestApis.packages().component(
+ new ComponentName(
+ mTestAppActivities.mInstance.testApp().packageName(),
+ activity.className())));
}
}
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivity.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivity.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivity.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivity.java
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivityReference.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivityReference.java
similarity index 95%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivityReference.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivityReference.java
index ba40f55..0b0f0fc 100644
--- a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppActivityReference.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivityReference.java
@@ -22,10 +22,8 @@
import android.content.Intent;
import android.os.Bundle;
-import android.util.Log;
import com.android.bedstead.nene.TestApis;
-import com.android.bedstead.nene.activities.ActivityReference;
import com.android.bedstead.nene.packages.ComponentReference;
import com.android.bedstead.nene.permissions.PermissionContext;
import com.android.eventlib.events.activities.ActivityCreatedEvent;
@@ -74,7 +72,8 @@
ActivityStartedEvent
.queryPackage(mComponent.packageName().packageName())
- .whereActivity().activityClass().className().isEqualTo(mComponent.className()).waitForEvent();
+ .whereActivity().activityClass().className().isEqualTo(
+ mComponent.className()).waitForEvent();
return sTestApis.activities().wrap(
TestAppActivity.class, new TestAppActivityImpl(mInstance, mComponent));
@@ -95,7 +94,8 @@
ActivityCreatedEvent
.queryPackage(mComponent.packageName().packageName())
- .whereActivity().activityClass().className().isEqualTo(mComponent.className()).waitForEvent();
+ .whereActivity().activityClass().className().isEqualTo(
+ mComponent.className()).waitForEvent();
return sTestApis.activities().wrap(
TestAppActivity.class, new TestAppActivityImpl(mInstance, mComponent));
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppBinder.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppBinder.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppBinder.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppBinder.java
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppDetails.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppDetails.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppDetails.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppDetails.java
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppInstanceReference.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstanceReference.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppInstanceReference.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstanceReference.java
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppProvider.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppProvider.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppProvider.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppProvider.java
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppQueryBuilder.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppQueryBuilder.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/TestAppQueryBuilder.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppQueryBuilder.java
diff --git a/common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/UnresolvedTestAppActivity.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/UnresolvedTestAppActivity.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/library/java/com/android/bedstead/testapp/UnresolvedTestAppActivity.java
rename to common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/UnresolvedTestAppActivity.java
diff --git a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivitiesTest.java b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivitiesTest.java
index bcc74dc..f93e745 100644
--- a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivitiesTest.java
+++ b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivitiesTest.java
@@ -41,7 +41,9 @@
private static final UserReference sUser = sTestApis.users().instrumented();
private static final TestAppProvider sTestAppProvider = new TestAppProvider();
- private static final TestApp sTestApp = sTestAppProvider.any(); // TODO(scottjonathan): specify must have activity
+ private static final TestApp sTestApp = sTestAppProvider.query()
+ .wherePackageName().isEqualTo("android.EmptyTestApp")
+ .get(); // TODO(scottjonathan): specify must have activity rather than package name
private static TestAppInstanceReference mTestAppInstance;
private static final String EXISTING_ACTIVITY = "android.testapp.activity";
diff --git a/common/device-side/bedstead/testapp/src/main/testapps/AndroidManifest.xml b/common/device-side/bedstead/testapp/src/testapps/main/AndroidManifest.xml
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/testapps/AndroidManifest.xml
rename to common/device-side/bedstead/testapp/src/testapps/main/AndroidManifest.xml
diff --git a/common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/BaseTestAppActivity.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppActivity.java
similarity index 98%
rename from common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/BaseTestAppActivity.java
rename to common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppActivity.java
index 1283b29..709afa2 100644
--- a/common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/BaseTestAppActivity.java
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppActivity.java
@@ -19,7 +19,6 @@
import android.app.Activity;
import android.os.Bundle;
import android.os.PersistableBundle;
-import android.util.Log;
import com.android.eventlib.premade.EventLibActivity;
diff --git a/common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/BaseTestAppBroadcastReceiver.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppBroadcastReceiver.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/BaseTestAppBroadcastReceiver.java
rename to common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppBroadcastReceiver.java
diff --git a/common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/BaseTestAppDeviceAdminReceiver.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppDeviceAdminReceiver.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/BaseTestAppDeviceAdminReceiver.java
rename to common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppDeviceAdminReceiver.java
diff --git a/common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
similarity index 100%
rename from common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
rename to common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
diff --git a/common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/TestAppController.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppController.java
similarity index 89%
rename from common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/TestAppController.java
rename to common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppController.java
index 231da1f..06c5c1e 100644
--- a/common/device-side/bedstead/testapp/src/main/testapps/java/com/android/bedstead/testapp/TestAppController.java
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppController.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.content.IntentFilter;
-import android.util.Log;
import com.google.android.enterprise.connectedapps.annotations.CrossUser;
@@ -33,15 +32,22 @@
private static final Map<Long, BaseTestAppBroadcastReceiver> sBroadcastReceivers =
new HashMap<>();
+ /**
+ * Register a broadcast receiver.
+ *
+ * <p>Received broadcasts can be queried using EventLib.
+ */
@CrossUser
public void registerReceiver(Context context, long receiverId, IntentFilter intentFilter) {
- // TODO: We must persist this somehow so it can be restored after killing
BaseTestAppBroadcastReceiver broadcastReceiver = new BaseTestAppBroadcastReceiver();
sBroadcastReceivers.put(receiverId, broadcastReceiver);
context.registerReceiver(broadcastReceiver, intentFilter);
}
+ /**
+ * Unregister a previously registered broadcast receiver.
+ */
@CrossUser
public void unregisterReceiver(Context context, long receiverId) {
BaseTestAppBroadcastReceiver receiver = sBroadcastReceivers.remove(receiverId);
