From 5a36305aaeb8bb90425d023be367b5ed75f19165 Mon Sep 17 00:00:00 2001 From: Jeremy Goldman Date: Thu, 25 Feb 2021 15:17:50 +0800 Subject: [PATCH] StorageProfileFragmentTest converted to JUnit Looper and UIThreadTest added. Test: atest -c StorageProfileFragmentTest Change-Id: Ib561a0e87a0b5034f7692f2567c8617e7f5f763e --- .../deviceinfo/StorageProfileFragmentTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) rename tests/{robotests => unit}/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java (91%) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/unit/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java similarity index 91% rename from tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java rename to tests/unit/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java index bb65fa248f7..ca124fd28ab 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License + * limitations under the License. */ package com.android.settings.deviceinfo; @@ -21,8 +21,12 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import android.os.Looper; import android.util.SparseArray; +import androidx.test.annotation.UiThreadTest; +import androidx.test.ext.junit.runners.AndroidJUnit4; + import com.android.settings.deviceinfo.storage.StorageAsyncLoader; import com.android.settings.deviceinfo.storage.StorageItemPreferenceController; import com.android.settingslib.applications.StorageStatsSource; @@ -32,16 +36,19 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class StorageProfileFragmentTest { @Captor private ArgumentCaptor> mCaptor; @Test + @UiThreadTest public void verifyAppSizesAreNotZeroedOut() { + if (Looper.myLooper() == null) { + Looper.prepare(); + } StorageItemPreferenceController controller = mock(StorageItemPreferenceController.class); StorageProfileFragment fragment = new StorageProfileFragment(); StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();