PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate away from deprecated Truth APIs.

Browse Source 
This is a transitional step towards truth 1.0.1, where these APIs have
been completely removed.

Bug: 168765701
Test: m checkbuild
Change-Id: I76f9c37cb699ce6ab8715ffe35d11668ccbceea1
This commit is contained in:
Alexander Dorokhine
2020-09-18 15:43:47 -07:00
parent 74e3692ab9
commit 46e85a2fad
36 changed files with 138 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
View File

@@ -67,7 +67,7 @@ public class CategoryManagerTest {
@Test
public void getInstance_shouldBeSingleton() {
assertThat(mCategoryManager).isSameAs(CategoryManager.get(mContext));
assertThat(mCategoryManager).isSameInstanceAs(CategoryManager.get(mContext));
}
@Test
@@ -147,9 +147,9 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(RuntimeEnvironment.application, mCategoryByKeyMap);
// Verify they are now sorted.
assertThat(category.getTile(0)).isSameAs(tile3);
assertThat(category.getTile(1)).isSameAs(tile1);
assertThat(category.getTile(2)).isSameAs(tile2);
assertThat(category.getTile(0)).isSameInstanceAs(tile3);
assertThat(category.getTile(1)).isSameInstanceAs(tile1);
assertThat(category.getTile(2)).isSameInstanceAs(tile2);
}
@Test
@@ -170,9 +170,9 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify they are now sorted.
assertThat(category.getTile(0)).isSameAs(tile2);
assertThat(category.getTile(1)).isSameAs(tile1);
assertThat(category.getTile(2)).isSameAs(tile3);
assertThat(category.getTile(0)).isSameInstanceAs(tile2);
assertThat(category.getTile(1)).isSameInstanceAs(tile1);
assertThat(category.getTile(2)).isSameInstanceAs(tile3);
}
@Test
@@ -192,9 +192,9 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is not changed
assertThat(category.getTile(0)).isSameAs(tile1);
assertThat(category.getTile(1)).isSameAs(tile2);
assertThat(category.getTile(2)).isSameAs(tile3);
assertThat(category.getTile(0)).isSameInstanceAs(tile1);
assertThat(category.getTile(1)).isSameInstanceAs(tile2);
assertThat(category.getTile(2)).isSameInstanceAs(tile3);
}
@Test
@@ -217,10 +217,10 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is not changed
assertThat(category.getTile(0)).isSameAs(tile1);
assertThat(category.getTile(1)).isSameAs(tile2);
assertThat(category.getTile(2)).isSameAs(tile3);
assertThat(category.getTile(3)).isSameAs(tile4);
assertThat(category.getTile(0)).isSameInstanceAs(tile1);
assertThat(category.getTile(1)).isSameInstanceAs(tile2);
assertThat(category.getTile(2)).isSameInstanceAs(tile3);
assertThat(category.getTile(3)).isSameInstanceAs(tile4);
}
@Test
@@ -242,9 +242,9 @@ public class CategoryManagerTest {
mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
// Verify the sorting order is internal first, follow by package name ordering
assertThat(category.getTile(0)).isSameAs(tile2);
assertThat(category.getTile(1)).isSameAs(tile3);
assertThat(category.getTile(2)).isSameAs(tile1);
assertThat(category.getTile(0)).isSameInstanceAs(tile2);
assertThat(category.getTile(1)).isSameInstanceAs(tile3);
assertThat(category.getTile(2)).isSameInstanceAs(tile1);
}
@Test

4
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -129,7 +129,7 @@ public class DashboardFragmentTest {
final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class);
assertThat(controller).isSameAs(retrievedController);
assertThat(controller).isSameInstanceAs(retrievedController);
}
@Test
@@ -142,7 +142,7 @@ public class DashboardFragmentTest {
final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class);
assertThat(controller1).isSameAs(retrievedController);
assertThat(controller1).isSameInstanceAs(retrievedController);
}
@Test