Pull Queryable out of EventLib. This will be used for TestApp.
Test: atest EventLibTest
Test: atest BedsteadQueryableTest
Bug: 175377361
Change-Id: I920c8b6be321f9469fb3adf7cde8717e465bc8f2
diff --git a/common/device-side/bedstead/eventlib/Android.bp b/common/device-side/bedstead/eventlib/Android.bp
index 52545a6..cef979c 100644
--- a/common/device-side/bedstead/eventlib/Android.bp
+++ b/common/device-side/bedstead/eventlib/Android.bp
@@ -11,7 +11,8 @@
],
static_libs: [
"Nene",
- "androidx.test.ext.junit"],
+ "Queryable"
+ ],
manifest: "src/main/AndroidManifest.xml",
min_sdk_version: "27"
}
diff --git a/common/device-side/bedstead/eventlib/OWNERS b/common/device-side/bedstead/eventlib/OWNERS
deleted file mode 100644
index ce3438f..0000000
--- a/common/device-side/bedstead/eventlib/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-scottjonathan@google.com
-alexkershaw@google.com
\ No newline at end of file
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/EventLogsQuery.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/EventLogsQuery.java
index 35bdf2a..379d297 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/EventLogsQuery.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/EventLogsQuery.java
@@ -19,6 +19,7 @@
import android.os.UserHandle;
import com.android.bedstead.nene.users.UserReference;
+import com.android.queryable.Queryable;
import java.util.HashSet;
import java.util.Set;
@@ -28,7 +29,7 @@
* Interface to provide additional restrictions on an {@link Event} query.
*/
public abstract class EventLogsQuery<E extends Event, F extends EventLogsQuery>
- extends EventLogs<E> {
+ extends EventLogs<E> implements Queryable {
/**
* Default implementation of {@link EventLogsQuery} used when there are no additional query
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/CustomEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/CustomEvent.java
index 26c0906..ea05843 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/CustomEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/CustomEvent.java
@@ -23,10 +23,10 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.queryhelpers.SerializableQuery;
-import com.android.eventlib.queryhelpers.SerializableQueryHelper;
-import com.android.eventlib.queryhelpers.StringQuery;
-import com.android.eventlib.queryhelpers.StringQueryHelper;
+import com.android.queryable.queries.SerializableQuery;
+import com.android.queryable.queries.SerializableQueryHelper;
+import com.android.queryable.queries.StringQuery;
+import com.android.queryable.queries.StringQueryHelper;
import java.io.Serializable;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityCreatedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityCreatedEvent.java
index 0e9660c..2474368 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityCreatedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityCreatedEvent.java
@@ -25,13 +25,13 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ActivityInfo;
-import com.android.eventlib.queryhelpers.ActivityQuery;
-import com.android.eventlib.queryhelpers.ActivityQueryHelper;
-import com.android.eventlib.queryhelpers.BundleQueryHelper;
-import com.android.eventlib.queryhelpers.PersistableBundleQuery;
-import com.android.eventlib.queryhelpers.PersistableBundleQueryHelper;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.info.ActivityInfo;
+import com.android.queryable.queries.ActivityQuery;
+import com.android.queryable.queries.ActivityQueryHelper;
+import com.android.queryable.queries.BundleQueryHelper;
+import com.android.queryable.queries.PersistableBundleQuery;
+import com.android.queryable.queries.PersistableBundleQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
/**
* Event logged when {@link Activity#onCreate(Bundle)} or
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityDestroyedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityDestroyedEvent.java
index da40ebf..88a00de 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityDestroyedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityDestroyedEvent.java
@@ -23,9 +23,9 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ActivityInfo;
-import com.android.eventlib.queryhelpers.ActivityQuery;
-import com.android.eventlib.queryhelpers.ActivityQueryHelper;
+import com.android.queryable.info.ActivityInfo;
+import com.android.queryable.queries.ActivityQuery;
+import com.android.queryable.queries.ActivityQueryHelper;
/**
* Event logged when {@link Activity#onDestroy()} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityPausedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityPausedEvent.java
index 5f22317..2e706ef 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityPausedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityPausedEvent.java
@@ -23,9 +23,9 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ActivityInfo;
-import com.android.eventlib.queryhelpers.ActivityQuery;
-import com.android.eventlib.queryhelpers.ActivityQueryHelper;
+import com.android.queryable.info.ActivityInfo;
+import com.android.queryable.queries.ActivityQuery;
+import com.android.queryable.queries.ActivityQueryHelper;
/**
* Event logged when {@link Activity#onPause()} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityRestartedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityRestartedEvent.java
index c8f6d86..40a9eb9 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityRestartedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityRestartedEvent.java
@@ -23,9 +23,9 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ActivityInfo;
-import com.android.eventlib.queryhelpers.ActivityQuery;
-import com.android.eventlib.queryhelpers.ActivityQueryHelper;
+import com.android.queryable.info.ActivityInfo;
+import com.android.queryable.queries.ActivityQuery;
+import com.android.queryable.queries.ActivityQueryHelper;
/**
* Event logged when {@link Activity#onRestart()} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityResumedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityResumedEvent.java
index 5d10f83..72c3b3b 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityResumedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityResumedEvent.java
@@ -23,9 +23,9 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ActivityInfo;
-import com.android.eventlib.queryhelpers.ActivityQuery;
-import com.android.eventlib.queryhelpers.ActivityQueryHelper;
+import com.android.queryable.info.ActivityInfo;
+import com.android.queryable.queries.ActivityQuery;
+import com.android.queryable.queries.ActivityQueryHelper;
/**
* Event logged when {@link Activity#onResume()}} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStartedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStartedEvent.java
index e0ee657..e320980 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStartedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStartedEvent.java
@@ -23,9 +23,9 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ActivityInfo;
-import com.android.eventlib.queryhelpers.ActivityQuery;
-import com.android.eventlib.queryhelpers.ActivityQueryHelper;
+import com.android.queryable.info.ActivityInfo;
+import com.android.queryable.queries.ActivityQuery;
+import com.android.queryable.queries.ActivityQueryHelper;
/**
* Event logged when {@link Activity#onStart()} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStoppedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStoppedEvent.java
index 736a097..fd802c7 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStoppedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStoppedEvent.java
@@ -23,9 +23,9 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ActivityInfo;
-import com.android.eventlib.queryhelpers.ActivityQuery;
-import com.android.eventlib.queryhelpers.ActivityQueryHelper;
+import com.android.queryable.info.ActivityInfo;
+import com.android.queryable.queries.ActivityQuery;
+import com.android.queryable.queries.ActivityQueryHelper;
/**
* Event logged when {@link Activity#onStop()} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/broadcastreceivers/BroadcastReceivedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/broadcastreceivers/BroadcastReceivedEvent.java
index b4a2717..ff849a0 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/broadcastreceivers/BroadcastReceivedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/broadcastreceivers/BroadcastReceivedEvent.java
@@ -25,12 +25,12 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.BroadcastReceiverInfo;
-import com.android.eventlib.queryhelpers.BroadcastReceiverQuery;
-import com.android.eventlib.queryhelpers.BroadcastReceiverQueryHelper;
-import com.android.eventlib.queryhelpers.IntentQuery;
-import com.android.eventlib.queryhelpers.IntentQueryHelper;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.info.BroadcastReceiverInfo;
+import com.android.queryable.queries.BroadcastReceiverQuery;
+import com.android.queryable.queries.BroadcastReceiverQueryHelper;
+import com.android.queryable.queries.IntentQuery;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
/**
* Event logged when {@link BroadcastReceiver#onReceive(Context, Intent)} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminDisableRequestedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminDisableRequestedEvent.java
index f1f82df..397399b 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminDisableRequestedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminDisableRequestedEvent.java
@@ -25,11 +25,11 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.DeviceAdminReceiverInfo;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQuery;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQueryHelper;
-import com.android.eventlib.queryhelpers.IntentQueryHelper;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.info.DeviceAdminReceiverInfo;
+import com.android.queryable.queries.DeviceAdminReceiverQuery;
+import com.android.queryable.queries.DeviceAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
/**
* Event logged when {@link DeviceAdminReceiver#onDisableRequested(Context, Intent)} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminDisabledEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminDisabledEvent.java
index 25bd3d9..d3ccc35 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminDisabledEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminDisabledEvent.java
@@ -25,11 +25,11 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.DeviceAdminReceiverInfo;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQuery;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQueryHelper;
-import com.android.eventlib.queryhelpers.IntentQueryHelper;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.info.DeviceAdminReceiverInfo;
+import com.android.queryable.queries.DeviceAdminReceiverQuery;
+import com.android.queryable.queries.DeviceAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
/**
* Event logged when {@link DeviceAdminReceiver#onDisabled(Context, Intent)} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminEnabledEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminEnabledEvent.java
index b390ed88..1ea2699 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminEnabledEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminEnabledEvent.java
@@ -25,11 +25,11 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.DeviceAdminReceiverInfo;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQuery;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQueryHelper;
-import com.android.eventlib.queryhelpers.IntentQueryHelper;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.info.DeviceAdminReceiverInfo;
+import com.android.queryable.queries.DeviceAdminReceiverQuery;
+import com.android.queryable.queries.DeviceAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
/**
* Event logged when {@link DeviceAdminReceiver#onEnabled(Context, Intent)} is called.
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordChangedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordChangedEvent.java
index 82998d6..5e09058 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordChangedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordChangedEvent.java
@@ -26,13 +26,13 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.DeviceAdminReceiverInfo;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQuery;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQueryHelper;
-import com.android.eventlib.queryhelpers.IntentQueryHelper;
-import com.android.eventlib.queryhelpers.UserHandleQuery;
-import com.android.eventlib.queryhelpers.UserHandleQueryHelper;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.info.DeviceAdminReceiverInfo;
+import com.android.queryable.queries.DeviceAdminReceiverQuery;
+import com.android.queryable.queries.DeviceAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.UserHandleQuery;
+import com.android.queryable.queries.UserHandleQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
/**
* Event logged when {@link DeviceAdminReceiver#onPasswordChanged(Context, Intent)} or
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordFailedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordFailedEvent.java
index b796a25..9bc1c84 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordFailedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordFailedEvent.java
@@ -26,13 +26,13 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.DeviceAdminReceiverInfo;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQuery;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQueryHelper;
-import com.android.eventlib.queryhelpers.IntentQueryHelper;
-import com.android.eventlib.queryhelpers.UserHandleQuery;
-import com.android.eventlib.queryhelpers.UserHandleQueryHelper;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.info.DeviceAdminReceiverInfo;
+import com.android.queryable.queries.DeviceAdminReceiverQuery;
+import com.android.queryable.queries.DeviceAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.UserHandleQuery;
+import com.android.queryable.queries.UserHandleQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
/**
* Event logged when {@link DeviceAdminReceiver#onPasswordFailed(Context, Intent)} or
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordSucceededEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordSucceededEvent.java
index ba22d98..f6a0504 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordSucceededEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/deviceadminreceivers/DeviceAdminPasswordSucceededEvent.java
@@ -26,13 +26,13 @@
import com.android.eventlib.Event;
import com.android.eventlib.EventLogger;
import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.DeviceAdminReceiverInfo;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQuery;
-import com.android.eventlib.queryhelpers.DeviceAdminReceiverQueryHelper;
-import com.android.eventlib.queryhelpers.IntentQueryHelper;
-import com.android.eventlib.queryhelpers.UserHandleQuery;
-import com.android.eventlib.queryhelpers.UserHandleQueryHelper;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.info.DeviceAdminReceiverInfo;
+import com.android.queryable.queries.DeviceAdminReceiverQuery;
+import com.android.queryable.queries.DeviceAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.UserHandleQuery;
+import com.android.queryable.queries.UserHandleQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
/**
* Event logged when {@link DeviceAdminReceiver#onPasswordSucceeded(Context, Intent)} or
diff --git a/common/device-side/bedstead/queryable/Android.bp b/common/device-side/bedstead/queryable/Android.bp
new file mode 100644
index 0000000..edae7901
--- /dev/null
+++ b/common/device-side/bedstead/queryable/Android.bp
@@ -0,0 +1,34 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_library {
+ name: "Queryable",
+ sdk_version: "test_current",
+ srcs: [
+ "src/main/java/**/*.java",
+ ],
+ static_libs: ["androidx.test.ext.junit"],
+ manifest: "src/main/AndroidManifest.xml",
+ min_sdk_version: "27"
+}
+
+android_test {
+ name: "BedsteadQueryableTest",
+ srcs: [
+ "src/test/java/**/*.java"
+ ],
+ test_suites: [
+ "general-tests",
+ ],
+ static_libs: [
+ "Queryable",
+ "ActivityContext",
+ "androidx.test.ext.junit",
+ "ctstestrunner-axt",
+ "truth-prebuilt",
+ "testng", // for assertThrows
+ ],
+ manifest: "src/test/AndroidManifest.xml",
+ min_sdk_version: "27"
+}
diff --git a/common/device-side/bedstead/queryable/AndroidTest.xml b/common/device-side/bedstead/queryable/AndroidTest.xml
new file mode 100644
index 0000000..32d559d
--- /dev/null
+++ b/common/device-side/bedstead/queryable/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<configuration description="Config for Event Library test cases">
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="BedsteadQueryableTest.apk" />
+ <option name="install-arg" value="-t" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.queryable.test" />
+ </test>
+</configuration>
\ No newline at end of file
diff --git a/common/device-side/bedstead/queryable/TEST_MAPPING b/common/device-side/bedstead/queryable/TEST_MAPPING
new file mode 100644
index 0000000..62bc822
--- /dev/null
+++ b/common/device-side/bedstead/queryable/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "postsubmit": [
+ {
+ "name": "BedsteadQueryableTest"
+ }
+ ]
+}
diff --git a/common/device-side/bedstead/queryable/src/main/AndroidManifest.xml b/common/device-side/bedstead/queryable/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..836303a
--- /dev/null
+++ b/common/device-side/bedstead/queryable/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.queryable">
+ <uses-sdk android:minSdkVersion="27" />
+ <application>
+ </application>
+</manifest>
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/Queryable.java
similarity index 71%
copy from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQuery.java
copy to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/Queryable.java
index 91d67ea..09bd40a 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/Queryable.java
@@ -14,13 +14,7 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable;
-import android.app.Activity;
-
-import com.android.eventlib.EventLogsQuery;
-
-/** Query for an {@link Activity}. */
-public interface ActivityQuery<E extends EventLogsQuery> extends ClassQuery<E> {
-
+public interface Queryable {
}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/ActivityInfo.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/ActivityInfo.java
similarity index 97%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/ActivityInfo.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/ActivityInfo.java
index 41ccb8a..632afab 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/ActivityInfo.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/ActivityInfo.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.eventlib.info;
+package com.android.queryable.info;
import android.app.Activity;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/BroadcastReceiverInfo.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/BroadcastReceiverInfo.java
similarity index 97%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/BroadcastReceiverInfo.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/BroadcastReceiverInfo.java
index 83095be..30c19e9 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/BroadcastReceiverInfo.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/BroadcastReceiverInfo.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.eventlib.info;
+package com.android.queryable.info;
import android.content.BroadcastReceiver;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/ClassInfo.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/ClassInfo.java
similarity index 97%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/ClassInfo.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/ClassInfo.java
index b0d245a..a964335 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/ClassInfo.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/ClassInfo.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.eventlib.info;
+package com.android.queryable.info;
import java.io.Serializable;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/DeviceAdminReceiverInfo.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/DeviceAdminReceiverInfo.java
similarity index 97%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/DeviceAdminReceiverInfo.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/DeviceAdminReceiverInfo.java
index 611e216..4660203 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/info/DeviceAdminReceiverInfo.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/DeviceAdminReceiverInfo.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.eventlib.info;
+package com.android.queryable.info;
import android.app.admin.DeviceAdminReceiver;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ActivityQuery.java
similarity index 80%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ActivityQuery.java
index 91d67ea..8fe37eb 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ActivityQuery.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.app.Activity;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
/** Query for an {@link Activity}. */
-public interface ActivityQuery<E extends EventLogsQuery> extends ClassQuery<E> {
+public interface ActivityQuery<E extends Queryable> extends ClassQuery<E> {
}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ActivityQueryHelper.java
similarity index 85%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ActivityQueryHelper.java
index 8389d4c..77a6191 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ActivityQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ActivityQueryHelper.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ActivityInfo;
+import com.android.queryable.Queryable;
+import com.android.queryable.info.ActivityInfo;
/** Implementation of {@link ActivityQuery}. */
-public final class ActivityQueryHelper<E extends EventLogsQuery> implements ActivityQuery<E> {
+public final class ActivityQueryHelper<E extends Queryable> implements ActivityQuery<E> {
private final E mQuery;
private final ClassQueryHelper<E> mClassQueryHelper;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BroadcastReceiverQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BroadcastReceiverQuery.java
similarity index 79%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BroadcastReceiverQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BroadcastReceiverQuery.java
index be8f659..45febeb 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BroadcastReceiverQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BroadcastReceiverQuery.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.content.BroadcastReceiver;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
/** Query for an {@link BroadcastReceiver}. */
-public interface BroadcastReceiverQuery<E extends EventLogsQuery> extends ClassQuery<E> {
+public interface BroadcastReceiverQuery<E extends Queryable> extends ClassQuery<E> {
}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BroadcastReceiverQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BroadcastReceiverQueryHelper.java
similarity index 86%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BroadcastReceiverQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BroadcastReceiverQueryHelper.java
index 4957cd4..a63f700 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BroadcastReceiverQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BroadcastReceiverQueryHelper.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.BroadcastReceiverInfo;
+import com.android.queryable.Queryable;
+import com.android.queryable.info.BroadcastReceiverInfo;
/** Implementation of {@link BroadcastReceiverQuery}. */
-public final class BroadcastReceiverQueryHelper<E extends EventLogsQuery>
+public final class BroadcastReceiverQueryHelper<E extends Queryable>
implements BroadcastReceiverQuery<E> {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleKeyQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleKeyQuery.java
similarity index 86%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleKeyQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleKeyQuery.java
index 035285c..0ec1156 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleKeyQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleKeyQuery.java
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.Bundle;
import androidx.annotation.CheckResult;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a single key in a {@link Bundle}. */
-public interface BundleKeyQuery<E extends EventLogsQuery> extends Serializable {
+public interface BundleKeyQuery<E extends Queryable> extends Serializable {
/** Require that the key exists. */
E exists();
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleKeyQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleKeyQueryHelper.java
similarity index 94%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleKeyQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleKeyQueryHelper.java
index f5851a4..f102e7d 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleKeyQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleKeyQueryHelper.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.Bundle;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Implementation of {@link BundleKeyQuery}. */
-public final class BundleKeyQueryHelper<E extends EventLogsQuery> implements BundleKeyQuery<E>,
+public final class BundleKeyQueryHelper<E extends Queryable> implements BundleKeyQuery<E>,
Serializable {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleQuery.java
similarity index 83%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleQuery.java
index cf9fd77..123f9e8 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleQuery.java
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.Bundle;
import androidx.annotation.CheckResult;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a {@link Bundle}. */
-public interface BundleQuery<E extends EventLogsQuery> extends Serializable {
+public interface BundleQuery<E extends Queryable> extends Serializable {
/** Query a given key on the {@link Bundle}. */
@CheckResult
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleQueryHelper.java
similarity index 88%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleQueryHelper.java
index dc60387..ae4b85e 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/BundleQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/BundleQueryHelper.java
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.Bundle;
-import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.util.SerializableParcelWrapper;
+import com.android.queryable.Queryable;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/** Implementation of {@link BundleQuery}. */
-public final class BundleQueryHelper<E extends EventLogsQuery> implements BundleQuery<E>,
+public final class BundleQueryHelper<E extends Queryable> implements BundleQuery<E>,
Serializable {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ClassQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ClassQuery.java
similarity index 84%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ClassQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ClassQuery.java
index 997ff68..8fd7b1d 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ClassQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ClassQuery.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import androidx.annotation.CheckResult;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a {@link Class}. */
-public interface ClassQuery<E extends EventLogsQuery> extends Serializable {
+public interface ClassQuery<E extends Queryable> extends Serializable {
/** Require that the class is the same as {@code clazz}. */
E isSameClassAs(Class<?> clazz);
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ClassQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ClassQueryHelper.java
similarity index 89%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ClassQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ClassQueryHelper.java
index 0c17d18..3eca12d 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/ClassQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/ClassQueryHelper.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.ClassInfo;
+import com.android.queryable.Queryable;
+import com.android.queryable.info.ClassInfo;
import java.io.Serializable;
/** Implementation of {@link ClassQuery}. */
-public final class ClassQueryHelper<E extends EventLogsQuery>
+public final class ClassQueryHelper<E extends Queryable>
implements ClassQuery<E>, Serializable {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/DeviceAdminReceiverQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DeviceAdminReceiverQuery.java
similarity index 82%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/DeviceAdminReceiverQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DeviceAdminReceiverQuery.java
index 3baea1e..40a2ffe 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/DeviceAdminReceiverQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DeviceAdminReceiverQuery.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.app.admin.DeviceAdminReceiver;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
/** Query for a {@link DeviceAdminReceiver}. */
-public interface DeviceAdminReceiverQuery<E extends EventLogsQuery>
+public interface DeviceAdminReceiverQuery<E extends Queryable>
extends BroadcastReceiverQuery<E> {
}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/DeviceAdminReceiverQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DeviceAdminReceiverQueryHelper.java
similarity index 86%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/DeviceAdminReceiverQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DeviceAdminReceiverQueryHelper.java
index 6ed0750..68cec2f 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/DeviceAdminReceiverQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DeviceAdminReceiverQueryHelper.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.info.DeviceAdminReceiverInfo;
+import com.android.queryable.Queryable;
+import com.android.queryable.info.DeviceAdminReceiverInfo;
/** Implementation of {@link DeviceAdminReceiverQuery}. */
-public final class DeviceAdminReceiverQueryHelper<E extends EventLogsQuery>
+public final class DeviceAdminReceiverQueryHelper<E extends Queryable>
implements DeviceAdminReceiverQuery<E> {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntegerQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntegerQuery.java
similarity index 87%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntegerQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntegerQuery.java
index 92b2469..5cb442f 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntegerQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntegerQuery.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a {@link Integer}. */
-public interface IntegerQuery<E extends EventLogsQuery> extends Serializable {
+public interface IntegerQuery<E extends Queryable> extends Serializable {
/** Require the {@link Integer} is equal to {@code i}. */
E isEqualTo(int i);
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntegerQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntegerQueryHelper.java
similarity index 93%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntegerQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntegerQueryHelper.java
index 1661954..c6519d4 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntegerQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntegerQueryHelper.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Implementation of {@link IntegerQuery}. */
-public final class IntegerQueryHelper<E extends EventLogsQuery> implements IntegerQuery<E>,
+public final class IntegerQueryHelper<E extends Queryable> implements IntegerQuery<E>,
Serializable {
private Integer mEqualToValue = null;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntentQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntentQuery.java
similarity index 83%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntentQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntentQuery.java
index 45d1e9a..3c83f24 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntentQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntentQuery.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.content.Intent;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a {@link Intent}. */
-public interface IntentQuery<E extends EventLogsQuery> extends Serializable {
+public interface IntentQuery<E extends Queryable> extends Serializable {
/** Query the {@link Intent#getAction}. */
StringQuery<E> action();
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntentQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntentQueryHelper.java
similarity index 88%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntentQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntentQueryHelper.java
index 459c29e..d7774e7 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/IntentQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/IntentQueryHelper.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.content.Intent;
-import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.util.SerializableParcelWrapper;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Implementation of {@link IntentQuery}. */
-public final class IntentQueryHelper<E extends EventLogsQuery> implements IntentQuery<E>,
+public final class IntentQueryHelper<E extends Queryable> implements IntentQuery<E>,
Serializable {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleKeyQuery.java
similarity index 85%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleKeyQuery.java
index dd3112a..9e75564 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleKeyQuery.java
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.PersistableBundle;
import androidx.annotation.CheckResult;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a single key in a {@link PersistableBundle}. */
-public interface PersistableBundleKeyQuery<E extends EventLogsQuery> extends Serializable {
+public interface PersistableBundleKeyQuery<E extends Queryable> extends Serializable {
/** Require that the key exists. */
E exists();
/** Require that the key does not exist. */
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleKeyQueryHelper.java
similarity index 94%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleKeyQueryHelper.java
index aca4e94..ddc9370 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleKeyQueryHelper.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.PersistableBundle;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Implementation of {@link PersistableBundleKeyQuery}. */
-public final class PersistableBundleKeyQueryHelper<E extends EventLogsQuery>
+public final class PersistableBundleKeyQueryHelper<E extends Queryable>
implements PersistableBundleKeyQuery<E>, Serializable {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleQuery.java
similarity index 83%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleQuery.java
index 4df56a2..67930a7d 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleQuery.java
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.PersistableBundle;
import androidx.annotation.CheckResult;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a {@link PersistableBundle}. */
-public interface PersistableBundleQuery<E extends EventLogsQuery> extends Serializable {
+public interface PersistableBundleQuery<E extends Queryable> extends Serializable {
/** Query a given key on the {@link PersistableBundle}. */
@CheckResult
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleQueryHelper.java
similarity index 89%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleQueryHelper.java
index 407e2ca..287f05a 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/PersistableBundleQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/PersistableBundleQueryHelper.java
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.PersistableBundle;
-import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.util.SerializableParcelWrapper;
+import com.android.queryable.Queryable;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/** Implementation of {@link PersistableBundleQuery}. */
-public final class PersistableBundleQueryHelper<E extends EventLogsQuery>
+public final class PersistableBundleQueryHelper<E extends Queryable>
implements PersistableBundleQuery<E>, Serializable {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/SerializableQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/SerializableQuery.java
similarity index 82%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/SerializableQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/SerializableQuery.java
index c57bc11..a511e42 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/SerializableQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/SerializableQuery.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a {@link Serializable}. */
-public interface SerializableQuery<E extends EventLogsQuery> extends Serializable {
+public interface SerializableQuery<E extends Queryable> extends Serializable {
/** Require that the {@link Serializable} is equal to {@code serializable}. */
E isEqualTo(Serializable serializable);
}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/SerializableQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/SerializableQueryHelper.java
similarity index 88%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/SerializableQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/SerializableQueryHelper.java
index 9d24c49..655c55b 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/SerializableQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/SerializableQueryHelper.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Implementation of {@link SerializableQuery}. */
-public final class SerializableQueryHelper<E extends EventLogsQuery>
+public final class SerializableQueryHelper<E extends Queryable>
implements SerializableQuery<E>, Serializable {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/StringQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/StringQuery.java
similarity index 82%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/StringQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/StringQuery.java
index 3721c7c..0dfb4b5 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/StringQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/StringQuery.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a {@link String}. */
-public interface StringQuery<E extends EventLogsQuery> extends Serializable {
+public interface StringQuery<E extends Queryable> extends Serializable {
/** Require the {@link String} is equal to {@code string}. */
E isEqualTo(String string);
}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/StringQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/StringQueryHelper.java
similarity index 88%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/StringQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/StringQueryHelper.java
index b84ff1a..45b731c 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/StringQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/StringQueryHelper.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Implementation of {@link StringQuery}. */
-public final class StringQueryHelper<E extends EventLogsQuery>
+public final class StringQueryHelper<E extends Queryable>
implements StringQuery<E>, Serializable{
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/UserHandleQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/UserHandleQuery.java
similarity index 84%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/UserHandleQuery.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/UserHandleQuery.java
index c0d5d28..7d7fb32 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/UserHandleQuery.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/UserHandleQuery.java
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.UserHandle;
import androidx.annotation.CheckResult;
-import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Query for a {@link UserHandle}. */
-public interface UserHandleQuery<E extends EventLogsQuery> extends Serializable {
+public interface UserHandleQuery<E extends Queryable> extends Serializable {
/** Require the {@link UserHandle} is equal to {@code userHandle}. */
E isEqualTo(UserHandle userHandle);
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/UserHandleQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/UserHandleQueryHelper.java
similarity index 90%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/UserHandleQueryHelper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/UserHandleQueryHelper.java
index 3b5254c..a4b0a09 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/queryhelpers/UserHandleQueryHelper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/UserHandleQueryHelper.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import android.os.UserHandle;
-import com.android.eventlib.EventLogsQuery;
-import com.android.eventlib.util.SerializableParcelWrapper;
+import com.android.queryable.util.SerializableParcelWrapper;
+import com.android.queryable.Queryable;
import java.io.Serializable;
/** Implementation of {@link UserHandleQuery}. */
-public final class UserHandleQueryHelper<E extends EventLogsQuery>
+public final class UserHandleQueryHelper<E extends Queryable>
implements UserHandleQuery<E>, Serializable {
private final E mQuery;
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/util/SerializableParcelWrapper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/util/SerializableParcelWrapper.java
similarity index 98%
rename from common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/util/SerializableParcelWrapper.java
rename to common/device-side/bedstead/queryable/src/main/java/com/android/queryable/util/SerializableParcelWrapper.java
index e0fa4b2..0d08c37 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/util/SerializableParcelWrapper.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/util/SerializableParcelWrapper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.eventlib.util;
+package com.android.queryable.util;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/common/device-side/bedstead/queryable/src/test/AndroidManifest.xml b/common/device-side/bedstead/queryable/src/test/AndroidManifest.xml
new file mode 100644
index 0000000..986faae
--- /dev/null
+++ b/common/device-side/bedstead/queryable/src/test/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.queryable.test">
+ <uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27"/>
+ <application
+ android:label="Queryable Tests"
+ android:testOnly="true">
+ <uses-library android:name="android.test.runner" />
+ </application>
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.queryable.test"
+ android:label="Queryable Tests" />
+</manifest>
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/ActivityInfoTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/ActivityInfoTest.java
similarity index 95%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/ActivityInfoTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/ActivityInfoTest.java
index 17b8e1d..dc3142e 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/ActivityInfoTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/ActivityInfoTest.java
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.info;
+package com.android.queryable.info;
import static com.google.common.truth.Truth.assertThat;
import android.app.Activity;
import com.android.activitycontext.ActivityContext;
+import com.android.queryable.info.ActivityInfo;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/BroadcastReceiverInfoTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/BroadcastReceiverInfoTest.java
similarity index 96%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/BroadcastReceiverInfoTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/BroadcastReceiverInfoTest.java
index 2121c86..d8b906d 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/BroadcastReceiverInfoTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/BroadcastReceiverInfoTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.eventlib.info;
+package com.android.queryable.info;
import static com.google.common.truth.Truth.assertThat;
@@ -22,6 +22,8 @@
import android.content.Context;
import android.content.Intent;
+import com.android.queryable.info.BroadcastReceiverInfo;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/ClassInfoTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/ClassInfoTest.java
similarity index 97%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/ClassInfoTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/ClassInfoTest.java
index 615cda1..db4cf81 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/ClassInfoTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/ClassInfoTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.eventlib.info;
+package com.android.queryable.info;
import static com.google.common.truth.Truth.assertThat;
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/DeviceAdminReceiverInfoTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/DeviceAdminReceiverInfoTest.java
similarity index 96%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/DeviceAdminReceiverInfoTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/DeviceAdminReceiverInfoTest.java
index 52505ed..6e0214b 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/info/DeviceAdminReceiverInfoTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/DeviceAdminReceiverInfoTest.java
@@ -14,12 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.info;
+package com.android.queryable.info;
import static com.google.common.truth.Truth.assertThat;
import android.app.admin.DeviceAdminReceiver;
+import com.android.queryable.info.DeviceAdminReceiverInfo;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/ActivityQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/ActivityQueryHelperTest.java
similarity index 79%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/ActivityQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/ActivityQueryHelperTest.java
index ce14238..25c77d5 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/ActivityQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/ActivityQueryHelperTest.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
import android.app.Activity;
-import com.android.eventlib.events.CustomEvent;
-import com.android.eventlib.info.ActivityInfo;
+import com.android.queryable.Queryable;
+import com.android.queryable.info.ActivityInfo;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,8 +30,7 @@
@RunWith(JUnit4.class)
public class ActivityQueryHelperTest {
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private static final Class<? extends Activity> CLASS_1 = Activity.class;
private static final ActivityInfo CLASS_1_ACTIVITY_INFO = new ActivityInfo(CLASS_1);
@@ -42,7 +41,7 @@
@Test
public void matches_noRestrictions_returnsTrue() {
- ActivityQueryHelper<CustomEvent.CustomEventQuery> activityQueryHelper =
+ ActivityQueryHelper<Queryable> activityQueryHelper =
new ActivityQueryHelper<>(mQuery);
assertThat(activityQueryHelper.matches(CLASS_1_ACTIVITY_INFO)).isTrue();
@@ -50,7 +49,7 @@
@Test
public void matches_isSameClassAs_doesMatch_returnsTrue() {
- ActivityQueryHelper<CustomEvent.CustomEventQuery> activityQueryHelper =
+ ActivityQueryHelper<Queryable> activityQueryHelper =
new ActivityQueryHelper<>(mQuery);
activityQueryHelper.isSameClassAs(CLASS_1);
@@ -60,7 +59,7 @@
@Test
public void matches_isSameClassAs_doesNotMatch_returnsFalse() {
- ActivityQueryHelper<CustomEvent.CustomEventQuery> activityQueryHelper =
+ ActivityQueryHelper<Queryable> activityQueryHelper =
new ActivityQueryHelper<>(mQuery);
activityQueryHelper.isSameClassAs(CLASS_1);
@@ -70,7 +69,7 @@
@Test
public void matches_className_doesMatch_returnsTrue() {
- ActivityQueryHelper<CustomEvent.CustomEventQuery> activityQueryHelper =
+ ActivityQueryHelper<Queryable> activityQueryHelper =
new ActivityQueryHelper<>(mQuery);
activityQueryHelper.className().isEqualTo(CLASS_1_CLASS_NAME);
@@ -80,7 +79,7 @@
@Test
public void matches_className_doesNotMatch_returnsFalse() {
- ActivityQueryHelper<CustomEvent.CustomEventQuery> activityQueryHelper =
+ ActivityQueryHelper<Queryable> activityQueryHelper =
new ActivityQueryHelper<>(mQuery);
activityQueryHelper.className().isEqualTo(CLASS_1_CLASS_NAME);
@@ -90,7 +89,7 @@
@Test
public void matches_simpleName_doesMatch_returnsTrue() {
- ActivityQueryHelper<CustomEvent.CustomEventQuery> activityQueryHelper =
+ ActivityQueryHelper<Queryable> activityQueryHelper =
new ActivityQueryHelper<>(mQuery);
activityQueryHelper.simpleName().isEqualTo(CLASS_1_SIMPLE_NAME);
@@ -100,7 +99,7 @@
@Test
public void matches_simpleName_doesNotMatch_returnsFalse() {
- ActivityQueryHelper<CustomEvent.CustomEventQuery> activityQueryHelper =
+ ActivityQueryHelper<Queryable> activityQueryHelper =
new ActivityQueryHelper<>(mQuery);
activityQueryHelper.simpleName().isEqualTo(CLASS_1_SIMPLE_NAME);
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/BundleKeyQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/BundleKeyQueryHelperTest.java
similarity index 81%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/BundleKeyQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/BundleKeyQueryHelperTest.java
index 9283aba..9557bcb 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/BundleKeyQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/BundleKeyQueryHelperTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
import android.os.Bundle;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,8 +36,7 @@
private static final String STRING_VALUE = "String";
private static final String DIFFERENT_STRING_VALUE = "String2";
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private final Bundle mBundle = new Bundle();
private final Bundle mBundle2 = new Bundle();
private final Serializable mSerializable = "SerializableString";
@@ -45,7 +44,7 @@
@Test
public void matches_noRestrictions_returnsTrue() {
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
assertThat(bundleKeyQueryHelper.matches(mBundle, KEY)).isTrue();
@@ -54,7 +53,7 @@
@Test
public void matches_stringValueRestriction_meetsRestriction_returnsTrue() {
mBundle.putString(KEY, STRING_VALUE);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.stringValue().isEqualTo(STRING_VALUE);
@@ -65,7 +64,7 @@
@Test
public void matches_stringValueRestriction_doesNotMeetRestriction_returnsFalse() {
mBundle.putString(KEY, STRING_VALUE);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.stringValue().isEqualTo(DIFFERENT_STRING_VALUE);
@@ -77,7 +76,7 @@
public void matches_bundleValueRestriction_meetsRestriction_returnsTrue() {
mBundle.putBundle(KEY, mBundle2);
mBundle2.putString(KEY2, STRING_VALUE);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.bundleValue().key(KEY2).exists();
@@ -89,7 +88,7 @@
public void matches_bundleValueRestriction_doesNotMeetRestriction_returnsFalse() {
mBundle.putBundle(KEY, mBundle2);
mBundle2.remove(KEY2);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.bundleValue().key(KEY2).exists();
@@ -100,7 +99,7 @@
@Test
public void matches_serializableValueRestriction_meetsRestriction_returnsTrue() {
mBundle.putSerializable(KEY, mSerializable);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.serializableValue().isEqualTo(mSerializable);
@@ -111,7 +110,7 @@
@Test
public void matches_serializableValueRestriction_doesNotMeetRestriction_returnsFalse() {
mBundle.putSerializable(KEY, mSerializable);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.serializableValue().isEqualTo(mDifferentSerializable);
@@ -122,7 +121,7 @@
@Test
public void matches_existsRestriction_meetsRestriction_returnsTrue() {
mBundle.putString(KEY, STRING_VALUE);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.exists();
@@ -133,7 +132,7 @@
@Test
public void matches_existsRestriction_doesNotMeetRestriction_returnsFalse() {
mBundle.remove(KEY);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.exists();
@@ -144,7 +143,7 @@
@Test
public void matches_doesNotExistRestriction_meetsRestriction_returnsTrue() {
mBundle.remove(KEY);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.doesNotExist();
@@ -155,7 +154,7 @@
@Test
public void matches_doesNotExistRestriction_doesNotMeetRestriction_returnsFalse() {
mBundle.putString(KEY, STRING_VALUE);
- BundleKeyQueryHelper<CustomEvent.CustomEventQuery> bundleKeyQueryHelper =
+ BundleKeyQueryHelper<Queryable> bundleKeyQueryHelper =
new BundleKeyQueryHelper<>(mQuery);
bundleKeyQueryHelper.doesNotExist();
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/BundleQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/BundleQueryHelperTest.java
similarity index 80%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/BundleQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/BundleQueryHelperTest.java
index 12d9b95..bd150bb 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/BundleQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/BundleQueryHelperTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
import android.os.Bundle;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,13 +33,12 @@
private static final String KEY2 = "Key2";
private static final String STRING_VALUE = "value";
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private final Bundle mBundle = new Bundle();
@Test
public void matches_noRestrictions_returnsTrue() {
- BundleQueryHelper<CustomEvent.CustomEventQuery> bundleQueryHelper =
+ BundleQueryHelper<Queryable> bundleQueryHelper =
new BundleQueryHelper<>(mQuery);
assertThat(bundleQueryHelper.matches(mBundle)).isTrue();
@@ -48,7 +47,7 @@
@Test
public void matches_restrictionOnOneKey_restrictionIsMet_returnsTrue() {
mBundle.putString(KEY, STRING_VALUE);
- BundleQueryHelper<CustomEvent.CustomEventQuery> bundleQueryHelper =
+ BundleQueryHelper<Queryable> bundleQueryHelper =
new BundleQueryHelper<>(mQuery);
bundleQueryHelper.key(KEY).exists();
@@ -59,7 +58,7 @@
@Test
public void matches_restrictionOnOneKey_restrictionIsNotMet_returnsFalse() {
mBundle.putString(KEY, STRING_VALUE);
- BundleQueryHelper<CustomEvent.CustomEventQuery> bundleQueryHelper =
+ BundleQueryHelper<Queryable> bundleQueryHelper =
new BundleQueryHelper<>(mQuery);
bundleQueryHelper.key(KEY).doesNotExist();
@@ -71,7 +70,7 @@
public void matches_restrictionOnMultipleKeys_oneRestrictionIsNotMet_returnsFalse() {
mBundle.putString(KEY, STRING_VALUE);
mBundle.remove(KEY2);
- BundleQueryHelper<CustomEvent.CustomEventQuery> bundleQueryHelper =
+ BundleQueryHelper<Queryable> bundleQueryHelper =
new BundleQueryHelper<>(mQuery);
bundleQueryHelper.key(KEY).exists();
@@ -83,7 +82,7 @@
@Test
public void matches_restrictionOnNonExistingKey_returnsFalse() {
mBundle.remove(KEY);
- BundleQueryHelper<CustomEvent.CustomEventQuery> bundleQueryHelper =
+ BundleQueryHelper<Queryable> bundleQueryHelper =
new BundleQueryHelper<>(mQuery);
bundleQueryHelper.key(KEY).stringValue().isEqualTo(STRING_VALUE);
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/ClassQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/ClassQueryHelperTest.java
similarity index 80%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/ClassQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/ClassQueryHelperTest.java
index 175204e..21bc096 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/ClassQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/ClassQueryHelperTest.java
@@ -14,14 +14,16 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
import android.app.Activity;
import com.android.eventlib.events.CustomEvent;
-import com.android.eventlib.info.ClassInfo;
+import com.android.queryable.Queryable;
+import com.android.queryable.info.ClassInfo;
+import com.android.queryable.queries.ClassQueryHelper;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,8 +31,7 @@
@RunWith(JUnit4.class)
public class ClassQueryHelperTest {
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private static final Class<?> CLASS_1 = Activity.class;
private static final ClassInfo CLASS_1_CLASS_INFO = new ClassInfo(CLASS_1);
@@ -40,7 +41,7 @@
@Test
public void matches_noRestrictions_returnsTrue() {
- ClassQueryHelper<CustomEvent.CustomEventQuery> classQueryHelper =
+ ClassQueryHelper<Queryable> classQueryHelper =
new ClassQueryHelper<>(mQuery);
assertThat(classQueryHelper.matches(CLASS_1_CLASS_INFO)).isTrue();
@@ -48,7 +49,7 @@
@Test
public void matches_isSameClassAs_doesMatch_returnsTrue() {
- ClassQueryHelper<CustomEvent.CustomEventQuery> classQueryHelper =
+ ClassQueryHelper<Queryable> classQueryHelper =
new ClassQueryHelper<>(mQuery);
classQueryHelper.isSameClassAs(CLASS_1);
@@ -58,7 +59,7 @@
@Test
public void matches_isSameClassAs_doesNotMatch_returnsFalse() {
- ClassQueryHelper<CustomEvent.CustomEventQuery> classQueryHelper =
+ ClassQueryHelper<Queryable> classQueryHelper =
new ClassQueryHelper<>(mQuery);
classQueryHelper.isSameClassAs(CLASS_1);
@@ -68,7 +69,7 @@
@Test
public void matches_className_doesMatch_returnsTrue() {
- ClassQueryHelper<CustomEvent.CustomEventQuery> classQueryHelper =
+ ClassQueryHelper<Queryable> classQueryHelper =
new ClassQueryHelper<>(mQuery);
classQueryHelper.className().isEqualTo(CLASS_1_CLASS_NAME);
@@ -78,7 +79,7 @@
@Test
public void matches_className_doesNotMatch_returnsFalse() {
- ClassQueryHelper<CustomEvent.CustomEventQuery> classQueryHelper =
+ ClassQueryHelper<Queryable> classQueryHelper =
new ClassQueryHelper<>(mQuery);
classQueryHelper.className().isEqualTo(CLASS_1_CLASS_NAME);
@@ -88,7 +89,7 @@
@Test
public void matches_simpleName_doesMatch_returnsTrue() {
- ClassQueryHelper<CustomEvent.CustomEventQuery> classQueryHelper =
+ ClassQueryHelper<Queryable> classQueryHelper =
new ClassQueryHelper<>(mQuery);
classQueryHelper.simpleName().isEqualTo(CLASS_1_SIMPLE_NAME);
@@ -98,7 +99,7 @@
@Test
public void matches_simpleName_doesNotMatch_returnsFalse() {
- ClassQueryHelper<CustomEvent.CustomEventQuery> classQueryHelper =
+ ClassQueryHelper<Queryable> classQueryHelper =
new ClassQueryHelper<>(mQuery);
classQueryHelper.simpleName().isEqualTo(CLASS_1_SIMPLE_NAME);
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/IntegerQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/IntegerQueryHelperTest.java
similarity index 78%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/IntegerQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/IntegerQueryHelperTest.java
index 528e9a5..f2b7e3d 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/IntegerQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/IntegerQueryHelperTest.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,15 +27,14 @@
@RunWith(JUnit4.class)
public class IntegerQueryHelperTest {
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private static final int INTEGER_VALUE = 100;
private static final int GREATER_VALUE = 200;
private static final int LESS_VALUE = 50;
@Test
public void matches_noRestrictions_returnsTrue() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
assertThat(integerQueryHelper.matches(INTEGER_VALUE)).isTrue();
@@ -43,7 +42,7 @@
@Test
public void matches_isEqualTo_meetsRestriction_returnsTrue() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isEqualTo(INTEGER_VALUE);
@@ -53,7 +52,7 @@
@Test
public void matches_isEqualTo_doesNotMeetRestriction_returnsFalse() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isEqualTo(INTEGER_VALUE);
@@ -63,7 +62,7 @@
@Test
public void matches_isGreaterThan_meetsRestriction_returnsTrue() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isGreaterThan(INTEGER_VALUE);
@@ -73,7 +72,7 @@
@Test
public void matches_isGreaterThan_doesNotMeetRestriction_returnsFalse() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isGreaterThan(INTEGER_VALUE);
@@ -83,7 +82,7 @@
@Test
public void matches_isGreaterThanOrEqualTo_greaterThan_returnsTrue() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isGreaterThanOrEqualTo(INTEGER_VALUE);
@@ -93,7 +92,7 @@
@Test
public void matches_isGreaterThanOrEqualTo_equalTo_returnsTrue() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isGreaterThanOrEqualTo(INTEGER_VALUE);
@@ -103,7 +102,7 @@
@Test
public void matches_isGreaterThanOrEqualTo_doesNotMeetRestriction_returnsFalse() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isGreaterThanOrEqualTo(INTEGER_VALUE);
@@ -113,7 +112,7 @@
@Test
public void matches_isLessThan_meetsRestriction_returnsTrue() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isLessThan(INTEGER_VALUE);
@@ -123,7 +122,7 @@
@Test
public void matches_isLessThan_doesNotMeetRestriction_returnsFalse() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isLessThan(INTEGER_VALUE);
@@ -133,7 +132,7 @@
@Test
public void matches_isLessThanOrEqualTo_lessThan_returnsTrue() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isLessThanOrEqualTo(INTEGER_VALUE);
@@ -143,7 +142,7 @@
@Test
public void matches_isLessThanOrEqualTo_equalTo_returnsTrue() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isLessThanOrEqualTo(INTEGER_VALUE);
@@ -153,7 +152,7 @@
@Test
public void matches_isLessThanOrEqualTo_doesNotMeetRestriction_returnsFalse() {
- IntegerQueryHelper<CustomEvent.CustomEventQuery> integerQueryHelper =
+ IntegerQueryHelper<Queryable> integerQueryHelper =
new IntegerQueryHelper<>(mQuery);
integerQueryHelper.isLessThanOrEqualTo(INTEGER_VALUE);
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/IntentQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/IntentQueryHelperTest.java
similarity index 81%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/IntentQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/IntentQueryHelperTest.java
index e815479..45da9f4 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/IntentQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/IntentQueryHelperTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
import android.content.Intent;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,15 +29,14 @@
@RunWith(JUnit4.class)
public class IntentQueryHelperTest {
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private static final String STRING_VALUE = "String";
private static final String DIFFERENT_STRING_VALUE = "String2";
@Test
public void matches_noRestrictions_returnsTrue() {
Intent intent = new Intent();
- IntentQueryHelper<CustomEvent.CustomEventQuery> intentQueryHelper =
+ IntentQueryHelper<Queryable> intentQueryHelper =
new IntentQueryHelper<>(mQuery);
assertThat(intentQueryHelper.matches(intent)).isTrue();
@@ -47,7 +46,7 @@
public void matches_action_meetsRestriction_returnsTrue() {
Intent intent = new Intent();
intent.setAction(STRING_VALUE);
- IntentQueryHelper<CustomEvent.CustomEventQuery> intentQueryHelper =
+ IntentQueryHelper<Queryable> intentQueryHelper =
new IntentQueryHelper<>(mQuery);
intentQueryHelper.action().isEqualTo(STRING_VALUE);
@@ -59,7 +58,7 @@
public void matches_action_doesNotMeetRestriction_returnsFalse() {
Intent intent = new Intent();
intent.setAction(STRING_VALUE);
- IntentQueryHelper<CustomEvent.CustomEventQuery> intentQueryHelper =
+ IntentQueryHelper<Queryable> intentQueryHelper =
new IntentQueryHelper<>(mQuery);
intentQueryHelper.action().isEqualTo(DIFFERENT_STRING_VALUE);
@@ -71,7 +70,7 @@
public void matches_extras_meetsRestriction_returnsTrue() {
Intent intent = new Intent();
intent.putExtra(/* key= */ STRING_VALUE, /* value= */ STRING_VALUE);
- IntentQueryHelper<CustomEvent.CustomEventQuery> intentQueryHelper =
+ IntentQueryHelper<Queryable> intentQueryHelper =
new IntentQueryHelper<>(mQuery);
intentQueryHelper.extras().key(STRING_VALUE).stringValue().isEqualTo(STRING_VALUE);
@@ -83,7 +82,7 @@
public void matches_extras_doesNotMeetRestriction_returnsFalse() {
Intent intent = new Intent();
intent.putExtra(/* key= */ STRING_VALUE, /* value= */ STRING_VALUE);
- IntentQueryHelper<CustomEvent.CustomEventQuery> intentQueryHelper =
+ IntentQueryHelper<Queryable> intentQueryHelper =
new IntentQueryHelper<>(mQuery);
intentQueryHelper.extras().key(STRING_VALUE).stringValue()
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/PersistableBundleKeyQueryHelperTest.java
similarity index 84%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/PersistableBundleKeyQueryHelperTest.java
index a587512..e461700 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/PersistableBundleKeyQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/PersistableBundleKeyQueryHelperTest.java
@@ -14,21 +14,18 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
-import android.os.Bundle;
import android.os.PersistableBundle;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import java.io.Serializable;
-
@RunWith(JUnit4.class)
public class PersistableBundleKeyQueryHelperTest {
@@ -37,14 +34,13 @@
private static final String STRING_VALUE = "String";
private static final String DIFFERENT_STRING_VALUE = "String2";
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private final PersistableBundle mPersistableBundle = new PersistableBundle();
private final PersistableBundle mPersistableBundle2 = new PersistableBundle();
@Test
public void matches_noRestrictions_returnsTrue() {
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
assertThat(persistableBundleKeyQueryHelper.matches(mPersistableBundle, KEY)).isTrue();
@@ -53,7 +49,7 @@
@Test
public void matches_stringValueRestriction_meetsRestriction_returnsTrue() {
mPersistableBundle.putString(KEY, STRING_VALUE);
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
persistableBundleKeyQueryHelper.stringValue().isEqualTo(STRING_VALUE);
@@ -64,7 +60,7 @@
@Test
public void matches_stringValueRestriction_doesNotMeetRestriction_returnsFalse() {
mPersistableBundle.putString(KEY, STRING_VALUE);
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
persistableBundleKeyQueryHelper.stringValue().isEqualTo(DIFFERENT_STRING_VALUE);
@@ -76,7 +72,7 @@
public void matches_persistableBundleValueRestriction_meetsRestriction_returnsTrue() {
mPersistableBundle.putPersistableBundle(KEY, mPersistableBundle2);
mPersistableBundle2.putString(KEY2, STRING_VALUE);
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
persistableBundleKeyQueryHelper.persistableBundleValue().key(KEY2).exists();
@@ -88,7 +84,7 @@
public void matches_persistableBundleValueRestriction_doesNotMeetRestriction_returnsFalse() {
mPersistableBundle.putPersistableBundle(KEY, mPersistableBundle2);
mPersistableBundle2.remove(KEY2);
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
persistableBundleKeyQueryHelper.persistableBundleValue().key(KEY2).exists();
@@ -99,7 +95,7 @@
@Test
public void matches_existsRestriction_meetsRestriction_returnsTrue() {
mPersistableBundle.putString(KEY, STRING_VALUE);
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
persistableBundleKeyQueryHelper.exists();
@@ -110,7 +106,7 @@
@Test
public void matches_existsRestriction_doesNotMeetRestriction_returnsFalse() {
mPersistableBundle.remove(KEY);
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
persistableBundleKeyQueryHelper.exists();
@@ -121,7 +117,7 @@
@Test
public void matches_doesNotExistRestriction_meetsRestriction_returnsTrue() {
mPersistableBundle.remove(KEY);
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
persistableBundleKeyQueryHelper.doesNotExist();
@@ -132,7 +128,7 @@
@Test
public void matches_doesNotExistRestriction_doesNotMeetRestriction_returnsFalse() {
mPersistableBundle.putString(KEY, STRING_VALUE);
- PersistableBundleKeyQueryHelper<CustomEvent.CustomEventQuery>
+ PersistableBundleKeyQueryHelper<Queryable>
persistableBundleKeyQueryHelper = new PersistableBundleKeyQueryHelper<>(mQuery);
persistableBundleKeyQueryHelper.doesNotExist();
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/PersistableBundleQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/PersistableBundleQueryHelperTest.java
similarity index 79%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/PersistableBundleQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/PersistableBundleQueryHelperTest.java
index 39f11ec..6379bee 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/PersistableBundleQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/PersistableBundleQueryHelperTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
import android.os.PersistableBundle;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,13 +32,12 @@
private static final String KEY2 = "Key2";
private static final String STRING_VALUE = "value";
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private final PersistableBundle mPersistableBundle = new PersistableBundle();
@Test
public void matches_noRestrictions_returnsTrue() {
- PersistableBundleQueryHelper<CustomEvent.CustomEventQuery> persistableBundleQueryHelper =
+ PersistableBundleQueryHelper<Queryable> persistableBundleQueryHelper =
new PersistableBundleQueryHelper<>(mQuery);
assertThat(persistableBundleQueryHelper.matches(mPersistableBundle)).isTrue();
@@ -47,7 +46,7 @@
@Test
public void matches_restrictionOnOneKey_restrictionIsMet_returnsTrue() {
mPersistableBundle.putString(KEY, STRING_VALUE);
- PersistableBundleQueryHelper<CustomEvent.CustomEventQuery> persistableBundleQueryHelper =
+ PersistableBundleQueryHelper<Queryable> persistableBundleQueryHelper =
new PersistableBundleQueryHelper<>(mQuery);
persistableBundleQueryHelper.key(KEY).exists();
@@ -58,7 +57,7 @@
@Test
public void matches_restrictionOnOneKey_restrictionIsNotMet_returnsFalse() {
mPersistableBundle.putString(KEY, STRING_VALUE);
- PersistableBundleQueryHelper<CustomEvent.CustomEventQuery> persistableBundleQueryHelper =
+ PersistableBundleQueryHelper<Queryable> persistableBundleQueryHelper =
new PersistableBundleQueryHelper<>(mQuery);
persistableBundleQueryHelper.key(KEY).doesNotExist();
@@ -70,7 +69,7 @@
public void matches_restrictionOnMultipleKeys_oneRestrictionIsNotMet_returnsFalse() {
mPersistableBundle.putString(KEY, STRING_VALUE);
mPersistableBundle.remove(KEY2);
- PersistableBundleQueryHelper<CustomEvent.CustomEventQuery> persistableBundleQueryHelper =
+ PersistableBundleQueryHelper<Queryable> persistableBundleQueryHelper =
new PersistableBundleQueryHelper<>(mQuery);
persistableBundleQueryHelper.key(KEY).exists();
@@ -82,7 +81,7 @@
@Test
public void matches_restrictionOnNonExistingKey_returnsFalse() {
mPersistableBundle.remove(KEY);
- PersistableBundleQueryHelper<CustomEvent.CustomEventQuery> persistableBundleQueryHelper =
+ PersistableBundleQueryHelper<Queryable> persistableBundleQueryHelper =
new PersistableBundleQueryHelper<>(mQuery);
persistableBundleQueryHelper.key(KEY).stringValue().isEqualTo(STRING_VALUE);
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/SerializableQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/SerializableQueryHelperTest.java
similarity index 78%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/SerializableQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/SerializableQueryHelperTest.java
index a1f23b1..2ddc136 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/SerializableQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/SerializableQueryHelperTest.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,14 +29,13 @@
@RunWith(JUnit4.class)
public class SerializableQueryHelperTest {
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private final Serializable mSerializable = "SerializableString";
private final Serializable mDifferentSerializable = "SerializableString2";
@Test
public void matches_noRestrictions_returnsTrue() {
- SerializableQueryHelper<CustomEvent.CustomEventQuery> serializableQueryHelper =
+ SerializableQueryHelper<Queryable> serializableQueryHelper =
new SerializableQueryHelper<>(mQuery);
assertThat(serializableQueryHelper.matches(mSerializable)).isTrue();
@@ -44,7 +43,7 @@
@Test
public void matches_isEqualTo_meetsRestriction_returnsTrue() {
- SerializableQueryHelper<CustomEvent.CustomEventQuery> serializableQueryHelper =
+ SerializableQueryHelper<Queryable> serializableQueryHelper =
new SerializableQueryHelper<>(mQuery);
serializableQueryHelper.isEqualTo(mSerializable);
@@ -54,7 +53,7 @@
@Test
public void matches_isEqualTo_doesNotMeetRestriction_returnsFalse() {
- SerializableQueryHelper<CustomEvent.CustomEventQuery> serializableQueryHelper =
+ SerializableQueryHelper<Queryable> serializableQueryHelper =
new SerializableQueryHelper<>(mQuery);
serializableQueryHelper.isEqualTo(mDifferentSerializable);
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/StringQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/StringQueryHelperTest.java
similarity index 78%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/StringQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/StringQueryHelperTest.java
index 2cb6b16..9797b8c 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/StringQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/StringQueryHelperTest.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,14 +27,13 @@
@RunWith(JUnit4.class)
public class StringQueryHelperTest {
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private static final String STRING_VALUE = "String";
private static final String DIFFERENT_STRING_VALUE = "String2";
@Test
public void matches_noRestrictions_returnsTrue() {
- StringQueryHelper<CustomEvent.CustomEventQuery> stringQueryHelper =
+ StringQueryHelper<Queryable> stringQueryHelper =
new StringQueryHelper<>(mQuery);
assertThat(stringQueryHelper.matches(STRING_VALUE)).isTrue();
@@ -42,7 +41,7 @@
@Test
public void matches_isEqualTo_meetsRestriction_returnsTrue() {
- StringQueryHelper<CustomEvent.CustomEventQuery> stringQueryHelper =
+ StringQueryHelper<Queryable> stringQueryHelper =
new StringQueryHelper<>(mQuery);
stringQueryHelper.isEqualTo(STRING_VALUE);
@@ -52,7 +51,7 @@
@Test
public void matches_isEqualTo_doesNotMeetRestriction_returnsFalse() {
- StringQueryHelper<CustomEvent.CustomEventQuery> stringQueryHelper =
+ StringQueryHelper<Queryable> stringQueryHelper =
new StringQueryHelper<>(mQuery);
stringQueryHelper.isEqualTo(DIFFERENT_STRING_VALUE);
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/UserHandleQueryHelperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/UserHandleQueryHelperTest.java
similarity index 78%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/UserHandleQueryHelperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/UserHandleQueryHelperTest.java
index 9b12586..941e5fa 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/queryhelpers/UserHandleQueryHelperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/queries/UserHandleQueryHelperTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.eventlib.queryhelpers;
+package com.android.queryable.queries;
import static com.google.common.truth.Truth.assertThat;
import android.os.UserHandle;
-import com.android.eventlib.events.CustomEvent;
+import com.android.queryable.Queryable;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,15 +29,14 @@
@RunWith(JUnit4.class)
public class UserHandleQueryHelperTest {
- private final CustomEvent.CustomEventQuery mQuery =
- CustomEvent.queryPackage("testPackage"); // package is not used
+ private final Queryable mQuery = null;
private static final int USER_HANDLE_ID = 1;
private static final UserHandle USER_HANDLE = UserHandle.of(USER_HANDLE_ID);
private static final UserHandle DIFFERENT_USER_HANDLE = UserHandle.of(2);
@Test
public void matches_noRestrictions_returnsTrue() {
- UserHandleQueryHelper<CustomEvent.CustomEventQuery> userHandleQueryHelper =
+ UserHandleQueryHelper<Queryable> userHandleQueryHelper =
new UserHandleQueryHelper<>(mQuery);
assertThat(userHandleQueryHelper.matches(USER_HANDLE)).isTrue();
@@ -45,7 +44,7 @@
@Test
public void matches_isEqualTo_meetsRestriction_returnsTrue() {
- UserHandleQueryHelper<CustomEvent.CustomEventQuery> userHandleQueryHelper =
+ UserHandleQueryHelper<Queryable> userHandleQueryHelper =
new UserHandleQueryHelper<>(mQuery);
userHandleQueryHelper.isEqualTo(USER_HANDLE);
@@ -55,7 +54,7 @@
@Test
public void matches_isEqualTo_doesNotMeetRestriction_returnsFalse() {
- UserHandleQueryHelper<CustomEvent.CustomEventQuery> userHandleQueryHelper =
+ UserHandleQueryHelper<Queryable> userHandleQueryHelper =
new UserHandleQueryHelper<>(mQuery);
userHandleQueryHelper.isEqualTo(USER_HANDLE);
@@ -65,7 +64,7 @@
@Test
public void matches_id_meetsRestriction_returnsTrue() {
- UserHandleQueryHelper<CustomEvent.CustomEventQuery> userHandleQueryHelper =
+ UserHandleQueryHelper<Queryable> userHandleQueryHelper =
new UserHandleQueryHelper<>(mQuery);
userHandleQueryHelper.id().isEqualTo(USER_HANDLE_ID);
@@ -75,7 +74,7 @@
@Test
public void matches_id_doesNotMeetRestriction_returnsFalse() {
- UserHandleQueryHelper<CustomEvent.CustomEventQuery> userHandleQueryHelper =
+ UserHandleQueryHelper<Queryable> userHandleQueryHelper =
new UserHandleQueryHelper<>(mQuery);
userHandleQueryHelper.id().isEqualTo(USER_HANDLE_ID);
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/util/SerializableParcelWrapperTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/util/SerializableParcelWrapperTest.java
similarity index 97%
rename from common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/util/SerializableParcelWrapperTest.java
rename to common/device-side/bedstead/queryable/src/test/java/com/android/queryable/util/SerializableParcelWrapperTest.java
index fa73206..8ee103f 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/util/SerializableParcelWrapperTest.java
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/util/SerializableParcelWrapperTest.java
@@ -14,13 +14,15 @@
* limitations under the License.
*/
-package com.android.eventlib.util;
+package com.android.queryable.util;
import static com.google.common.truth.Truth.assertThat;
import android.os.Bundle;
import android.os.Parcelable;
+import com.android.queryable.util.SerializableParcelWrapper;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
