[GWC-1293] Upgrade junit from 4.12 to 4.13.2

geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/layer/XMLConfigurationLayerConformanceWithArcGisLayersTest.java

@@ -15,8 +15,8 @@
 package org.geowebcache.arcgis.layer;
 
 import static org.geowebcache.util.TestUtils.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasProperty;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

geowebcache/core/src/test/java/org/geowebcache/GeoWebCacheDispatcherTest.java

@@ -15,7 +15,7 @@
 package org.geowebcache;
 
 import static org.geowebcache.TestHelpers.hasStatus;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Collections;
 import javax.servlet.http.HttpServletResponse;

geowebcache/core/src/test/java/org/geowebcache/GeoWebCacheExtensionsTest.java

@@ -4,12 +4,12 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;

geowebcache/core/src/test/java/org/geowebcache/MockExtensionRuleTest.java

@@ -14,11 +14,11 @@
  */
 package org.geowebcache;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
 
 import java.util.Collection;
 import org.hamcrest.Matchers;

geowebcache/core/src/test/java/org/geowebcache/blobstore/file/FileBlobStoreComformanceTest.java

@@ -14,9 +14,9 @@
  */
 package org.geowebcache.blobstore.file;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;

geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java

@@ -19,13 +19,13 @@
 import static org.easymock.EasyMock.verify;
 import static org.geowebcache.util.TestUtils.isPresent;
 import static org.geowebcache.util.TestUtils.notPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
 import java.util.Collection;

geowebcache/core/src/test/java/org/geowebcache/config/ConfigurationTest.java

@@ -18,11 +18,11 @@
 import static org.geowebcache.util.TestUtils.isPresent;
 import static org.geowebcache.util.TestUtils.notPresent;
 import static org.geowebcache.util.TestUtils.requirePresent;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.util.ArrayList;
 import java.util.Collection;

geowebcache/core/src/test/java/org/geowebcache/config/DefaultGridsetsConfigurationGridsetConformanceTest.java

@@ -14,8 +14,8 @@
  */
 package org.geowebcache.config;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
 
 import org.geowebcache.grid.GridSet;
 import org.hamcrest.CustomMatcher;

geowebcache/core/src/test/java/org/geowebcache/config/GridSetConfigurationTest.java

@@ -14,8 +14,8 @@
  */
 package org.geowebcache.config;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
 
 import java.util.Collection;
 import java.util.Optional;

geowebcache/core/src/test/java/org/geowebcache/config/LayerConfigurationTest.java

@@ -14,8 +14,8 @@
  */
 package org.geowebcache.config;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
 
 import java.util.Collection;
 import java.util.Optional;

geowebcache/core/src/test/java/org/geowebcache/config/ServerConfigurationTest.java

@@ -14,12 +14,12 @@
  */
 package org.geowebcache.config;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasProperty;
 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.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;

geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationConstructorsTest.java

@@ -21,7 +21,7 @@
 import static org.easymock.EasyMock.verify;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationLayerConformanceTest.java

@@ -15,8 +15,8 @@
 package org.geowebcache.config;
 
 import static org.geowebcache.util.TestUtils.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasProperty;
-import static org.junit.Assert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationTest.java

@@ -17,6 +17,7 @@
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -27,7 +28,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;

geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationXSchemaTest.java

@@ -14,8 +14,8 @@
  */
 package org.geowebcache.config;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertThat;
 
 import com.thoughtworks.xstream.XStream;
 import java.util.Collections;

geowebcache/core/src/test/java/org/geowebcache/config/legends/LegendInfoBuilderTest.java

@@ -14,9 +14,9 @@
  */
 package org.geowebcache.config.legends;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 

geowebcache/core/src/test/java/org/geowebcache/filter/parameters/FloatParameterFilterTest.java

@@ -14,12 +14,12 @@
  */
 package org.geowebcache.filter.parameters;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import com.thoughtworks.xstream.XStream;

geowebcache/core/src/test/java/org/geowebcache/filter/parameters/IntegerParameterFilterTest.java

@@ -14,12 +14,12 @@
  */
 package org.geowebcache.filter.parameters;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import com.thoughtworks.xstream.XStream;

geowebcache/core/src/test/java/org/geowebcache/filter/parameters/ParametersUtilsTest.java

@@ -14,10 +14,10 @@
  */
 package org.geowebcache.filter.parameters;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
-import static org.junit.Assert.assertThat;
 
 import java.util.Collections;
 import java.util.Map;

geowebcache/core/src/test/java/org/geowebcache/filter/parameters/RegexParameterFilterTest.java

@@ -14,14 +14,14 @@
  */
 package org.geowebcache.filter.parameters;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

geowebcache/core/src/test/java/org/geowebcache/filter/parameters/StringParameterFilterTest.java

@@ -14,13 +14,13 @@
  */
 package org.geowebcache.filter.parameters;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import com.thoughtworks.xstream.XStream;

geowebcache/core/src/test/java/org/geowebcache/grid/DefaultGridSetsTest.java

@@ -14,10 +14,10 @@
  */
 package org.geowebcache.grid;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import org.geowebcache.config.DefaultGridsets;

geowebcache/core/src/test/java/org/geowebcache/grid/GridSetBrokerTest.java

@@ -16,6 +16,7 @@
 
 import static org.geowebcache.util.TestUtils.isPresent;
 import static org.geowebcache.util.TestUtils.notPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasProperty;
@@ -24,7 +25,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

geowebcache/core/src/test/java/org/geowebcache/grid/GridSetTest.java

@@ -1,10 +1,10 @@
 package org.geowebcache.grid;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertThat;
 
 import java.util.Collections;
 import org.geowebcache.config.DefaultGridsets;

geowebcache/core/src/test/java/org/geowebcache/layer/wms/TileLayerTest.java

@@ -1,11 +1,11 @@
 package org.geowebcache.layer.wms;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.equalToIgnoringCase;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.Collection;

geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java

@@ -22,10 +22,10 @@
 import static org.geowebcache.TestHelpers.createRequest;
 import static org.geowebcache.TestHelpers.createWMSLayer;
 import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.awt.Color;

geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java

@@ -15,12 +15,12 @@
 package org.geowebcache.seed;
 
 import static org.easymock.EasyMock.eq;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.any;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.Collections;

geowebcache/core/src/test/java/org/geowebcache/storage/AbstractBlobStoreTest.java

@@ -21,6 +21,7 @@
 import static org.easymock.EasyMock.geq;
 import static org.easymock.EasyMock.isNull;
 import static org.geowebcache.util.FileMatchers.resource;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.describedAs;
 import static org.hamcrest.Matchers.empty;
@@ -30,7 +31,6 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;

geowebcache/core/src/test/java/org/geowebcache/storage/BlobStoreSuitabilityTest.java

@@ -14,10 +14,10 @@
  */
 package org.geowebcache.storage;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.either;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
 
 import org.hamcrest.Matcher;

geowebcache/core/src/test/java/org/geowebcache/storage/CompositeBlobStoreTest.java

@@ -14,13 +14,13 @@
  */
 package org.geowebcache.storage;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;

geowebcache/core/src/test/java/org/geowebcache/storage/TransientCacheTest.java

@@ -15,11 +15,11 @@
 
 package org.geowebcache.storage;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
 
 import com.google.common.base.Ticker;
 import java.io.InputStream;