Merge pull request #234 from StefanSpieker/asserts

Do not use static star asserts imports to fix junit assertThat deprec…
jenkinsci · Sep 16, 2024 · 09f6e98 · 09f6e98
2 parents 2a8a4b7 + 4dfedca
commit 09f6e98
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java
@@ -64,14 +64,22 @@
 import java.util.regex.Pattern;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.TeeOutputStream;
+
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.test.acceptance.docker.Docker;
 import org.jenkinsci.test.acceptance.docker.DockerContainer;
 import org.jenkinsci.test.acceptance.docker.DockerRule;
 import org.jenkinsci.test.acceptance.docker.fixtures.JavaContainer;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.junit.Assume.*;
 import org.junit.After;
 import org.junit.Before;

diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/EncodingTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/EncodingTest.java
@@ -48,12 +48,14 @@
 import java.util.logging.Level;
 import jenkins.security.MasterToSlaveCallable;
 import org.apache.commons.io.output.TeeOutputStream;
+
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import org.jenkinsci.test.acceptance.docker.DockerRule;
 import org.jenkinsci.test.acceptance.docker.fixtures.JavaContainer;
 import org.junit.*;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.*;
 
 import org.junit.runner.RunWith;

diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/PowerShellCoreScriptTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/PowerShellCoreScriptTest.java
@@ -29,10 +29,10 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.jenkinsci.plugins.durabletask.BourneShellScriptTest.assumeDocker;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class PowerShellCoreScriptTest {

diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/PowershellScriptTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/PowershellScriptTest.java
@@ -49,8 +49,10 @@
 import java.util.*;
 import org.apache.commons.io.IOUtils;
 
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(Parameterized.class)
 public class PowershellScriptTest {

diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/WindowsBatchScriptTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/WindowsBatchScriptTest.java
@@ -42,8 +42,10 @@
 import java.io.IOException;
 import java.util.Arrays;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(Parameterized.class)
 public class WindowsBatchScriptTest {