commit 96793d91c7635401dc385220b0280fa59cd12564
author Anton Hansson <hansson@google.com> Tue May 31 16:30:54 2022 +0000
committer Anton Hansson <hansson@google.com> Wed Jun 01 09:16:18 2022 +0000
tree e27ebb38bb005a8c986aded624e6840ec66dd529
parent ae61d056c59c49d9192e55248b6b29c03d820201

Consolidate some verification code

Remove the duplicated logic for verifying certain extensions exist,
and their versions.

This makes it simpler to verify the state of more extensions.

Test: atest sdkextensions_e2e_tests
Change-Id: I7baddd3b69d29161172dcba1e619bc32de0e6ee8

javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java

diff --git a/javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java b/javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java
index bfe017d..a4fb3a8 100644
--- a/javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java
+++ b/javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java
@@ -187,30 +187,35 @@
     }
 
     private void assertRVersionEquals(int version) throws Exception {
-        int appValue = broadcastForInt("GET_SDK_VERSION", "r");
-        String syspropValue = getExtensionVersionFromSysprop("r");
-        assertEquals(version, appValue);
-        assertEquals(String.valueOf(version), syspropValue);
-        assertEquals(version >= 12, canInstallApp("r12"));
-        assertEquals(version >= 45, canInstallApp("r45"));
+        String[] apps = version >= 45 ? new String[]{"r12", "r45"} :
+            version >= 12 ? new String[]{"r12"} : new String[]{};
+        assertExtensionVersionEquals("r", version, apps, true);
     }
 
     private void assertSVersionEquals(int version) throws Exception {
-        int appValue = broadcastForInt("GET_SDK_VERSION", "s");
-        String syspropValue = getExtensionVersionFromSysprop("s");
-        if (isAtLeastS()) {
+        // These APKs require the same R version as they do S version.
+        int minVersion = Math.min(version, broadcastForInt("GET_SDK_VERSION", "r"));
+        String[] apps = minVersion >= 45 ? new String[]{"s12", "s45"}
+                : minVersion >= 12 ? new String[]{"s12"} : new String[]{};
+        assertExtensionVersionEquals("s", version, apps, isAtLeastS());
+    }
+
+    private void assertExtensionVersionEquals(String extension, int version, String[] apps,
+            boolean expected) throws Exception {
+        int appValue = broadcastForInt("GET_SDK_VERSION", extension);
+        String syspropValue = getExtensionVersionFromSysprop(extension);
+        if (expected) {
             assertEquals(version, appValue);
             assertEquals(String.valueOf(version), syspropValue);
-
-            // These APKs require the same R version as they do S version.
-            int minVersion = Math.min(version, broadcastForInt("GET_SDK_VERSION", "r"));
-            assertEquals(minVersion >= 12, canInstallApp("s12"));
-            assertEquals(minVersion >= 45, canInstallApp("s45"));
+            for (String app : apps) {
+                assertTrue(canInstallApp(app));
+            }
         } else {
             assertEquals(0, appValue);
             assertEquals("", syspropValue);
-            assertFalse(canInstallApp("s12"));
-            assertFalse(canInstallApp("s45"));
+            for (String app : apps) {
+                assertFalse(canInstallApp(app));
+            }
         }
     }