Misc improvement for integration_tests

1. Include integration_tests:versioniong to settings.gradle.
2. Migrate more assertions to Google Truth for AccessibilityEventTest.
3. Bump minSdk to 21 for androidx_test.

Signed-off-by: utzcoz <utzcoz@outlook.com>

9 files changed, 16 insertions, 15 deletions

diff --git a/integration_tests/androidx_test/build.gradle b/integration_tests/androidx_test/build.gradle
index 89c242c6c..de481e351 100644
--- a/integration_tests/androidx_test/build.gradle
+++ b/integration_tests/androidx_test/build.gradle
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         testApplicationId 'org.robolectric.integrationtests.axt'
-        minSdk 19
+        minSdk 21
         targetSdk 34
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/integration_tests/androidx_test/src/main/AndroidManifest.xml b/integration_tests/androidx_test/src/main/AndroidManifest.xml
index 5d77da862..6aac983cf 100644
--- a/integration_tests/androidx_test/src/main/AndroidManifest.xml
+++ b/integration_tests/androidx_test/src/main/AndroidManifest.xml
@@ -10,11 +10,11 @@
         <activity android:name="org.robolectric.integrationtests.axt.EspressoActivity"
                   android:label="Activity Label"
                   android:exported="true" >
-                           <intent-filter >
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        </intent-filter>
-                  </activity>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity android:name="org.robolectric.integrationtests.axt.EspressoScrollingActivity"
             android:exported="true" />
         <activity android:name="org.robolectric.integrationtests.axt.ActivityWithPlatformMenu"
diff --git a/integration_tests/androidx_test/src/sharedTest/AndroidManifest-NoTestPackageActivities.xml b/integration_tests/androidx_test/src/sharedTest/AndroidManifest-NoTestPackageActivities.xml
index b712d7508..43cf9617b 100644
--- a/integration_tests/androidx_test/src/sharedTest/AndroidManifest-NoTestPackageActivities.xml
+++ b/integration_tests/androidx_test/src/sharedTest/AndroidManifest-NoTestPackageActivities.xml
@@ -4,7 +4,7 @@
     package="org.robolectric.integrationtests.axt">
 
   <uses-sdk
-      android:minSdkVersion="19"
+      android:minSdkVersion="21"
       android:targetSdkVersion="34"/>
 
   <application>
diff --git a/integration_tests/androidx_test/src/test/AndroidManifest-ActivityScenario.xml b/integration_tests/androidx_test/src/test/AndroidManifest-ActivityScenario.xml
index 62402b2fd..a08c46165 100644
--- a/integration_tests/androidx_test/src/test/AndroidManifest-ActivityScenario.xml
+++ b/integration_tests/androidx_test/src/test/AndroidManifest-ActivityScenario.xml
@@ -4,7 +4,7 @@
     package="org.robolectric.integrationtests.axt">
 
   <uses-sdk
-      android:minSdkVersion="19"
+      android:minSdkVersion="21"
       android:targetSdkVersion="34"/>
 
   <application
diff --git a/integration_tests/androidx_test/src/test/AndroidManifest-ActivityTestRule.xml b/integration_tests/androidx_test/src/test/AndroidManifest-ActivityTestRule.xml
index d52207387..334fe3b2a 100644
--- a/integration_tests/androidx_test/src/test/AndroidManifest-ActivityTestRule.xml
+++ b/integration_tests/androidx_test/src/test/AndroidManifest-ActivityTestRule.xml
@@ -4,7 +4,7 @@
     package="org.robolectric.integrationtests.axt">
 
   <uses-sdk
-      android:minSdkVersion="19"
+      android:minSdkVersion="21"
       android:targetSdkVersion="34"/>
 
   <application>
diff --git a/integration_tests/androidx_test/src/test/AndroidManifest-Intents.xml b/integration_tests/androidx_test/src/test/AndroidManifest-Intents.xml
index b4142a61f..0f59ec4a8 100644
--- a/integration_tests/androidx_test/src/test/AndroidManifest-Intents.xml
+++ b/integration_tests/androidx_test/src/test/AndroidManifest-Intents.xml
@@ -4,7 +4,7 @@
     package="org.robolectric.integrationtests.axt">
 
   <uses-sdk
-      android:minSdkVersion="19"
+      android:minSdkVersion="21"
       android:targetSdkVersion="34"/>
 
   <application>
diff --git a/integration_tests/androidx_test/src/test/AndroidManifest-NoTestPackageActivities.xml b/integration_tests/androidx_test/src/test/AndroidManifest-NoTestPackageActivities.xml
index b712d7508..43cf9617b 100644
--- a/integration_tests/androidx_test/src/test/AndroidManifest-NoTestPackageActivities.xml
+++ b/integration_tests/androidx_test/src/test/AndroidManifest-NoTestPackageActivities.xml
@@ -4,7 +4,7 @@
     package="org.robolectric.integrationtests.axt">
 
   <uses-sdk
-      android:minSdkVersion="19"
+      android:minSdkVersion="21"
       android:targetSdkVersion="34"/>
 
   <application>
diff --git a/integration_tests/ctesque/src/sharedTest/java/android/view/accessibility/AccessibilityEventTest.java b/integration_tests/ctesque/src/sharedTest/java/android/view/accessibility/AccessibilityEventTest.java
index d5aaeadff..46d8fda1c 100644
--- a/integration_tests/ctesque/src/sharedTest/java/android/view/accessibility/AccessibilityEventTest.java
+++ b/integration_tests/ctesque/src/sharedTest/java/android/view/accessibility/AccessibilityEventTest.java
@@ -16,7 +16,6 @@
 package android.view.accessibility;
 
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.assertFalse;
 
 import android.os.Build;
 import android.os.Message;
@@ -269,9 +268,10 @@ public class AccessibilityEventTest {
           .isEqualTo(expectedRecord.getDisplayId());
     }
 
-    assertFalse(
-        "one of the parcelableData is null",
-        expectedRecord.getParcelableData() == null ^ receivedRecord.getParcelableData() == null);
+    assertWithMessage("one of the parcelableData is null")
+        .that(
+            expectedRecord.getParcelableData() == null ^ receivedRecord.getParcelableData() == null)
+        .isFalse();
     if (expectedRecord.getParcelableData() != null && receivedRecord.getParcelableData() != null) {
       assertWithMessage("parcelableData has incorrect value")
           .that(((Message) receivedRecord.getParcelableData()).what)
diff --git a/settings.gradle b/settings.gradle
index 498473c58..911b5800d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -42,4 +42,5 @@ include ":integration_tests:play_services"
 include ":integration_tests:sparsearray"
 include ":integration_tests:nativegraphics"
 include ":integration_tests:room"
+include ":integration_tests:versioning"
 include ':testapp'