From ddda900bc4946188fe1024479725630dd96548c3 Mon Sep 17 00:00:00 2001
From: Inez Korczynski <inez@squareup.com>
Date: Tue, 20 Jul 2021 16:14:48 -0700
Subject: [PATCH] Ignore tests with org.junit.Ignore annotation

---
 .../com/linkedin/dex/parser/JUnit4Extensions.kt    |  2 ++
 .../parser/test/junit4/java/IgnoredTest.java       | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 test-app/src/androidTest/java/com/linkedin/parser/test/junit4/java/IgnoredTest.java

diff --git a/parser/src/main/kotlin/com/linkedin/dex/parser/JUnit4Extensions.kt b/parser/src/main/kotlin/com/linkedin/dex/parser/JUnit4Extensions.kt
index 4ae1261..023e3db 100644
--- a/parser/src/main/kotlin/com/linkedin/dex/parser/JUnit4Extensions.kt
+++ b/parser/src/main/kotlin/com/linkedin/dex/parser/JUnit4Extensions.kt
@@ -49,6 +49,7 @@ private fun List<DexFile>.parseClasses(customAnnotations: List<String>): Map<Str
                                 val testMethods = dexFile
                                         .createTestMethods(classDef, dexFile.findMethodIds())
                                         .filter { it.containsTestAnnotation(customAnnotations) }
+                                        .filterNot { it.annotations.any { annotation -> annotation.name == JUNIT_IGNORE_ANNOTATION_NAME } }
 
                                 ClassParsingResult(
                                         dexFile = dexFile,
@@ -63,6 +64,7 @@ private fun List<DexFile>.parseClasses(customAnnotations: List<String>): Map<Str
                 .associateBy { it.className }
 
 private const val JUNIT_TEST_ANNOTATION_NAME = "org.junit.Test"
+private const val JUNIT_IGNORE_ANNOTATION_NAME = "org.junit.Ignore"
 
 private fun TestMethod.containsTestAnnotation(customAnnotations: List<String>): Boolean {
     for (a in customAnnotations) {
diff --git a/test-app/src/androidTest/java/com/linkedin/parser/test/junit4/java/IgnoredTest.java b/test-app/src/androidTest/java/com/linkedin/parser/test/junit4/java/IgnoredTest.java
new file mode 100644
index 0000000..1dcd57e
--- /dev/null
+++ b/test-app/src/androidTest/java/com/linkedin/parser/test/junit4/java/IgnoredTest.java
@@ -0,0 +1,14 @@
+package com.linkedin.parser.test.junit4.java;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class IgnoredTest {
+
+    @Ignore @Test
+    public void IgnoredTest() {
+        assertTrue(true);
+    }
+}