Merge pull request #278 from offa/deprecated_assertions

Replace deprecated assertions
jenkinsci · Jan 17, 2022 · 8d31cfd · 8d31cfd
2 parents 0ff35bc + f97cbff
commit 8d31cfd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/stashNotifier/BuildStatusUriFactoryTest.java b/src/test/java/org/jenkinsci/plugins/stashNotifier/BuildStatusUriFactoryTest.java
@@ -4,8 +4,8 @@
 
 import java.net.URI;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.*;
 
 public class BuildStatusUriFactoryTest {
 

diff --git a/src/test/java/org/jenkinsci/plugins/stashNotifier/ConfigAsCodeTest.java b/src/test/java/org/jenkinsci/plugins/stashNotifier/ConfigAsCodeTest.java
@@ -10,9 +10,9 @@
 import java.io.InputStream;
 import java.net.URL;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
 
 public class ConfigAsCodeTest {
     @Rule

diff --git a/src/test/java/org/jenkinsci/plugins/stashNotifier/DefaultApacheHttpNotifierTest.java b/src/test/java/org/jenkinsci/plugins/stashNotifier/DefaultApacheHttpNotifierTest.java
@@ -38,8 +38,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;

diff --git a/src/test/java/org/jenkinsci/plugins/stashNotifier/DescriptorImplTest.java b/src/test/java/org/jenkinsci/plugins/stashNotifier/DescriptorImplTest.java
@@ -20,10 +20,10 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.Mockito.doNothing;

diff --git a/src/test/java/org/jenkinsci/plugins/stashNotifier/StashNotifierModuleTest.java b/src/test/java/org/jenkinsci/plugins/stashNotifier/StashNotifierModuleTest.java
@@ -8,8 +8,8 @@
 import java.net.URI;
 import java.util.List;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsSame.sameInstance;
-import static org.junit.Assert.*;
 
 public class StashNotifierModuleTest {
     private final StashNotifierModule module = new StashNotifierModule();

diff --git a/src/test/java/org/jenkinsci/plugins/stashNotifier/StashNotifierTest.java b/src/test/java/org/jenkinsci/plugins/stashNotifier/StashNotifierTest.java
@@ -47,10 +47,10 @@
 import java.util.Collections;
 import java.util.List;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;