feat: added support for JUnit Theory tests (#1968)

[JUnit Theories](https://junit.org/junit4/javadoc/4.12/org/junit/experimental/theories/Theories.html) were not parsed by Flank perviously. This PR adds support for them. ## Test Plan > How do we know the code works? Added test. ## Checklist - [ ] Documented - [x] Unit tested - [ ] Integration tests updated
Flank · May 26, 2021 · 4b5b92e · 4b5b92e
1 parent 6c6eb53
commit 4b5b92e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/test_projects/android/apks/app-theory-androidTest.apk b/test_projects/android/apks/app-theory-androidTest.apk
diff --git a/test_runner/src/main/kotlin/ftl/run/platform/android/CreateAndroidTestContext.kt b/test_runner/src/main/kotlin/ftl/run/platform/android/CreateAndroidTestContext.kt
@@ -33,6 +33,8 @@ import ftl.shard.TestMethod as ShardTestMethod
 
 suspend fun AndroidArgs.createAndroidTestContexts(): List<AndroidTestContext> = resolveApks().setupShards(this)
 
+private val customTestAnnotations = listOf("org.junit.experimental.theories.Theory")
+
 private suspend fun List<AndroidTestContext>.setupShards(
     args: AndroidArgs,
     testFilter: TestFilter = TestFilters.fromTestTargets(args.testTargets, args.testTargetsForShard)
@@ -118,7 +120,8 @@ internal fun InstrumentationTestContext.getFlankTestMethods(
     testFilter: TestFilter
 ): List<FlankTestMethod> =
     getParametrizedClasses().let { parameterizedClasses: List<TestMethod> ->
-        DexParser.findTestMethods(test.local).asSequence()
+        DexParser.findTestMethods(test.local, customTestAnnotations)
+            .asSequence()
             .distinctBy { it.testName }
             .filter(testFilter.shouldRun)
             .filterNot(parameterizedClasses::belong)

diff --git a/test_runner/src/test/kotlin/ftl/run/platform/android/CreateAndroidTestContextKtTest.kt b/test_runner/src/test/kotlin/ftl/run/platform/android/CreateAndroidTestContextKtTest.kt
@@ -73,6 +73,23 @@ class CreateAndroidTestContextKtTest {
         assertEquals(expected, actual)
     }
 
+    @Test
+    fun `should pick up @Theory tests`() {
+        val testInstrumentationContext = InstrumentationTestContext(
+            FileReference("", ""),
+            FileReference("../test_projects/android/apks/app-theory-androidTest.apk", "")
+        )
+
+        val parsedTests = testInstrumentationContext
+            .getFlankTestMethods(TestFilter("filter", shouldRun = { true }))
+            .map { it.testName }
+            .map { it.substringAfterLast("#") }
+            .toSet()
+
+        assertTrue(parsedTests.isNotEmpty())
+        assertTrue(parsedTests.contains("exampleTheoryTest"))
+    }
+
     @Test
     fun `should filter out methods by distinct name`() {
         // given
@@ -84,7 +101,7 @@ class CreateAndroidTestContextKtTest {
 
         // when
         mockkObject(DexParser) {
-            every { findTestMethods(any()) } returns listOf(
+            every { findTestMethods(any(), any()) } returns listOf(
                 TestMethod("testMethod", listOf(mockk(relaxed = true))),
                 TestMethod("testMethod", listOf(mockk(relaxed = true))),
                 TestMethod("testMethod", listOf()),
@@ -110,7 +127,7 @@ class CreateAndroidTestContextKtTest {
         )
 
         mockkObject(DexParser) {
-            every { findTestMethods(any()) } returns listOf(
+            every { findTestMethods(any(), any()) } returns listOf(
                 TestMethod("foo.bar.TestClass1#test1", emptyList()),
                 TestMethod("foo.bar.TestClass1#test2", emptyList()),
                 TestMethod("foo.bar.TestClass2#test1", emptyList()),