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

Commit 9eb885d8 authored by Matthew Reynolds's avatar Matthew Reynolds
Browse files

Clean and divide exclusion lists in Android.bp 

There are now 3 exclusion lists:
SystemUI-tests-broken-robofiles-run: Robolectric tests that failed at runtime
SystemUI-tests-broken-robofiles-mockito-extended: Robolectric tests that failed because of ExtendedMockito references
SystemUI-tests-broken-robofiles-internal: tests with internal references
Removed dependency on mulitvalentTests for tests in the tests directory by moving shared files to the tests/utils directory.

Bug: 375261325
Flag: TEST_ONLY
Test: Tested manually with atest
Change-Id: Ia3da34c968323a873c6c4623ddc5c880d7f582fc
parent 3758c29c

packages/SystemUI/Android.bp

+86 −130

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java

+0 −0

File moved.

View file

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt

+0 −0

File moved.

View file

packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/doze/DozeScreenStateTest.java

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertFalse; 
import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Matchers.anyObject;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.verify;
@@ -315,6 +315,6 @@ public class DozeScreenStateTest extends SysuiTestCase { 
    public void authCallbackRemovedOnDestroy() {

        mScreen.destroy();



        verify(mAuthController).removeCallback(anyObject());

        verify(mAuthController).removeCallback(any());

    }

}

packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt

+0 −0

File moved.

View file