Merge "Making test run flavor available to tests." into ub-launcher3-master (a0912d50) · Commits · e / os / android_packages_apps_Trebuchet

tests/src/com/android/launcher3/util/rule/TestStabilityRule.java

+10 −11

Original line number	Diff line number	Diff line
		@@ -73,8 +73,7 @@ public class TestStabilityRule implements TestRule {
		return new Statement() {
		@Override
		public void evaluate() throws Throwable {
		if (sRunFlavor == 0) sRunFlavor = getRunFlavor();
		if ((stability.flavors() & sRunFlavor) != 0) {
		if ((stability.flavors() & getRunFlavor()) != 0) {
		Log.d(TAG, "Running " + description.getDisplayName());
		base.evaluate();
		} else {
		@@ -87,7 +86,9 @@ public class TestStabilityRule implements TestRule {
		}
		}

		private static int getRunFlavor() {
		public static int getRunFlavor() {
		if (sRunFlavor != 0) return sRunFlavor;

		final String flavorOverride = InstrumentationRegistry.getArguments().getString("flavor");

		if (flavorOverride != null) {
		@@ -130,34 +131,32 @@ public class TestStabilityRule implements TestRule {
		throw new AssertionError("Platform build match not found");
		}

		final int runFlavor;

		if (launcherBuildMatcher.group("local") != null && (
		platformBuildMatcher.group("commandLine") != null \|\|
		platformBuildMatcher.group("postsubmit") != null)) {
		Log.d(TAG, "LOCAL RUN");
		runFlavor = LOCAL;
		sRunFlavor = LOCAL;
		} else if (launcherBuildMatcher.group("presubmit") != null
		&& platformBuildMatcher.group("postsubmit") != null) {
		Log.d(TAG, "UNBUNDLED PRESUBMIT");
		runFlavor = UNBUNDLED_PRESUBMIT;
		sRunFlavor = UNBUNDLED_PRESUBMIT;
		} else if (launcherBuildMatcher.group("postsubmit") != null
		&& platformBuildMatcher.group("postsubmit") != null) {
		Log.d(TAG, "UNBUNDLED POSTSUBMIT");
		runFlavor = UNBUNDLED_POSTSUBMIT;
		sRunFlavor = UNBUNDLED_POSTSUBMIT;
		} else if (launcherBuildMatcher.group("platform") != null
		&& platformBuildMatcher.group("presubmit") != null) {
		Log.d(TAG, "PLATFORM PRESUBMIT");
		runFlavor = PLATFORM_PRESUBMIT;
		sRunFlavor = PLATFORM_PRESUBMIT;
		} else if (launcherBuildMatcher.group("platform") != null
		&& (platformBuildMatcher.group("postsubmit") != null
		\|\| platformBuildMatcher.group("commandLine") != null)) {
		Log.d(TAG, "PLATFORM POSTSUBMIT");
		runFlavor = PLATFORM_POSTSUBMIT;
		sRunFlavor = PLATFORM_POSTSUBMIT;
		} else {
		throw new AssertionError("Unrecognized run flavor");
		}

		return runFlavor;
		return sRunFlavor;
		}
		}