Skip to content
Browse files

Merge pull request #490 from marcphilipp/remove-usage-of-old-assert

Use org.junit.Assert instead of junit.framework.Assert
  • Loading branch information...
2 parents 51350c3 + 4604008 commit 9dd0494f224bdb721d1e5facae0d1ee687380d9a @dsaff dsaff committed Aug 31, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 src/main/java/org/junit/rules/ExpectedException.java
View
3 src/main/java/org/junit/rules/ExpectedException.java
@@ -1,12 +1,11 @@
package org.junit.rules;
-import static junit.framework.Assert.fail;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause;
import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
-import junit.framework.Assert;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.internal.AssumptionViolatedException;

0 comments on commit 9dd0494

Please sign in to comment.
Something went wrong with that request. Please try again.