fix: include annotated methods in parameterized classes when filterin…

…g with test-targets (#2537)

* fix: include annotated methods in parameterized classes when filtering with test-targets
* test: add extra tests and associated resources

test_projects/android/parameterizedAnnotatedTests/.gitignore

@@ -0,0 +1 @@
+/build

test_projects/android/parameterizedAnnotatedTests/build.gradle.kts

@@ -0,0 +1,46 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "flank.shard.annotationbug"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "flank.shard.annotationbug"
+        minSdk = 24
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.11.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}

test_projects/android/parameterizedAnnotatedTests/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

test_projects/android/parameterizedAnnotatedTests/src/androidTest/java/flank/shard/annotationbug/Annotation.kt

@@ -0,0 +1,12 @@
+package flank.shard.annotationbug
+
+@Target(
+    AnnotationTarget.ANNOTATION_CLASS,
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY_GETTER,
+    AnnotationTarget.PROPERTY_SETTER
+)
+@Retention(
+    AnnotationRetention.RUNTIME
+)
+annotation class Annotation

test_projects/android/parameterizedAnnotatedTests/src/androidTest/java/flank/shard/annotationbug/FooAnnotatedParameterizedTest.kt

@@ -0,0 +1,18 @@
+package flank.shard.annotationbug
+
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+@RunWith(Parameterized::class)
+class FooAnnotatedParameterizedTest {
+    @Test
+    @FooAnnotation
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        Assert.assertEquals("flank.shard.annotationbug", appContext.packageName)
+    }
+}

test_projects/android/parameterizedAnnotatedTests/src/androidTest/java/flank/shard/annotationbug/FooAnnotation.kt

@@ -0,0 +1,13 @@
+package flank.shard.annotationbug
+
+@Target(
+    AnnotationTarget.ANNOTATION_CLASS,
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY_GETTER,
+    AnnotationTarget.PROPERTY_SETTER
+)
+@Retention(
+    AnnotationRetention.RUNTIME
+)
+
+annotation class FooAnnotation()

test_projects/android/parameterizedAnnotatedTests/src/androidTest/java/flank/shard/annotationbug/InstrumentedAnnotatedTest.kt

@@ -0,0 +1,25 @@
+package flank.shard.annotationbug
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class InstrumentedAnnotatedTest {
+    @Test
+    @Annotation
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("flank.shard.annotationbug", appContext.packageName)
+    }
+}

test_projects/android/parameterizedAnnotatedTests/src/androidTest/java/flank/shard/annotationbug/InstrumentedTest.kt

@@ -0,0 +1,24 @@
+package flank.shard.annotationbug
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class InstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("flank.shard.annotationbug", appContext.packageName)
+    }
+}

test_projects/android/parameterizedAnnotatedTests/src/androidTest/java/flank/shard/annotationbug/ParameterizedAnnotatedTest.kt

@@ -0,0 +1,25 @@
+package flank.shard.annotationbug
+
+import androidx.test.platform.app.InstrumentationRegistry
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+import org.junit.runners.Parameterized
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(Parameterized::class)
+class ParameterizedAnnotatedTest {
+    @Test
+    @Annotation
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("flank.shard.annotationbug", appContext.packageName)
+    }
+}

test_projects/android/parameterizedAnnotatedTests/src/androidTest/java/flank/shard/annotationbug/ParameterizedTest.kt

@@ -0,0 +1,24 @@
+package flank.shard.annotationbug
+
+import androidx.test.platform.app.InstrumentationRegistry
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+import org.junit.runners.Parameterized
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(Parameterized::class)
+class ParameterizedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("flank.shard.annotationbug", appContext.packageName)
+    }
+}

test_projects/android/parameterizedAnnotatedTests/src/main/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Flankshardannotationbug"
+        tools:targetApi="31" />
+
+</manifest>