Merge branch 'R4_3-show-skipped'

Conflicts: org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java
m-froehlich · Apr 10, 2014 · b94f84c · b94f84c
2 parents f888441 + d239c81
commit b94f84c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java
@@ -9,6 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Achim Demelt <[email protected]> - [junit] Separate UI from non-UI code - https://bugs.eclipse.org/bugs/show_bug.cgi?id=278844
  *     Thirumala Reddy Mutchukota <[email protected]> - [JUnit] Avoid rerun test launch on UI thread - https://bugs.eclipse.org/bugs/show_bug.cgi?id=411841
+ *     Andrej Zachar <[email protected]> - [JUnit] Add a filter for ignored tests - https://bugs.eclipse.org/bugs/show_bug.cgi?id=298603
  *******************************************************************************/
 package org.eclipse.jdt.internal.junit.model;
 

diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestSuiteElement.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestSuiteElement.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Andrej Zachar <[email protected]> - [JUnit] Add a filter for ignored tests - https://bugs.eclipse.org/bugs/show_bug.cgi?id=298603
  *******************************************************************************/
 
 package org.eclipse.jdt.internal.junit.model;

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java
@@ -10,6 +10,7 @@
  *     David Saff ([email protected]) - bug 102632: [JUnit] Support for JUnit 4.
  *     Robert Konigsberg <[email protected]> - [JUnit] Improve discoverability of the ability to run a single method under JUnit Tests - https://bugs.eclipse.org/bugs/show_bug.cgi?id=285637
  *     Andrej Zachar <[email protected]> - Added the 'Bug Trace' feature (a failure's html based diff, automatic showing a failure widget)
+ *     Andrej Zachar <[email protected]> - [JUnit] Add a filter for ignored tests - https://bugs.eclipse.org/bugs/show_bug.cgi?id=298603
  *******************************************************************************/
 package org.eclipse.jdt.internal.junit.ui;