OSDN Git Service

Fix a test broken by fragment migration.
authorJason Chiu <chiujason@google.com>
Tue, 17 Jul 2018 03:53:49 +0000 (11:53 +0800)
committerJason Chiu <chiujason@google.com>
Tue, 17 Jul 2018 07:46:48 +0000 (15:46 +0800)
Test: make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug: 111194177
Change-Id: Ifd2d980bbf397ad9875b43d654ab4fc52c4627c2

tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java

index 3b3a287..281a6c9 100644 (file)
@@ -18,7 +18,6 @@ package com.android.settings;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
@@ -30,7 +29,6 @@ import android.os.SystemProperties;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -84,9 +82,7 @@ public class SettingsLicenseActivityTest {
     }
 
     @Test
-    @Ignore("b/111194177")
     public void testOnCreateWithGeneratedHtmlFile() {
-        doReturn(null).when(mActivity).onCreateLoader(anyInt(), any());
         doReturn(Uri.parse("content://com.android.settings.files/my_cache/generated_test.html"))
                 .when(mActivity).getUriFromGeneratedHtmlFile(any());