commit 823bf016873f8803b4972733d4a84a351c34afbf
author Riddle Hsu <riddlehsu@google.com> Tue Oct 18 23:59:01 2022 +0800
committer Garfield Tan <xutan@google.com> Mon Jun 12 23:01:00 2023 +0000
tree 9dd6d18acf2b8fa3dd63946335e0215ed48a2684
parent d73ad15bf92f69903bf15d01cb16054de9353f15

Reset factory of TaskPositioner in test

Depending on the execution order of test methods, after executing
TaskPositionerTests#testOverrideFactory, the next test method in
TaskPositioningControllerTests may be failed because the test
static factory returns null.

Clear the factory so it will use default implementation that returns
non-null TaskPositioner.

Bug: 254268165
Bug: 285565300
Test: atest TaskPositionerTests TaskPositioningControllerTests
Change-Id: I6c9abb60ce6d1a8631ad07b63d6e0d04c2f76b39
(cherry picked from commit 678aa417ac3d56d5f0d66f760bb90a49b83ffc4b)

services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java
index 7abe369..d535677 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskPositionerTests.java
@@ -88,7 +88,7 @@
 
     @After
     public void tearDown() {
-        mPositioner = null;
+        TaskPositioner.setFactory(null);
     }
 
     @Test