Add qa filter support (#1)

* docs: Analytics addition to readme (Flank#987) * Added inital analytics template for team review * Added analytics.md file * Re-worked the wording as per discussion * Release notes updated * Fixes to wording, typos and recommendations as per pull request * Update and rename analytics.md to error_monitoring.md * Update README.md * Update error_monitoring.md * Update README.md * Update error_monitoring.md * Update error_monitoring.md * Update release_notes.md * Update README.md Co-authored-by: Michael Wright <michael.wright@gogoapps.io> Co-authored-by: bootstraponline <code@bootstraponline.com> * Add filter_qa support in test-targets Co-authored-by: Michael Wright <slooxied@gmail.com> Co-authored-by: Michael Wright <michael.wright@gogoapps.io> Co-authored-by: bootstraponline <code@bootstraponline.com>
mercari · Aug 17, 2020 · b472912 · b472912
1 parent df0c9ed
commit b472912
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/release_notes.md b/release_notes.md
@@ -6,6 +6,7 @@
 - [#988](https://github.com/Flank/flank/pull/988) Add versions description command for ios and android. ([adamfilipow92](https://github.com/adamfilipow92))
 - [#969](https://github.com/Flank/flank/pull/969) Add locales description command for ios and android. ([adamfilipow92](https://github.com/adamfilipow92))
 - [#989](https://github.com/Flank/flank/pull/989) CI changes: Check if valid title is used in PR. ([piotradamczyk5](https://github.com/piotradamczyk5))
+- [#987](https://github.com/Flank/flank/pull/987) Flank Error Monitoring readme addition ([sloox](https://github.com/Sloox))
 -
 
 ## v20.08.1

diff --git a/test_runner/src/main/kotlin/ftl/filter/TestFilters.kt b/test_runner/src/main/kotlin/ftl/filter/TestFilters.kt
@@ -45,6 +45,8 @@ object TestFilters {
     private const val ARGUMENT_TEST_FILE = "testFile"
     private const val ARGUMENT_NOT_TEST_FILE = "notTestFile"
 
+    private const val ARGUMENT_ONLY_QA = "filter_qa"
+
     private val FILTER_ARGUMENT by lazy {
 
         val pattern = listOf(
@@ -56,7 +58,8 @@ object TestFilters {
             ARGUMENT_TEST_PACKAGE,
             ARGUMENT_NOT_TEST_PACKAGE,
             ARGUMENT_TEST_FILE,
-            ARGUMENT_NOT_TEST_FILE
+            ARGUMENT_NOT_TEST_FILE,
+            ARGUMENT_ONLY_QA
         ).joinToString("|")
 
         Pattern.compile("""($pattern)\s+(.+)""")
@@ -110,6 +113,7 @@ object TestFilters {
             ARGUMENT_TEST_FILE -> fromTestFile(args)
             ARGUMENT_NOT_TEST_FILE -> not(fromTestFile(args))
             ARGUMENT_TEST_SIZE -> withSize(args)
+            ARGUMENT_ONLY_QA -> onlyQA()
             else -> throw FlankConfigurationError("Filtering option $command not supported")
         }
     }
@@ -155,6 +159,15 @@ object TestFilters {
         isAnnotation = true
     )
 
+    private fun onlyQA(): TestFilter = TestFilter(
+        describe = "onlyQA",
+        shouldRun = { testMethod ->
+            val className = testMethod.testName.split("#").first()
+            val simpleName = className.split(".").last()
+            simpleName.startsWith("QA") && simpleName.endsWith("Test")
+        }
+    )
+
     private fun not(filter: TestFilter): TestFilter = TestFilter(
         describe = "not (${filter.describe})",
         shouldRun = { testMethod ->

diff --git a/test_runner/src/main/kotlin/ftl/run/DumpShards.kt b/test_runner/src/main/kotlin/ftl/run/DumpShards.kt
@@ -8,6 +8,7 @@ import ftl.run.model.AndroidMatrixTestShards
 import ftl.run.platform.android.getAndroidMatrixShards
 import ftl.util.FlankConfigurationError
 import ftl.util.obfuscatePrettyPrinter
+import java.io.File
 import java.nio.file.Files
 import java.nio.file.Paths
 
@@ -51,7 +52,7 @@ private fun saveShardChunks(
         Paths.get(shardFilePath),
         getGson(obfuscatedOutput).toJson(shards).toByteArray()
     )
-    println("Saved $size shards to $shardFilePath")
+    println("Saved $size shards to ${File(shardFilePath).absolutePath}")
 }
 
 private fun getGson(obfuscatedOutput: Boolean) = if (obfuscatedOutput) obfuscatePrettyPrinter else prettyPrint

diff --git a/test_runner/src/test/kotlin/ftl/filter/TestFiltersTest.kt b/test_runner/src/test/kotlin/ftl/filter/TestFiltersTest.kt
@@ -29,6 +29,8 @@ val WITH_SMALL_ANNOTATION = TestMethod("whatever.Foo#testName", listOf(TestAnnot
 val WITHOUT_LARGE_ANNOTATION = TestMethod("whatever.Foo#testName", emptyList())
 val WITHOUT_MEDIUM_ANNOTATION = TestMethod("whatever.Foo#testName", emptyList())
 val WITHOUT_SMALL_ANNOTATION = TestMethod("whatever.Foo#testName", emptyList())
+val QA_TEST = TestMethod("whatever.QAIntroTest", emptyList())
+val NON_QA_TEST = TestMethod("whatever.IntroTest", emptyList())
 const val TEST_FILE = "src/test/kotlin/ftl/filter/fixtures/dummy-tests-file.txt"
 const val TEST_FILE_2 = "src/test/kotlin/ftl/filter/fixtures/exclude-tests.txt"
 private const val IGNORE_ANNOTATION = "org.junit.Ignore"
@@ -130,6 +132,14 @@ class TestFiltersTest {
         assertThat(filter.shouldRun(WITHOUT_FOO_ANNOTATION)).isFalse()
     }
 
+    @Test
+    fun testFilteringOnlyQA() {
+        val filter = fromTestTargets(listOf("filter_qa true"))
+
+        assertThat(filter.shouldRun(QA_TEST)).isTrue()
+        assertThat(filter.shouldRun(NON_QA_TEST)).isFalse()
+    }
+
     @Test
     fun testFilteringBySizeLarge() {
         val filter = fromTestTargets(listOf("size large"))