Skip to content

Commit

Permalink
Use org.junit.Assert instead of junit.framework.Assert
Browse files Browse the repository at this point in the history
  • Loading branch information
marcphilipp committed Aug 22, 2012
1 parent 2e53904 commit 4604008
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions 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;
Expand Down

0 comments on commit 4604008

Please sign in to comment.