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

Commit f0392efa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix failing WebViewUpdateServiceTest." into rvc-dev am: bf75258a 

Change-Id: I5f80545fa28818afc03355b4a2a6bc337d8665d4
parents 0b210196 bf75258a

services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java

+0 −17
Original line number Diff line number Diff line
@@ -1275,25 +1275,8 @@ public class WebViewUpdateServiceTest { 
                    true /* valid */, true /* installed */));



        runWebViewBootPreparationOnMainSync();



        checkPreparationPhasesForPackage(primaryPackage, 1 /* first preparation phase */);



        mWebViewUpdateServiceImpl.packageStateChanged(primaryPackage,

                WebViewUpdateService.PACKAGE_ADDED_REPLACED, 0 /* userId */);

        mWebViewUpdateServiceImpl.packageStateChanged(primaryPackage,

                WebViewUpdateService.PACKAGE_ADDED_REPLACED, 1 /* userId */);

        mWebViewUpdateServiceImpl.packageStateChanged(primaryPackage,

                WebViewUpdateService.PACKAGE_ADDED_REPLACED, 2 /* userId */);

        // package still has the same update-time so we shouldn't run preparation here

        Mockito.verify(mTestSystemImpl, Mockito.times(1)).onWebViewProviderChanged(

                Mockito.argThat(new IsPackageInfoWithName(primaryPackage)));



        // Ensure we can still load the package

        WebViewProviderResponse response = mWebViewUpdateServiceImpl.waitForAndGetProvider();

        assertEquals(WebViewFactory.LIBLOAD_SUCCESS, response.status);

        assertEquals(primaryPackage, response.packageInfo.packageName);





        mTestSystemImpl.setPackageInfo(createPackageInfo(primaryPackage, true /* enabled */,

                    true /* valid */, true /* installed */, null /* signatures */,

                    20 /* lastUpdateTime*/ ));