Merge "Refactor ScreenDecorWindowTests" (8d177985) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/wm/ScreenDecorWindowTests.java

+17 −9

Original line number	Diff line number	Diff line
		@@ -255,16 +255,32 @@ public class ScreenDecorWindowTests {
		* Asserts the top inset of {@param activity} is equal to {@param expected} waiting as needed.
		*/
		private void assertTopInsetEquals(Activity activity, int expected) throws Exception {
		waitFor(() -> getInsets(activity).getSystemWindowInsetTop() == expected);
		waitForTopInsetEqual(activity, expected);
		assertEquals(expected, getInsets(activity).getSystemWindowInsetTop());
		}

		private void waitForTopInsetEqual(Activity activity, int expected) {
		waitFor(() -> getInsets(activity).getSystemWindowInsetTop() == expected);
		}

		/**
		* Asserts the inset at {@param side} of {@param activity} is equal to {@param expected}
		* waiting as needed.
		*/
		private void assertInsetGreaterOrEqual(Activity activity, int side, int expected)
		throws Exception {
		waitForInsetGreaterOrEqual(activity, side, expected);

		final WindowInsets insets = getInsets(activity);
		switch (side) {
		case TOP: assertGreaterOrEqual(insets.getSystemWindowInsetTop(), expected); break;
		case BOTTOM: assertGreaterOrEqual(insets.getSystemWindowInsetBottom(), expected); break;
		case LEFT: assertGreaterOrEqual(insets.getSystemWindowInsetLeft(), expected); break;
		case RIGHT: assertGreaterOrEqual(insets.getSystemWindowInsetRight(), expected); break;
		}
		}

		private void waitForInsetGreaterOrEqual(Activity activity, int side, int expected) {
		waitFor(() -> {
		final WindowInsets insets = getInsets(activity);
		switch (side) {
		@@ -275,14 +291,6 @@ public class ScreenDecorWindowTests {
		default: return true;
		}
		});

		final WindowInsets insets = getInsets(activity);
		switch (side) {
		case TOP: assertGreaterOrEqual(insets.getSystemWindowInsetTop(), expected); break;
		case BOTTOM: assertGreaterOrEqual(insets.getSystemWindowInsetBottom(), expected); break;
		case LEFT: assertGreaterOrEqual(insets.getSystemWindowInsetLeft(), expected); break;
		case RIGHT: assertGreaterOrEqual(insets.getSystemWindowInsetRight(), expected); break;
		}
		}

		/** Asserts that the first entry is greater than or equal to the second entry. */