Merge pull request #178 from petrberan/SHRINKRES-314

[SHRINKRES-314] Replace the deprecated Assert methods
shrinkwrap · Nov 3, 2023 · 8158762 · 8158762
2 parents c2de181 + 292b460
commit 8158762
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 34 deletions.
diff --git a/...boss/shrinkwrap/resolver/impl/maven/archive/importer/ConfiguredMavenImporterTestCase.java b/...boss/shrinkwrap/resolver/impl/maven/archive/importer/ConfiguredMavenImporterTestCase.java
@@ -18,9 +18,9 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.contains;
 import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.size;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...a/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/JarMavenImporterTestCase.java b/...a/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/JarMavenImporterTestCase.java
@@ -28,11 +28,10 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.contains;
 import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.size;
 
-import static org.junit.Assert.assertThat;
-
 /**
  * JAR import test case
  *

diff --git a/...test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/ManifestTestCase.java b/...test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/ManifestTestCase.java
@@ -18,9 +18,9 @@
 
 import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.contains;
 import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.hasManifestEntry;
-import static org.junit.Assert.assertThat;
 
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...a/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/WarMavenImporterTestCase.java b/...a/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/WarMavenImporterTestCase.java
@@ -18,9 +18,9 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.contains;
 import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.size;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...s/shrinkwrap/resolver/impl/maven/archive/plugins/CompilerPluginConfigurationTestCase.java b/...s/shrinkwrap/resolver/impl/maven/archive/plugins/CompilerPluginConfigurationTestCase.java
@@ -26,8 +26,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.hasItems;
-
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Test Compiler Plugin configuration

diff --git a/.../test/java/org/jboss/shrinkwrap/resolver/impl/maven/aether/ClassPathScanningTestCase.java b/.../test/java/org/jboss/shrinkwrap/resolver/impl/maven/aether/ClassPathScanningTestCase.java
@@ -19,14 +19,14 @@
 import java.io.File;
 
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.jboss.shrinkwrap.resolver.impl.maven.aether.ClasspathWorkspaceReader.FLATTENED_POM_PATH_KEY;
 import static org.jboss.shrinkwrap.resolver.impl.maven.aether.ClasspathWorkspaceReader.SUREFIRE_CLASS_PATH_KEY;
 
@@ -51,7 +51,7 @@ public void classpathWithDanglingDirs() throws Exception {
 
         // this should not fail
         File file = reader.findArtifact(new DefaultArtifact("foo:bar:1"));
-        Assert.assertThat(file, is(nullValue()));
+        assertThat(file, is(nullValue()));
     }
 
     // create a classpath that contain entries that does not have parent directories
@@ -121,6 +121,6 @@ private void testFindArtifactReturnsNotNull(String testDirName) {
         ClasspathWorkspaceReader reader = new ClasspathWorkspaceReader();
 
         File file = reader.findArtifact(new DefaultArtifact("org.jboss.shrinkwrap.test:" + testDirName + "-child:1.0.0"));
-        Assert.assertThat(file, is(notNullValue()));
+        assertThat(file, is(notNullValue()));
     }
 }
diff --git a/...rg/jboss/shrinkwrap/resolver/impl/maven/bootstrap/DefaultSettingsXmlLocationTestCase.java b/...rg/jboss/shrinkwrap/resolver/impl/maven/bootstrap/DefaultSettingsXmlLocationTestCase.java
@@ -19,6 +19,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
@@ -52,9 +53,9 @@ public void loadDefaultUserSettingsXmlLocation() {
         Assume.assumeThat(System.getProperty("user.home"), is(not(nullValue())));
 
         SettingsBuildingRequest request = createBuildingRequest();
-        Assert.assertThat(request.getUserSettingsFile(), is(not(nullValue())));
+        assertThat(request.getUserSettingsFile(), is(not(nullValue())));
 
-        Assert.assertThat(removeDoubledSeparator(request.getUserSettingsFile().getPath()),
+        assertThat(removeDoubledSeparator(request.getUserSettingsFile().getPath()),
                 is(removeDoubledSeparator(System.getProperty("user.home") + "/.m2/settings.xml".replace('/', File.separatorChar))));
     }
 
@@ -65,9 +66,9 @@ public void loadDefaultGlobalSettingsXmlLocation() {
         Assume.assumeThat(System.getenv("M2_HOME"), is(not(nullValue())));
 
         SettingsBuildingRequest request = createBuildingRequest();
-        Assert.assertThat(request.getGlobalSettingsFile(), is(not(nullValue())));
+        assertThat(request.getGlobalSettingsFile(), is(not(nullValue())));
 
-        Assert.assertThat(removeDoubledSeparator(request.getGlobalSettingsFile().getPath()),
+        assertThat(removeDoubledSeparator(request.getGlobalSettingsFile().getPath()),
                 is(removeDoubledSeparator(System.getenv("M2_HOME") + "/conf/settings.xml".replaceAll("//", "/").replace('/', File.separatorChar))));
     }
 

diff --git a/.../java/org/jboss/shrinkwrap/resolver/impl/maven/integration/AsMavenCoordinateTestCase.java b/.../java/org/jboss/shrinkwrap/resolver/impl/maven/integration/AsMavenCoordinateTestCase.java
@@ -1,6 +1,7 @@
 package org.jboss.shrinkwrap.resolver.impl.maven.integration;
 
 import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
 
@@ -9,7 +10,6 @@
 import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinates;
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -45,7 +45,7 @@ public void asMavenCoordinates() {
         final List<MavenCoordinate> coordinates = Maven.resolver().resolve(artifactCanonicalFormA)
                 .withTransitivity().asList(MavenCoordinate.class);
 
-        Assert.assertThat(coordinates,
+        assertThat(coordinates,
                 hasItem(MavenCoordinates.createCoordinate("org.jboss.shrinkwrap.test:test-deps-b:jar:1.0.0")));
     }
 }
diff --git a/...ven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/AsURLTestCase.java b/...ven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/AsURLTestCase.java
@@ -1,6 +1,7 @@
 package org.jboss.shrinkwrap.resolver.impl.maven.integration;
 
 import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.net.URL;
@@ -9,7 +10,6 @@
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -48,6 +48,6 @@ public void asURLs() throws Exception {
                 System.getProperty(MavenSettingsBuilder.ALT_LOCAL_REPOSITORY_LOCATION),
                 "org/jboss/shrinkwrap/test/test-deps-i/1.0.0/test-deps-i-1.0.0.jar").toURI().toURL();
 
-        Assert.assertThat(coordinates, hasItem(target));
+        assertThat(coordinates, hasItem(target));
     }
 }
diff --git a/...maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/EjbTestCase.java b/...maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/EjbTestCase.java
@@ -22,13 +22,13 @@
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Various tests for EJB packaging
@@ -57,10 +57,10 @@ public void resolveEjbFromCentral() {
                 .withoutTransitivity()
                 .asSingleResolvedArtifact();
 
-        Assert.assertThat(ejb, not(nullValue()));
-        Assert.assertThat(ejb.asFile(), not(nullValue()));
-        Assert.assertThat(ejb.getExtension(), is("jar"));
-        Assert.assertThat(ejb.getCoordinate().getPackaging(), is(PackagingType.EJB));
+        assertThat(ejb, not(nullValue()));
+        assertThat(ejb.asFile(), not(nullValue()));
+        assertThat(ejb.getExtension(), is("jar"));
+        assertThat(ejb.getCoordinate().getPackaging(), is(PackagingType.EJB));
     }
 
     // SHRINKRES-182
@@ -71,10 +71,10 @@ public void resolveEjbFromLocalRepository() {
                 .withoutTransitivity()
                 .asSingleResolvedArtifact();
 
-        Assert.assertThat(ejb, not(nullValue()));
-        Assert.assertThat(ejb.asFile(), not(nullValue()));
-        Assert.assertThat(ejb.getExtension(), is("jar"));
-        Assert.assertThat(ejb.getCoordinate().getPackaging(), is(PackagingType.EJB));
+        assertThat(ejb, not(nullValue()));
+        assertThat(ejb.asFile(), not(nullValue()));
+        assertThat(ejb.getExtension(), is("jar"));
+        assertThat(ejb.getCoordinate().getPackaging(), is(PackagingType.EJB));
     }
 
     // SHRINKRES-182
@@ -85,10 +85,10 @@ public void resolveEjbFromPom() {
                 .importCompileAndRuntimeDependencies()
                 .resolve().withTransitivity().asSingleResolvedArtifact();
 
-        Assert.assertThat(ejb, not(nullValue()));
-        Assert.assertThat(ejb.asFile(), not(nullValue()));
-        Assert.assertThat(ejb.getExtension(), is("jar"));
-        Assert.assertThat(ejb.getCoordinate().getPackaging(), is(PackagingType.EJB));
+        assertThat(ejb, not(nullValue()));
+        assertThat(ejb.asFile(), not(nullValue()));
+        assertThat(ejb.getExtension(), is("jar"));
+        assertThat(ejb.getCoordinate().getPackaging(), is(PackagingType.EJB));
         new ValidationUtil("test-ejb").validate(ejb.asFile());
 
     }

diff --git a/.../test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/ProfilesUnitTestCase.java b/.../test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/ProfilesUnitTestCase.java
@@ -18,6 +18,7 @@
 
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.util.Properties;
@@ -176,8 +177,8 @@ public void testSystemPropertyOverrideFromProfile() {
 
         Properties props = session.getParsedPomFile().getProperties();
 
-        Assert.assertThat(props.keySet(), hasItem("myproperty"));
-        Assert.assertThat(props.getProperty("myproperty"), is("hello"));
+        assertThat(props.keySet(), hasItem("myproperty"));
+        assertThat(props.getProperty("myproperty"), is("hello"));
     }
 
 }
diff --git a/...java/org/jboss/shrinkwrap/resolver/impl/maven/integration/SpringTransitivityTestCase.java b/...java/org/jboss/shrinkwrap/resolver/impl/maven/integration/SpringTransitivityTestCase.java
@@ -7,6 +7,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+
 /**
  * This is a reproducer for SHRINKRES-232 - Resolve from pom.xml: old version is picked
  *
@@ -26,7 +28,7 @@ public void testVersionOfAOP() {
         boolean found = false;
         for (File file : libs){
             if (file.getName().startsWith("spring-aop")) {
-                Assert.assertThat(file.getName(), CoreMatchers.containsString("4.2.1.RELEASE"));
+                assertThat(file.getName(), CoreMatchers.containsString("4.2.1.RELEASE"));
                 found = true;
                 break;
             }