Improve assertions to verify elements, not size

Switch more assertions from using size and isEqualTo(0)
or isEmpty() and isTrue() to using the appropriate
assertions to check the exact elements or size.

Test: existing tests still pass
BUG: 147749580
Change-Id: Ie194694f60420e2c98b140c59b5d548acdf097c3

diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt
index 1fa9530..7aa2ee0 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.kt

@@ -135,20 +135,20 @@
 }
 
 fun verifyNoOtherTransitions(fragment: TransitionFragment) {
-    assertThat(fragment.enterTransition.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.enterTransition.exitingTargets.size).isEqualTo(0)
-    assertThat(fragment.exitTransition.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.exitTransition.exitingTargets.size).isEqualTo(0)
+    assertThat(fragment.enterTransition.enteringTargets).isEmpty()
+    assertThat(fragment.enterTransition.exitingTargets).isEmpty()
+    assertThat(fragment.exitTransition.enteringTargets).isEmpty()
+    assertThat(fragment.exitTransition.exitingTargets).isEmpty()
 
-    assertThat(fragment.reenterTransition.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.reenterTransition.exitingTargets.size).isEqualTo(0)
-    assertThat(fragment.returnTransition.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.returnTransition.exitingTargets.size).isEqualTo(0)
+    assertThat(fragment.reenterTransition.enteringTargets).isEmpty()
+    assertThat(fragment.reenterTransition.exitingTargets).isEmpty()
+    assertThat(fragment.returnTransition.enteringTargets).isEmpty()
+    assertThat(fragment.returnTransition.exitingTargets).isEmpty()
 
-    assertThat(fragment.sharedElementEnter.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.sharedElementEnter.exitingTargets.size).isEqualTo(0)
-    assertThat(fragment.sharedElementReturn.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.sharedElementReturn.exitingTargets.size).isEqualTo(0)
+    assertThat(fragment.sharedElementEnter.enteringTargets).isEmpty()
+    assertThat(fragment.sharedElementEnter.exitingTargets).isEmpty()
+    assertThat(fragment.sharedElementReturn.enteringTargets).isEmpty()
+    assertThat(fragment.sharedElementReturn.exitingTargets).isEmpty()
 }
 // Transition test methods end
 

diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.kt
index b2aefc3..01a1b32 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.kt

@@ -361,11 +361,9 @@
             names.capture(), views.capture(),
             snapshots.capture()
         )
-        assertThat(names.value.size).isEqualTo(1)
-        assertThat(views.value.size).isEqualTo(1)
+        assertThat(names.value).containsExactly("blueSquare")
+        assertThat(views.value).containsExactly(startBlue)
         assertThat(snapshots.value).isNull()
-        assertThat(names.value[0]).isEqualTo("blueSquare")
-        assertThat(views.value[0]).isEqualTo(startBlue)
 
         val endBlue = activityRule.findBlue()
 
@@ -373,11 +371,9 @@
             names.capture(), views.capture(),
             snapshots.capture()
         )
-        assertThat(names.value.size).isEqualTo(1)
-        assertThat(views.value.size).isEqualTo(1)
+        assertThat(names.value).containsExactly("blueSquare")
+        assertThat(views.value).containsExactly(endBlue)
         assertThat(snapshots.value).isNull()
-        assertThat(names.value[0]).isEqualTo("blueSquare")
-        assertThat(views.value[0]).isEqualTo(endBlue)
 
         // Now pop the back stack
         reset(enterCallback)
@@ -387,11 +383,9 @@
             names.capture(), views.capture(),
             snapshots.capture()
         )
-        assertThat(names.value.size).isEqualTo(1)
-        assertThat(views.value.size).isEqualTo(1)
+        assertThat(names.value).containsExactly("blueSquare")
+        assertThat(views.value).containsExactly(endBlue)
         assertThat(snapshots.value).isNull()
-        assertThat(names.value[0]).isEqualTo("blueSquare")
-        assertThat(views.value[0]).isEqualTo(endBlue)
 
         val reenterBlue = activityRule.findBlue()
 
@@ -399,11 +393,9 @@
             names.capture(), views.capture(),
             snapshots.capture()
         )
-        assertThat(names.value.size).isEqualTo(1)
-        assertThat(views.value.size).isEqualTo(1)
+        assertThat(names.value).containsExactly("blueSquare")
+        assertThat(views.value).containsExactly(reenterBlue)
         assertThat(snapshots.value).isNull()
-        assertThat(names.value[0]).isEqualTo("blueSquare")
-        assertThat(views.value[0]).isEqualTo(reenterBlue)
     }
 
     // Make sure that onMapSharedElement works to change the shared element going out
@@ -424,10 +416,8 @@
                 names: List<String>,
                 sharedElements: MutableMap<String, View>
             ) {
-                assertThat(names.size).isEqualTo(1)
-                assertThat(names[0]).isEqualTo("blueSquare")
-                assertThat(sharedElements.size).isEqualTo(1)
-                assertThat(sharedElements["blueSquare"]).isEqualTo(startBlue)
+                assertThat(names).containsExactly("blueSquare")
+                assertThat(sharedElements).containsExactly("blueSquare", startBlue)
                 sharedElements["blueSquare"] = startGreen
             }
         }
@@ -458,11 +448,9 @@
                 names: List<String>,
                 sharedElements: MutableMap<String, View>
             ) {
-                assertThat(names.size).isEqualTo(1)
-                assertThat(names[0]).isEqualTo("blueSquare")
-                assertThat(sharedElements.size).isEqualTo(1)
+                assertThat(names).containsExactly("blueSquare")
                 val expectedBlue = findViewById(fragment1, R.id.blueSquare)
-                assertThat(sharedElements["blueSquare"]).isEqualTo(expectedBlue)
+                assertThat(sharedElements).containsExactly("blueSquare", expectedBlue)
                 val greenSquare = findViewById(fragment1, R.id.greenSquare)
                 sharedElements["blueSquare"] = greenSquare
             }
@@ -498,11 +486,9 @@
                 names: List<String>,
                 sharedElements: MutableMap<String, View>
             ) {
-                assertThat(names.size).isEqualTo(1)
-                assertThat(names[0]).isEqualTo("blueSquare")
-                assertThat(sharedElements.size).isEqualTo(1)
+                assertThat(names).containsExactly("blueSquare")
                 val blueSquare = findViewById(fragment2, R.id.blueSquare)
-                assertThat(sharedElements["blueSquare"]).isEqualTo(blueSquare)
+                assertThat(sharedElements).containsExactly("blueSquare", blueSquare)
                 val greenSquare = findViewById(fragment2, R.id.greenSquare)
                 sharedElements["blueSquare"] = greenSquare
             }
@@ -535,10 +521,8 @@
                 names: List<String>,
                 sharedElements: MutableMap<String, View>
             ) {
-                assertThat(names.size).isEqualTo(1)
-                assertThat(names[0]).isEqualTo("blueSquare")
-                assertThat(sharedElements.size).isEqualTo(1)
-                assertThat(sharedElements["blueSquare"]).isEqualTo(endBlue)
+                assertThat(names).containsExactly("blueSquare")
+                assertThat(sharedElements).containsExactly("blueSquare", endBlue)
                 sharedElements["blueSquare"] = endGreen
             }
         }

diff --git a/fragment/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.kt b/fragment/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.kt
index 32970d6..80a1214 100644
--- a/fragment/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.kt
+++ b/fragment/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.kt

@@ -1159,12 +1159,12 @@
     }
 
     private fun assertNoTargets(fragment: TransitionFragment) {
-        assertThat(fragment.enterTransition.targets.isEmpty()).isTrue()
-        assertThat(fragment.reenterTransition.targets.isEmpty()).isTrue()
-        assertThat(fragment.exitTransition.targets.isEmpty()).isTrue()
-        assertThat(fragment.returnTransition.targets.isEmpty()).isTrue()
-        assertThat(fragment.sharedElementEnter.targets.isEmpty()).isTrue()
-        assertThat(fragment.sharedElementReturn.targets.isEmpty()).isTrue()
+        assertThat(fragment.enterTransition.targets).isEmpty()
+        assertThat(fragment.reenterTransition.targets).isEmpty()
+        assertThat(fragment.exitTransition.targets).isEmpty()
+        assertThat(fragment.returnTransition.targets).isEmpty()
+        assertThat(fragment.sharedElementEnter.targets).isEmpty()
+        assertThat(fragment.sharedElementReturn.targets).isEmpty()
     }
 
     open class PostponedFragment1 : TransitionFragment(R.layout.scene1) {

diff --git a/transition/transition/src/androidTest/java/androidx/transition/FragmentTestUtil.kt b/transition/transition/src/androidTest/java/androidx/transition/FragmentTestUtil.kt
index f5c9d31..93fece8 100644
--- a/transition/transition/src/androidTest/java/androidx/transition/FragmentTestUtil.kt
+++ b/transition/transition/src/androidTest/java/androidx/transition/FragmentTestUtil.kt

@@ -131,20 +131,20 @@
 }
 
 fun verifyNoOtherTransitions(fragment: TransitionFragment) {
-    assertThat(fragment.enterTransition.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.enterTransition.exitingTargets.size).isEqualTo(0)
-    assertThat(fragment.exitTransition.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.exitTransition.exitingTargets.size).isEqualTo(0)
+    assertThat(fragment.enterTransition.enteringTargets).isEmpty()
+    assertThat(fragment.enterTransition.exitingTargets).isEmpty()
+    assertThat(fragment.exitTransition.enteringTargets).isEmpty()
+    assertThat(fragment.exitTransition.exitingTargets).isEmpty()
 
-    assertThat(fragment.reenterTransition.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.reenterTransition.exitingTargets.size).isEqualTo(0)
-    assertThat(fragment.returnTransition.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.returnTransition.exitingTargets.size).isEqualTo(0)
+    assertThat(fragment.reenterTransition.enteringTargets).isEmpty()
+    assertThat(fragment.reenterTransition.exitingTargets).isEmpty()
+    assertThat(fragment.returnTransition.enteringTargets).isEmpty()
+    assertThat(fragment.returnTransition.exitingTargets).isEmpty()
 
-    assertThat(fragment.sharedElementEnter.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.sharedElementEnter.exitingTargets.size).isEqualTo(0)
-    assertThat(fragment.sharedElementReturn.enteringTargets.size).isEqualTo(0)
-    assertThat(fragment.sharedElementReturn.exitingTargets.size).isEqualTo(0)
+    assertThat(fragment.sharedElementEnter.enteringTargets).isEmpty()
+    assertThat(fragment.sharedElementEnter.exitingTargets).isEmpty()
+    assertThat(fragment.sharedElementReturn.enteringTargets).isEmpty()
+    assertThat(fragment.sharedElementReturn.exitingTargets).isEmpty()
 }
 // Transition test methods end