Merge "Remove CompatUIShellTestCase" into main (2951492e) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import androidx.test.filters.SmallTest;

		import com.android.window.flags.Flags;
		import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.ShellTestCase;
		import com.android.wm.shell.common.DisplayController;
		import com.android.wm.shell.common.DisplayImeController;
		import com.android.wm.shell.common.DisplayInsetsController;
		@@ -85,7 +86,7 @@ import org.mockito.MockitoAnnotations;
		*/
		@RunWith(AndroidTestingRunner.class)
		@SmallTest
		public class CompatUIControllerTest extends CompatUIShellTestCase {
		public class CompatUIControllerTest extends ShellTestCase {
		private static final int DISPLAY_ID = 0;
		private static final int TASK_ID = 12;

+2 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import androidx.test.filters.SmallTest;
		import com.android.window.flags.Flags;
		import com.android.wm.shell.R;
		import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.ShellTestCase;
		import com.android.wm.shell.common.DisplayLayout;
		import com.android.wm.shell.common.SyncTransactionQueue;
		import com.android.wm.shell.compatui.CompatUIController.CompatUIHintsState;
		@@ -62,7 +63,7 @@ import java.util.function.Consumer;
		*/
		@RunWith(AndroidTestingRunner.class)
		@SmallTest
		public class CompatUILayoutTest extends CompatUIShellTestCase {
		public class CompatUILayoutTest extends ShellTestCase {

		private static final int TASK_ID = 1;

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 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.wm.shell.compatui;

		import com.android.wm.shell.ShellTestCase;

		/**
		* Base class for CompatUI tests.
		*/
		public class CompatUIShellTestCase extends ShellTestCase {
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import android.testing.AndroidTestingRunner;

		import androidx.test.filters.SmallTest;

		import com.android.wm.shell.ShellTestCase;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -42,7 +44,7 @@ import java.util.function.IntSupplier;
		*/
		@RunWith(AndroidTestingRunner.class)
		@SmallTest
		public class CompatUIStatusManagerTest extends CompatUIShellTestCase {
		public class CompatUIStatusManagerTest extends ShellTestCase {

		private FakeCompatUIStatusManagerTest mTestState;
		private CompatUIStatusManager mStatusManager;

+2 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import androidx.test.filters.SmallTest;

		import com.android.window.flags.Flags;
		import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.ShellTestCase;
		import com.android.wm.shell.common.DisplayLayout;
		import com.android.wm.shell.common.SyncTransactionQueue;
		import com.android.wm.shell.compatui.CompatUIController.CompatUIHintsState;
		@@ -77,7 +78,7 @@ import java.util.function.Consumer;
		*/
		@RunWith(AndroidTestingRunner.class)
		@SmallTest
		public class CompatUIWindowManagerTest extends CompatUIShellTestCase {
		public class CompatUIWindowManagerTest extends ShellTestCase {

		private static final int TASK_ID = 1;
		private static final int TASK_WIDTH = 2000;