Replace deprecated assertThat with hamcrest assertThat

jenkinsci · Dec 16, 2023 · dc3a749 · dc3a749
1 parent 5f35ccc
commit dc3a749
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/test/java/hudson/plugins/promoted_builds/TestingFrameworkTest.java b/src/test/java/hudson/plugins/promoted_builds/TestingFrameworkTest.java
@@ -8,7 +8,7 @@
 import org.junit.runners.model.Statement;
 import org.jvnet.hudson.test.Issue;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * This is not a regular unit test: it validates the testing framework by making sure we can rely on it

diff --git a/src/test/java/hudson/plugins/promoted_builds/conditions/ManualConditionTest.java b/src/test/java/hudson/plugins/promoted_builds/conditions/ManualConditionTest.java
@@ -41,11 +41,17 @@
 import org.jvnet.hudson.test.JenkinsRule.WebClient;
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
 
-import static org.htmlunit.html.HtmlFormUtil.submit;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.htmlunit.html.HtmlFormUtil.submit;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * @author Kohsuke Kawaguchi