Merge pull request #894 from MarathonLabs/fix/ios-test-run-parser

feat(ios): support arbitrary strings in TestRunProgressParser as iden…

Author: Malinskiy

vendor/vendor-ios/src/main/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParser.kt

@@ -18,9 +18,9 @@ class TestRunProgressParser(
 
     val logger = MarathonLogging.logger(TestRunProgressParser::class.java.simpleName)
 
-    val TEST_CASE_STARTED = """Test Case '-\[([a-zA-Z0-9_.]+) ([a-zA-Z0-9_ ]+)]' started\.""".toRegex()
+    val TEST_CASE_STARTED = """Test Case '-\[(.+) (.+)]' started\.""".toRegex()
     val TEST_CASE_FINISHED =
-        """Test Case '-\[([a-zA-Z0-9_.]+) ([a-zA-Z0-9_ ]+)]' (passed|failed|skipped) \(([\d\.]+) seconds\)\.""".toRegex()
+        """Test Case '-\[(.+) (.+)]' (passed|failed|skipped) \(([\d\.]+) seconds\)\.""".toRegex()
 
     /**
      * $1 = file

vendor/vendor-ios/src/test/kotlin/com/malinskiy/marathon/ios/logparser/parser/TestRunProgressParserTest.kt

@@ -42,7 +42,7 @@ class TestRunProgressParserTest {
         val parser = TestRunProgressParser(mockTimer, "testTarget")
 
         val events = mutableListOf<TestEvent>()
-        javaClass.getResourceAsStream("/fixtures/test_output/patrol.log").bufferedReader().use {
+        javaClass.getResourceAsStream("/fixtures/test_output/patrol_0.log").bufferedReader().use {
             it.lines().forEach { line ->
                 parser.process(line)?.let {
                     events.addAll(it)
@@ -51,7 +51,7 @@ class TestRunProgressParserTest {
         }
 
         assertThat(events.map { it.toString() }.reduce { acc, s -> acc + "\n" + s })
-            .isEqualTo(javaClass.getResourceAsStream("/fixtures/test_output/patrol.expected").reader().readText().trimEnd())
+            .isEqualTo(javaClass.getResourceAsStream("/fixtures/test_output/patrol_0.expected").reader().readText().trimEnd())
     }
 
     @Test
@@ -89,10 +89,19 @@ class TestRunProgressParserTest {
     }
 
     @Test
-    fun testX() {
-        val parser = TestRunProgressParser(mockTimer, "")
+    fun testSample4() {
+        val parser = TestRunProgressParser(mockTimer, "testTarget")
 
-//        """Test Case '-[sample_appUITests.MoreTests testPresentModal]' started."""
-        parser.process("""Test Case '-[RunnerUITests androidAppTest___tapsAround]' started.""")
+        val events = mutableListOf<TestEvent>()
+        javaClass.getResourceAsStream("/fixtures/test_output/patrol_1.log").bufferedReader().use {
+            it.lines().forEach { line ->
+                parser.process(line)?.let {
+                    events.addAll(it)
+                }
+            }
+        }
+
+        assertThat(events.map { it.toString() }.reduce { acc, s -> acc + "\n" + s })
+            .isEqualTo(javaClass.getResourceAsStream("/fixtures/test_output/patrol_1.expected").reader().readText().trimEnd())
     }
 }

vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol.expected vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_0.expected

@@ -0,0 +1,2 @@
+TestStarted(id=Test(pkg=testTarget, clazz=RunnerUITests, method=ab.example_test+tty, metaProperties=[]))
+TestPassed(id=Test(pkg=testTarget, clazz=RunnerUITests, method=ab.example_test+tty, metaProperties=[]), startTime=1537187695794, endTime=1537187696000)

vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol.log vendor/vendor-ios/src/test/resources/fixtures/test_output/patrol_0.log

@@ -0,0 +1,17 @@
+Test Suite 'All tests' started at 2024-02-07 13:58:21.952
+Test Suite 'marathon.xctest' started at 2024-02-07 13:58:21.953
+Test Suite 'RunnerUITests' started at 2024-02-07 13:58:21.953
+    t =      nans Suite Tear Down
+Test Case '-[RunnerUITests ab.example_test+tty]' started.
+Test Case '-[RunnerUITests ab.example_test+tty]' passed (0.206 seconds).
+Test Suite 'RunnerUITests' passed at 2024-02-07 13:58:22.159.
+	 Executed 1 test, with 0 failures (0 unexpected) in 0.206 (0.206) seconds
+Test Suite 'marathon.xctest' passed at 2024-02-07 13:58:22.160.
+	 Executed 1 test, with 0 failures (0 unexpected) in 0.206 (0.207) seconds
+Test Suite 'All tests' passed at 2024-02-07 13:58:22.160.
+	 Executed 1 test, with 0 failures (0 unexpected) in 0.206 (0.207) seconds
+
+Test session results, code coverage, and logs:
+	/Users/xxx/Library/Developer/Xcode/DerivedData/temporary-asdgsga/Logs/Test/Test-Transient Testing-2024.02.07_13-57-27-+0000.xcresult
+
+** TEST EXECUTE SUCCEEDED **