Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75af55c4 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Move the unit test classes for PiP 

For classes we moved from PiP1 package to common.pip, the unit test
classes were not moved together.

What's next

There are certain class we copied from pip1 to pip2 without copying also
the unit tests, including

- PipController
- PipResizeGestureHandler
- PipTouchHandler
- PipTouchState

Would do a follow up CL on that

Flag: com.android.wm.shell.enable_pip2
Bug: 376133026
Test: atest WMShellUnitTests
Change-Id: Ifa6d5cadf5dab2524141f9e418c1d62eb0ea473f
parent 131c2c8f

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PhonePipKeepClearAlgorithmTest.java→libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PhonePipKeepClearAlgorithmTest.java

+2 −5
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * Copyright (C) 2025 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.pip.phone;

package com.android.wm.shell.common.pip;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;
@@ -29,9 +29,6 @@ import android.testing.TestableLooper; 
import androidx.test.filters.SmallTest;



import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.common.pip.PhonePipKeepClearAlgorithm;

import com.android.wm.shell.common.pip.PipBoundsAlgorithm;

import com.android.wm.shell.common.pip.PipBoundsState;



import org.junit.Before;

import org.junit.Test;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PhoneSizeSpecSourceTest.java→libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PhoneSizeSpecSourceTest.java

+2 −5
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 * Copyright (C) 2025 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.pip.phone;

package com.android.wm.shell.common.pip;



import static org.mockito.Mockito.when;
@@ -27,9 +27,6 @@ import android.view.DisplayInfo; 
import com.android.wm.shell.R;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.pip.PhoneSizeSpecSource;

import com.android.wm.shell.common.pip.PipDisplayLayoutState;

import com.android.wm.shell.common.pip.SizeSpecSource;



import org.junit.Assert;

import org.junit.Before;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java→libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipBoundsAlgorithmTest.java

+2 −9
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 * Copyright (C) 2025 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.pip;

package com.android.wm.shell.common.pip;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;
@@ -32,13 +32,6 @@ import androidx.test.filters.SmallTest; 
import com.android.wm.shell.R;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.pip.PhoneSizeSpecSource;

import com.android.wm.shell.common.pip.PipBoundsAlgorithm;

import com.android.wm.shell.common.pip.PipBoundsState;

import com.android.wm.shell.common.pip.PipDisplayLayoutState;

import com.android.wm.shell.common.pip.PipKeepClearAlgorithmInterface;

import com.android.wm.shell.common.pip.PipSnapAlgorithm;

import com.android.wm.shell.common.pip.SizeSpecSource;



import org.junit.Before;

import org.junit.Test;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipBoundsStateTest.java→libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipBoundsStateTest.java

+2 −6
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 * Copyright (C) 2025 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.pip;

package com.android.wm.shell.common.pip;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;
@@ -36,10 +36,6 @@ import androidx.test.filters.SmallTest; 
import com.android.internal.util.function.TriConsumer;

import com.android.wm.shell.R;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.common.pip.PhoneSizeSpecSource;

import com.android.wm.shell.common.pip.PipBoundsState;

import com.android.wm.shell.common.pip.PipDisplayLayoutState;

import com.android.wm.shell.common.pip.SizeSpecSource;



import org.junit.Before;

import org.junit.Test;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipDoubleTapHelperTest.java→libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/pip/PipDoubleTapHelperTest.java

+2 −4
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * Copyright (C) 2025 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.pip.phone;

package com.android.wm.shell.common.pip;



import static com.android.wm.shell.common.pip.PipDoubleTapHelper.SIZE_SPEC_CUSTOM;

import static com.android.wm.shell.common.pip.PipDoubleTapHelper.SIZE_SPEC_DEFAULT;
@@ -29,8 +29,6 @@ import android.graphics.Rect; 
import android.testing.AndroidTestingRunner;



import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.common.pip.PipBoundsState;

import com.android.wm.shell.common.pip.PipDoubleTapHelper;



import org.junit.Assert;

import org.junit.Before;