Merge "Experimenting with detecting whether a test runs in presubmit" into ub-launcher3-qt-qpr1-dev
am: 37cc797fd0
Change-Id: I0ab81659ea9aaf6b75cd1106bbbaf9c75c679a41
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 86635ed..17a5f50 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -61,6 +61,7 @@
import com.android.launcher3.util.rule.FailureWatcher;
import com.android.launcher3.util.rule.LauncherActivityRule;
import com.android.launcher3.util.rule.ShellCommandRule;
+import com.android.launcher3.util.rule.TestStabilityRule;
import org.junit.After;
import org.junit.Before;
@@ -156,7 +157,8 @@
@Rule
public TestRule mOrderSensitiveRules = RuleChain.
- outerRule(mActivityMonitor).
+ outerRule(new TestStabilityRule()).
+ around(mActivityMonitor).
around(getRulesInsideActivityMonitor());
public UiDevice getDevice() {
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index c2a3c1c..2cf6c2b 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -24,6 +24,8 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import android.util.Log;
+
import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
@@ -34,9 +36,9 @@
import com.android.launcher3.tapl.AppIcon;
import com.android.launcher3.tapl.AppIconMenu;
import com.android.launcher3.tapl.AppIconMenuItem;
-import com.android.launcher3.tapl.TestHelpers;
import com.android.launcher3.tapl.Widgets;
import com.android.launcher3.tapl.Workspace;
+import com.android.launcher3.util.rule.TestStabilityRule.Stability;
import com.android.launcher3.views.OptionsPopupView;
import com.android.launcher3.widget.WidgetsFullSheet;
import com.android.launcher3.widget.WidgetsRecyclerView;
@@ -343,4 +345,10 @@
public static String getAppPackageName() {
return getInstrumentation().getContext().getPackageName();
}
+
+ @Test
+ @Stability
+ public void testTestStabilityAttribute() {
+ Log.d("TestStabilityRule", "Hello world!");
+ }
}
diff --git a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
new file mode 100644
index 0000000..8391ae7
--- /dev/null
+++ b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+package com.android.launcher3.util.rule;
+
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+
+import android.os.Build;
+import android.util.Log;
+
+import androidx.test.uiautomator.UiDevice;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class TestStabilityRule implements TestRule {
+ private static final String TAG = "TestStabilityRule";
+ private static final Pattern LAUNCHER_BUILD =
+ Pattern.compile("^("
+ + "(?<androidStudio>BuildFromAndroidStudio)|"
+ + "(?<commandLine>[0-9]+-eng\\.[a-z]+\\.[0-9]+\\.[0-9]+)|"
+ + "(?<presubmit>[0-9]+-P[0-9]+)|"
+ + "(?<postsubmit>[0-9]+-[0-9]+|"
+ + "(?<platform>[0-9]+))"
+ + ")$");
+ private static final Pattern PLATFORM_BUILD =
+ Pattern.compile("^("
+ + "(?<commandLine>eng\\.[a-z]+\\.[0-9]+\\.[0-9]+)|"
+ + "(?<presubmit>P[0-9]+)|"
+ + "(?<postsubmit>[0-9]+)"
+ + ")$");
+
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target(ElementType.METHOD)
+ public @interface Stability {
+ }
+
+ @Override
+ public Statement apply(Statement base, Description description) {
+ if (description.getAnnotation(Stability.class) != null) {
+ return new Statement() {
+ @Override
+ public void evaluate() throws Throwable {
+ final String launcherVersion =
+ getInstrumentation().
+ getContext().
+ getPackageManager().
+ getPackageInfo(
+ UiDevice.getInstance(getInstrumentation()).
+ getLauncherPackageName(),
+ 0).
+ versionName;
+
+ final Matcher launcherBuildMatcher = LAUNCHER_BUILD.matcher(launcherVersion);
+
+ boolean launcherLocalBuild = false;
+ boolean launcherUnbundledPresubmit = false;
+ boolean launcherUnbundledPostsubmit = false;
+ boolean launcherPlatform = false;
+
+ if (!launcherBuildMatcher.find()) {
+ Log.e(TAG, "Match not found");
+ } else if (launcherBuildMatcher.group("androidStudio") != null
+ || launcherBuildMatcher.group("commandLine") != null) {
+ launcherLocalBuild = true;
+ } else if (launcherBuildMatcher.group("presubmit") != null) {
+ launcherUnbundledPresubmit = true;
+ } else if (launcherBuildMatcher.group("postsubmit") != null) {
+ launcherUnbundledPostsubmit = true;
+ } else if (launcherBuildMatcher.group("platform") != null) {
+ launcherPlatform = true;
+ } else {
+ Log.e(TAG, "ERROR1");
+ }
+
+ boolean platformLocalBuild = false;
+ boolean platformPresubmit = false;
+ boolean platformPostsubmit = false;
+
+ final String platformVersion = Build.VERSION.INCREMENTAL;
+ final Matcher platformBuildMatcher = PLATFORM_BUILD.matcher(platformVersion);
+ if (!platformBuildMatcher.find()) {
+ Log.e(TAG, "Match not found");
+ } else if (platformBuildMatcher.group("commandLine") != null) {
+ platformLocalBuild = true;
+ } else if (platformBuildMatcher.group("presubmit") != null) {
+ platformPresubmit = true;
+ } else if (platformBuildMatcher.group("postsubmit") != null) {
+ platformPostsubmit = true;
+ } else {
+ Log.e(TAG, "ERROR2");
+ }
+
+ Log.d(TAG, "Launcher: " + launcherVersion + ", platform: " + platformVersion);
+
+ if (launcherLocalBuild && (platformLocalBuild || platformPostsubmit)) {
+ Log.d(TAG, "LOCAL RUN");
+ } else if (launcherUnbundledPresubmit && platformPostsubmit) {
+ Log.d(TAG, "UNBUNDLED PRESUBMIT");
+ } else if (launcherUnbundledPostsubmit && platformPostsubmit) {
+ Log.d(TAG, "UNBUNDLED POSTSUBMIT");
+ } else if (launcherPlatform && platformPresubmit) {
+ Log.d(TAG, "PLATFORM PRESUBMIT");
+ } else if (launcherPlatform && platformPostsubmit) {
+ Log.d(TAG, "PLATFORM POSTSUBMIT");
+ } else {
+ Log.e(TAG, "ERROR3");
+ }
+
+ base.evaluate();
+ }
+ };
+ } else {
+ return base;
+ }
+ }
+}