Bringing integration tests back to life

* Updated default iOS test device from iphone8/12 to iphone13pro/15.7 (#2366)
  FTL recently deprecated iphone8/12, so integration tests have been
  failing
* Updated local copy of FTL catalog to recent version
* Replaced iOS integration test app EarlGreyExample with FlankExampleTest
  EarlGreyExample is failing on newer OS/xcode. Current copy is based on
  EarlGreyExample v1, which is no longer maintained. V2 is pretty hard
  to get up and running, so switching to FlankExampleTest is the easiest
  way to unblock integration tests.

docs/index.md

@@ -152,8 +152,8 @@ gcloud:
   ## This flag may be repeated to specify multiple devices.
   ## The four device dimensions are: model, version, locale, and orientation.
   # device:
-  #  - model: iphone8
-  #   version: 12.0
+  #  - model: iphone13pro
+  #   version: 15.7
   #   locale: en
   #   orientation: portrait
   # - model: iphonex

integration_tests/src/test/kotlin/integration/DumpShardsIT.kt

@@ -89,8 +89,8 @@ class DumpShardsIT {
         assertThat(shards.count()).isEqualTo(2)
 
         shards.first().values.flatten().let { firstShard ->
-            assertThat(firstShard.count()).isEqualTo(8)
-            assertThat(firstShard).contains("EarlGreyExampleSwiftTests/testWithCustomFailureHandler")
+            assertThat(firstShard.count()).isEqualTo(2)
+            assertThat(firstShard).contains("FlankExampleTests/test2")
         }
     }
 }

integration_tests/src/test/kotlin/integration/LegacyResultIT.kt

@@ -93,7 +93,7 @@ class LegacyResultIT {
         val testSuiteOverview = outputReport.firstTestSuiteOverview
 
         testSuiteOverview.assertTestCountMatches(
-            total = 17,
+            total = 4,
             skipped = 0
         )
     }

integration_tests/src/test/resources/cases/all_test_filtered_ios.yml

@@ -1,6 +1,6 @@
 gcloud:
-  test: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/EarlGreyExample/EarlGreyExample.zip
-  xctestrun-file: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/EarlGreyExample/EarlGreyExampleSwiftTests.xctestrun
+  test: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/FlankExample/FlankExample.zip
+  xctestrun-file: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/FlankExample/FlankExample.xctestrun
 flank:
   test-targets:
     - nonExisting/Class

integration_tests/src/test/resources/cases/dump_shards_ios.yml

@@ -1,6 +1,6 @@
 gcloud:
-  test: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/EarlGreyExample/EarlGreyExample.zip
-  xctestrun-file: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/EarlGreyExample/EarlGreyExampleSwiftTests.xctestrun
+  test: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/FlankExample/FlankExample.zip
+  xctestrun-file: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/FlankExample/FlankExample.xctestrun
 
 flank:
   disable-sharding: false

integration_tests/src/test/resources/cases/flank_ios_single_legacy.yml

@@ -1,6 +1,6 @@
 gcloud:
-  test: "../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/EarlGreyExample/EarlGreyExample.zip"
-  xctestrun-file: "../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/EarlGreyExample/EarlGreyExampleSwiftTests.xctestrun"
+  test: "../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/FlankExample/FlankExample.zip"
+  xctestrun-file: "../test_runner/src/test/kotlin/ftl/fixtures/tmp/ios/FlankExample/FlankExample.xctestrun"
 
 flank:
   output-report: json

integration_tests/src/test/resources/compare/AllTestFilteredIT-ios-compare

@@ -9,12 +9,12 @@ IosArgs
       network-profile: null
       results-history-name: null
       # iOS gcloud
-      test: [0-9a-zA-Z\/_.-]*\/test_runner\/src\/test\/kotlin\/ftl\/fixtures\/tmp\/ios\/EarlGreyExample\/EarlGreyExample.zip
-      xctestrun-file: [0-9a-zA-Z\/_.-]*\/test_runner\/src\/test\/kotlin\/ftl\/fixtures\/tmp\/ios\/EarlGreyExample\/EarlGreyExampleSwiftTests.xctestrun
+      test: [0-9a-zA-Z\/_.-]*\/test_runner\/src\/test\/kotlin\/ftl\/fixtures\/tmp\/ios\/FlankExample\/FlankExample.zip
+      xctestrun-file: [0-9a-zA-Z\/_.-]*\/test_runner\/src\/test\/kotlin\/ftl\/fixtures\/tmp\/ios\/FlankExample\/FlankExample.xctestrun
       xcode-version: null
       device:
-        - model: iphone8
-          version: 13.6
+        - model: iphone13pro
+          version: 15.7
           locale: en
           orientation: portrait
       num-flaky-test-attempts: 0

test_projects/ios/EarlGreyExample/flank.ios.yml

@@ -3,7 +3,7 @@ gcloud:
   test: ./earlgrey_example.zip
   xctestrun-file: ./dd_tmp/Build/Products/EarlGreyExampleSwiftTests_iphoneos13.4-arm64e.xctestrun
   device:
-  - model: iphone8
-    version: 12.0
+  - model: iphone13pro
+    version: 15.7
     orientation: portrait
     locale: en_US

test_runner/flank.ios.yml

@@ -88,8 +88,8 @@ gcloud:
   ## This flag may be repeated to specify multiple devices.
   ## The four device dimensions are: model, version, locale, and orientation.
   # device:
-  #  - model: iphone8
-  #   version: 12.0
+  #  - model: iphone13pro
+  #   version: 15.7
   #   locale: en
   #   orientation: portrait
   # - model: iphonex

test_runner/src/main/kotlin/ftl/config/FtlConstants.kt

@@ -16,8 +16,8 @@ object FtlConstants {
     const val localhost = "http://localhost:8080"
     const val defaultLocale = "en"
     const val defaultOrientation = "portrait"
-    const val defaultIosModel = "iphone8"
-    const val defaultIosVersion = "13.6"
+    const val defaultIosModel = "iphone13pro"
+    const val defaultIosVersion = "15.7"
     const val defaultAndroidModel = "NexusLowRes"
     const val defaultAndroidVersion = "28"
     const val defaultIosConfig = "./flank.ios.yml"