Merge 429efbd into 040538c

TNG · Mar 11, 2022 · ba9d363 · ba9d363
2 parents 040538c + 429efbd
commit ba9d363
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/junit4/src/main/java/com/tngtech/java/junit/dataprovider/DataProviderFilter.java b/junit4/src/main/java/com/tngtech/java/junit/dataprovider/DataProviderFilter.java
@@ -78,7 +78,7 @@ public boolean shouldRun(Description description) {
         String filterDescription = filter.describe();
 
         Matcher filterDescriptionMatcher = DESCRIPTION_PATTERN.matcher(filterDescription);
-        if (filterDescription.contains(" OR ") || !filterDescriptionMatcher.find()) {
+        if (filterDescription.contains(" OR ") || filterDescription.contains("exclude ") || !filterDescriptionMatcher.find()) {
             return filter.shouldRun(description);
         }
         String methodName = filterDescriptionMatcher.group(GROUP_METHOD_NAME);

diff --git a/junit4/src/test/java/com/tngtech/java/junit/dataprovider/DataProviderFilterTest.java b/junit4/src/test/java/com/tngtech/java/junit/dataprovider/DataProviderFilterTest.java
@@ -86,6 +86,21 @@ public void testShouldRunShouldCallOriginalFilterShouldRunIfGivenDescriptionCont
         verifyNoMoreInteractions(filter);
     }
 
+    @Test
+    public void testShouldRunShouldCallOriginalFilterShouldRunIfGivenDescriptionContainsExclude() {
+        // Given:
+        when(filter.describe()).thenReturn("exclude Method failing1[0: 0](Test1)");
+        Description description = setupDescription(true, "failing1[0: 0](Test1)");
+
+        // When:
+        underTest.shouldRun(description);
+
+        // Then:
+        verify(filter).describe();
+        verify(filter).shouldRun(description);
+        verifyNoMoreInteractions(filter);
+    }
+
     @Test
     public void testShouldRunShouldReturnFalseWhenDescriptionDoesNotHaveExpectedMethodName() {
         // Given: