Unify IDE model snapshot tests with other old AGP tests

Bug: n/a
Test: n/a
Change-Id: Ic79236c32f8e8d35f1db5aa0cb004f04925d20c1

1 files changed, 4 insertions, 2 deletions

diff --git a/android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt b/android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt
index 0840471dfab..dd952be91d9 100644
--- a/android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt
+++ b/android-test-framework/testSrc/com/android/tools/idea/testing/AgpIntegrationTests.kt
@@ -38,7 +38,6 @@ enum class AgpVersionSoftwareEnvironmentDescriptor(
    */
   val kotlinVersion: String? = null
 ) {
-  AGP_CURRENT(null, gradleVersion = null),
   AGP_35("3.5.0", gradleVersion = "5.5", kotlinVersion = "1.4.32"),
   AGP_40("4.0.0", gradleVersion = "6.5"),
 
@@ -47,7 +46,8 @@ enum class AgpVersionSoftwareEnvironmentDescriptor(
   AGP_42("4.2.0", gradleVersion = "6.7.1"),
   AGP_70("7.0.0", gradleVersion = "7.0.2"),
   AGP_71("7.1.0", gradleVersion = "7.2"),
-  AGP_72("7.2.0", gradleVersion = "7.3.3");
+  AGP_72("7.2.0", gradleVersion = "7.3.3"),
+  AGP_CURRENT(null, gradleVersion = null); // Must be last to represent the newest version.
 
   override fun toString(): String {
     return "Agp($agpVersion, g=$gradleVersion, k=$kotlinVersion)"
@@ -59,6 +59,7 @@ interface AgpIntegrationTestDefinition {
   val agpVersion: AgpVersionSoftwareEnvironmentDescriptor
   fun withAgpVersion(agpVersion: AgpVersionSoftwareEnvironmentDescriptor): AgpIntegrationTestDefinition
   fun displayName(): String = "$name${if (agpVersion != AGP_CURRENT) "-${agpVersion}" else ""}"
+  fun isCompatible(): Boolean = true
 }
 
 /**
@@ -73,6 +74,7 @@ fun List<AgpIntegrationTestDefinition>.applySelectedAgpVersions(): List<AgpInteg
       pass
     }
     .flatMap { version -> map { it.withAgpVersion(version) } }
+    .filter { it.isCompatible() }
     .sortedWith(compareBy({ it.agpVersion.gradleVersion }, { it.agpVersion.agpVersion }))
 
 /**