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

Commit fab74d69 authored by Tony Huang's avatar Tony Huang
Browse files

Fix docsui tests failed 

Refactor tests code for test failed by NPE.

Fix: 138257362
Test: atest DocumentsUIGoogleTests
Change-Id: Id59752e896dff4df8c3528c5e757f436f1390a94
parent cfbbbf33

tests/common/com/android/documentsui/SelectionHelpers.java

+7 −14
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.documentsui; 




import androidx.recyclerview.selection.DefaultSelectionTracker;

import androidx.recyclerview.selection.DefaultSelectionTracker;

import androidx.recyclerview.selection.SelectionPredicates;

import androidx.recyclerview.selection.SelectionPredicates;

import androidx.recyclerview.selection.SelectionTracker;

import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;

import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;

import androidx.recyclerview.selection.StorageStrategy;

import androidx.recyclerview.selection.StorageStrategy;
@@ -40,19 +39,13 @@ public class SelectionHelpers { 




    public static DocsSelectionHelper createTestInstance(List<String> docs) {

    public static DocsSelectionHelper createTestInstance(List<String> docs) {

        DocsSelectionHelper manager = new DocsSelectionHelper(

        DocsSelectionHelper manager = new DocsSelectionHelper(

                new DocsSelectionHelper.DelegateFactory() {

                new DocsSelectionHelper.DelegateFactory());





                    @Override

        manager.reset(new DefaultSelectionTracker<String>(

                    SelectionTracker<String> create(SelectionTracker<String> selectionTracker) {

                        return new DefaultSelectionTracker<String>(

                Integer.toHexString(System.identityHashCode(docs)),

                Integer.toHexString(System.identityHashCode(docs)),

                new TestStableIdProvider(docs),

                new TestStableIdProvider(docs),

                CAN_SET_ANYTHING,

                CAN_SET_ANYTHING,

                                StorageStrategy.createStringStorage());

                StorageStrategy.createStringStorage()));

                    }

                });



        manager.reset(null);

        return manager;

        return manager;

    }

    }

}
 
}

tests/unit/com/android/documentsui/DocsSelectionHelperTest.java

+5 −11
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertNotNull; 
import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;





import androidx.recyclerview.selection.Selection;

import androidx.recyclerview.selection.Selection;

import androidx.recyclerview.selection.SelectionTracker;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;
@@ -51,15 +50,7 @@ public class DocsSelectionHelperTest { 
    @Before

    @Before

    public void setup() {

    public void setup() {

        mCreated = new ArrayList<>();

        mCreated = new ArrayList<>();

        mFactory = new DelegateFactory() {

        mFactory = new DelegateFactory();



            @Override

            TestSelectionManager create(SelectionTracker<String> selectionTracker) {

                TestSelectionManager mgr = new TestSelectionManager();

                mCreated.add(mgr);

                return mgr;

            }

        };





        mSelectionMgr = new DocsSelectionHelper(mFactory);

        mSelectionMgr = new DocsSelectionHelper(mFactory);

    }

    }
@@ -105,7 +96,10 @@ public class DocsSelectionHelperTest { 
    }

    }





    private void resetSelectionHelper() {

    private void resetSelectionHelper() {

        mSelectionMgr.reset(null); // nulls are passed to factory. We ignore.

        TestSelectionManager mgr = new TestSelectionManager();

        mCreated.add(mgr);



        mSelectionMgr.reset(mgr);

    }

    }





    private static final class TestSelectionManager extends DummySelectionTracker<String> {

    private static final class TestSelectionManager extends DummySelectionTracker<String> {