From 724cc6e45372a458452e9250a1e65bc6b5c9353d Mon Sep 17 00:00:00 2001 From: Steve Ikeoka Date: Thu, 18 Jul 2024 09:39:39 -0700 Subject: [PATCH] [GWC-1293] Upgrade junit from 4.12 to 4.13.2 --- .../XMLConfigurationLayerConformanceWithArcGisLayersTest.java | 2 +- .../test/java/org/geowebcache/GeoWebCacheDispatcherTest.java | 2 +- .../test/java/org/geowebcache/GeoWebCacheExtensionsTest.java | 2 +- .../src/test/java/org/geowebcache/MockExtensionRuleTest.java | 2 +- .../blobstore/file/FileBlobStoreComformanceTest.java | 2 +- .../java/org/geowebcache/config/BlobStoreConfigurationTest.java | 2 +- .../src/test/java/org/geowebcache/config/ConfigurationTest.java | 2 +- .../DefaultGridsetsConfigurationGridsetConformanceTest.java | 2 +- .../java/org/geowebcache/config/GridSetConfigurationTest.java | 2 +- .../java/org/geowebcache/config/LayerConfigurationTest.java | 2 +- .../java/org/geowebcache/config/ServerConfigurationTest.java | 2 +- .../geowebcache/config/XMLConfigurationConstructorsTest.java | 2 +- .../config/XMLConfigurationLayerConformanceTest.java | 2 +- .../test/java/org/geowebcache/config/XMLConfigurationTest.java | 2 +- .../org/geowebcache/config/XMLConfigurationXSchemaTest.java | 2 +- .../org/geowebcache/config/legends/LegendInfoBuilderTest.java | 2 +- .../geowebcache/filter/parameters/FloatParameterFilterTest.java | 2 +- .../filter/parameters/IntegerParameterFilterTest.java | 2 +- .../org/geowebcache/filter/parameters/ParametersUtilsTest.java | 2 +- .../geowebcache/filter/parameters/RegexParameterFilterTest.java | 2 +- .../filter/parameters/StringParameterFilterTest.java | 2 +- .../src/test/java/org/geowebcache/grid/DefaultGridSetsTest.java | 2 +- .../src/test/java/org/geowebcache/grid/GridSetBrokerTest.java | 2 +- .../core/src/test/java/org/geowebcache/grid/GridSetTest.java | 2 +- .../src/test/java/org/geowebcache/layer/wms/TileLayerTest.java | 2 +- .../src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java | 2 +- .../test/java/org/geowebcache/seed/TruncateBboxRequestTest.java | 2 +- .../java/org/geowebcache/storage/AbstractBlobStoreTest.java | 2 +- .../java/org/geowebcache/storage/BlobStoreSuitabilityTest.java | 2 +- .../java/org/geowebcache/storage/CompositeBlobStoreTest.java | 2 +- .../test/java/org/geowebcache/storage/TransientCacheTest.java | 2 +- .../core/src/test/java/org/geowebcache/util/FileUtilsTest.java | 2 +- .../test/java/org/geowebcache/diskquota/BDBQuotaStoreTest.java | 2 +- .../java/org/geowebcache/diskquota/jdbc/JDBCQuotaStoreTest.java | 2 +- geowebcache/pom.xml | 2 +- .../org/geowebcache/s3/OnlineS3BlobStoreIntegrationTest.java | 2 +- .../java/org/geowebcache/s3/S3BlobStoreConfigSerializeTest.java | 2 +- .../src/test/java/org/geowebcache/sqlite/FileManagerTest.java | 2 +- .../test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java | 2 +- .../src/test/java/org/geowebcache/sqlite/MbtilesPBFTest.java | 2 +- .../test/java/org/geowebcache/sqlite/OperationsRestTest.java | 2 +- .../test/java/org/geowebcache/sqlite/SqliteBlobStoreTest.java | 2 +- .../org/geowebcache/sqlite/SqliteConnectionManagerTest.java | 2 +- .../src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java | 2 +- .../src/test/java/org/geowebcache/swift/SwiftTileTest.java | 2 +- .../test/java/org/geowebcache/jetty/RestIntegrationTest.java | 2 +- .../config/wms/GetCapabilitiesConfigurationTest.java | 2 +- .../wms/GetCapabilitiesGridSetConfigurationConformanceTest.java | 2 +- .../wms/GetCapabilitiesLayerConfigurationConformanceTest.java | 2 +- .../org/geowebcache/service/wms/WMSGetCapabilitiesTest.java | 2 +- .../test/java/org/geowebcache/service/wms/WMSServiceTest.java | 2 +- 51 files changed, 51 insertions(+), 51 deletions(-) diff --git a/geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/layer/XMLConfigurationLayerConformanceWithArcGisLayersTest.java b/geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/layer/XMLConfigurationLayerConformanceWithArcGisLayersTest.java index 101bc4290..963c67b0b 100644 --- a/geowebcache/arcgiscache/src/test/java/org/geowebcache/arcgis/layer/XMLConfigurationLayerConformanceWithArcGisLayersTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/GeoWebCacheDispatcherTest.java b/geowebcache/core/src/test/java/org/geowebcache/GeoWebCacheDispatcherTest.java index baa52a11e..17f657ce4 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/GeoWebCacheDispatcherTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/GeoWebCacheExtensionsTest.java b/geowebcache/core/src/test/java/org/geowebcache/GeoWebCacheExtensionsTest.java index 5d71ef778..9c3837584 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/GeoWebCacheExtensionsTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/MockExtensionRuleTest.java b/geowebcache/core/src/test/java/org/geowebcache/MockExtensionRuleTest.java index 02b6bb7b5..e7803203a 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/MockExtensionRuleTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/blobstore/file/FileBlobStoreComformanceTest.java b/geowebcache/core/src/test/java/org/geowebcache/blobstore/file/FileBlobStoreComformanceTest.java index 0050490bf..23c360614 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/blobstore/file/FileBlobStoreComformanceTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java index 45bbacbd7..c611b99c4 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/ConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/ConfigurationTest.java index 670cc7c15..f8096c4b3 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/ConfigurationTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/DefaultGridsetsConfigurationGridsetConformanceTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/DefaultGridsetsConfigurationGridsetConformanceTest.java index efb7674f4..436092e8d 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/DefaultGridsetsConfigurationGridsetConformanceTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/GridSetConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/GridSetConfigurationTest.java index 1c7737764..9e71c2de4 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/GridSetConfigurationTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/LayerConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/LayerConfigurationTest.java index 99fc1a465..b25d49ef3 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/LayerConfigurationTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/ServerConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/ServerConfigurationTest.java index 3cf82ca5b..bca5a1a94 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/ServerConfigurationTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationConstructorsTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationConstructorsTest.java index 29ddcd7bd..b73f576fb 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationConstructorsTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationLayerConformanceTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationLayerConformanceTest.java index 8ffc3b09f..35179594d 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationLayerConformanceTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationTest.java index 5ca6b1e7f..bc8ddb76b 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationXSchemaTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationXSchemaTest.java index 154138aeb..d162c14a0 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/XMLConfigurationXSchemaTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/legends/LegendInfoBuilderTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/legends/LegendInfoBuilderTest.java index 01e49f63a..9b8d58770 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/config/legends/LegendInfoBuilderTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/FloatParameterFilterTest.java b/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/FloatParameterFilterTest.java index c6e060fe6..625af935a 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/FloatParameterFilterTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/IntegerParameterFilterTest.java b/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/IntegerParameterFilterTest.java index 627ac9673..5d1b5bcb6 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/IntegerParameterFilterTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/ParametersUtilsTest.java b/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/ParametersUtilsTest.java index 5c4efcd9b..50804784a 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/ParametersUtilsTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/RegexParameterFilterTest.java b/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/RegexParameterFilterTest.java index fa68f88da..5bb9665cb 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/RegexParameterFilterTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/RegexParameterFilterTest.java @@ -14,6 +14,7 @@ */ 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; @@ -21,7 +22,6 @@ 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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/StringParameterFilterTest.java b/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/StringParameterFilterTest.java index cf4bc98b3..ff32968d4 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/StringParameterFilterTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/grid/DefaultGridSetsTest.java b/geowebcache/core/src/test/java/org/geowebcache/grid/DefaultGridSetsTest.java index 862d43b1c..f5e1e9edd 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/grid/DefaultGridSetsTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/grid/GridSetBrokerTest.java b/geowebcache/core/src/test/java/org/geowebcache/grid/GridSetBrokerTest.java index eda5ebdbd..c58479295 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/grid/GridSetBrokerTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/grid/GridSetTest.java b/geowebcache/core/src/test/java/org/geowebcache/grid/GridSetTest.java index 0f0be92d2..e6d67c1ed 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/grid/GridSetTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/layer/wms/TileLayerTest.java b/geowebcache/core/src/test/java/org/geowebcache/layer/wms/TileLayerTest.java index cb9ef3fac..69572b58c 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/layer/wms/TileLayerTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java b/geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java index 353bbdaea..10bf8d4b1 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java b/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java index f408ca56a..779fa8c25 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/storage/AbstractBlobStoreTest.java b/geowebcache/core/src/test/java/org/geowebcache/storage/AbstractBlobStoreTest.java index 1f8c0cc5c..5f298eb06 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/storage/AbstractBlobStoreTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/storage/BlobStoreSuitabilityTest.java b/geowebcache/core/src/test/java/org/geowebcache/storage/BlobStoreSuitabilityTest.java index a553c74dc..2ae7ac0b1 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/storage/BlobStoreSuitabilityTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/storage/CompositeBlobStoreTest.java b/geowebcache/core/src/test/java/org/geowebcache/storage/CompositeBlobStoreTest.java index 5b229946e..e49aa12ee 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/storage/CompositeBlobStoreTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/storage/TransientCacheTest.java b/geowebcache/core/src/test/java/org/geowebcache/storage/TransientCacheTest.java index d1a045eb2..6314f0f45 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/storage/TransientCacheTest.java +++ b/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; diff --git a/geowebcache/core/src/test/java/org/geowebcache/util/FileUtilsTest.java b/geowebcache/core/src/test/java/org/geowebcache/util/FileUtilsTest.java index 4876b67b2..b687312bd 100644 --- a/geowebcache/core/src/test/java/org/geowebcache/util/FileUtilsTest.java +++ b/geowebcache/core/src/test/java/org/geowebcache/util/FileUtilsTest.java @@ -14,9 +14,9 @@ */ package org.geowebcache.util; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.File; diff --git a/geowebcache/diskquota/bdb/src/test/java/org/geowebcache/diskquota/BDBQuotaStoreTest.java b/geowebcache/diskquota/bdb/src/test/java/org/geowebcache/diskquota/BDBQuotaStoreTest.java index cc0fee112..5ca7b76df 100644 --- a/geowebcache/diskquota/bdb/src/test/java/org/geowebcache/diskquota/BDBQuotaStoreTest.java +++ b/geowebcache/diskquota/bdb/src/test/java/org/geowebcache/diskquota/BDBQuotaStoreTest.java @@ -1,6 +1,7 @@ package org.geowebcache.diskquota; import static org.easymock.EasyMock.newCapture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; @@ -8,7 +9,6 @@ import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; import java.io.File; import java.math.BigInteger; diff --git a/geowebcache/diskquota/jdbc/src/test/java/org/geowebcache/diskquota/jdbc/JDBCQuotaStoreTest.java b/geowebcache/diskquota/jdbc/src/test/java/org/geowebcache/diskquota/jdbc/JDBCQuotaStoreTest.java index 42f718c8d..68681994b 100644 --- a/geowebcache/diskquota/jdbc/src/test/java/org/geowebcache/diskquota/jdbc/JDBCQuotaStoreTest.java +++ b/geowebcache/diskquota/jdbc/src/test/java/org/geowebcache/diskquota/jdbc/JDBCQuotaStoreTest.java @@ -1,12 +1,12 @@ package org.geowebcache.diskquota.jdbc; import static org.easymock.EasyMock.newCapture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertArrayEquals; 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 static org.junit.Assert.fail; diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml index 5289dd93c..ecfce958b 100644 --- a/geowebcache/pom.xml +++ b/geowebcache/pom.xml @@ -271,7 +271,7 @@ junit junit - 4.12 + 4.13.2 test diff --git a/geowebcache/s3storage/src/test/java/org/geowebcache/s3/OnlineS3BlobStoreIntegrationTest.java b/geowebcache/s3storage/src/test/java/org/geowebcache/s3/OnlineS3BlobStoreIntegrationTest.java index 4f2d61eb8..ded8a671a 100644 --- a/geowebcache/s3storage/src/test/java/org/geowebcache/s3/OnlineS3BlobStoreIntegrationTest.java +++ b/geowebcache/s3storage/src/test/java/org/geowebcache/s3/OnlineS3BlobStoreIntegrationTest.java @@ -12,8 +12,8 @@ */ package org.geowebcache.s3; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; import org.junit.Assume; import org.junit.Rule; diff --git a/geowebcache/s3storage/src/test/java/org/geowebcache/s3/S3BlobStoreConfigSerializeTest.java b/geowebcache/s3storage/src/test/java/org/geowebcache/s3/S3BlobStoreConfigSerializeTest.java index 77b3ba395..75ff635c1 100644 --- a/geowebcache/s3storage/src/test/java/org/geowebcache/s3/S3BlobStoreConfigSerializeTest.java +++ b/geowebcache/s3storage/src/test/java/org/geowebcache/s3/S3BlobStoreConfigSerializeTest.java @@ -14,10 +14,10 @@ */ package org.geowebcache.s3; +import static org.hamcrest.MatcherAssert.assertThat; 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 com.amazonaws.services.s3.model.CannedAccessControlList; import com.thoughtworks.xstream.XStream; diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/FileManagerTest.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/FileManagerTest.java index f617c457e..a87d8c3c3 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/FileManagerTest.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/FileManagerTest.java @@ -17,10 +17,10 @@ import static org.geowebcache.sqlite.Utils.Tuple; import static org.geowebcache.sqlite.Utils.Tuple.tuple; import static org.geowebcache.sqlite.Utils.tuplesToMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; import java.io.File; import java.util.Collections; diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java index c802e1e4e..4c96eba65 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesBlobStoreTest.java @@ -15,12 +15,12 @@ package org.geowebcache.sqlite; import static org.geowebcache.sqlite.Utils.Tuple.tuple; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; import java.io.File; import java.util.ArrayList; diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesPBFTest.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesPBFTest.java index f32335bcc..dee3cd857 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesPBFTest.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/MbtilesPBFTest.java @@ -14,8 +14,8 @@ */ package org.geowebcache.sqlite; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.File; diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/OperationsRestTest.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/OperationsRestTest.java index 36ff6e9c8..5e9452bc9 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/OperationsRestTest.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/OperationsRestTest.java @@ -15,9 +15,9 @@ package org.geowebcache.sqlite; import static org.geowebcache.sqlite.Utils.Tuple.tuple; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import java.io.File; diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteBlobStoreTest.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteBlobStoreTest.java index 8c9cc418f..ffe8d517f 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteBlobStoreTest.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteBlobStoreTest.java @@ -14,9 +14,9 @@ */ package org.geowebcache.sqlite; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertThat; import java.io.File; import java.nio.file.Files; diff --git a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteConnectionManagerTest.java b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteConnectionManagerTest.java index d472f3d07..365159b50 100644 --- a/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteConnectionManagerTest.java +++ b/geowebcache/sqlite/src/test/java/org/geowebcache/sqlite/SqliteConnectionManagerTest.java @@ -16,10 +16,10 @@ import static org.geowebcache.sqlite.Utils.Tuple; import static org.geowebcache.sqlite.Utils.Tuple.tuple; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; import java.io.File; import java.sql.Connection; diff --git a/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java b/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java index 69bd95161..f57025c84 100644 --- a/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java +++ b/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftBlobStoreTest.java @@ -15,11 +15,11 @@ package org.geowebcache.swift; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertArrayEquals; 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; import static org.mockito.Mockito.any; diff --git a/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftTileTest.java b/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftTileTest.java index 39467aca8..484c6c6e7 100644 --- a/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftTileTest.java +++ b/geowebcache/swiftblob/src/test/java/org/geowebcache/swift/SwiftTileTest.java @@ -15,7 +15,7 @@ package org.geowebcache.swift; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyLong; diff --git a/geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java b/geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java index 8c458010d..1cd0ef6b5 100644 --- a/geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java +++ b/geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java @@ -16,6 +16,7 @@ */ package org.geowebcache.jetty; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.describedAs; import static org.hamcrest.Matchers.either; @@ -23,7 +24,6 @@ import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import java.io.File; import java.io.IOException; diff --git a/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesConfigurationTest.java b/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesConfigurationTest.java index deb6615c1..dd0e012a0 100644 --- a/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesConfigurationTest.java +++ b/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesConfigurationTest.java @@ -21,12 +21,12 @@ import static org.easymock.EasyMock.newCapture; 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.hamcrest.Matchers.notNullValue; import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; import static org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase; -import static org.junit.Assert.assertThat; import com.google.common.collect.Sets; import java.util.Collections; diff --git a/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesGridSetConfigurationConformanceTest.java b/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesGridSetConfigurationConformanceTest.java index 31d463070..2c2f5b55d 100644 --- a/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesGridSetConfigurationConformanceTest.java +++ b/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesGridSetConfigurationConformanceTest.java @@ -18,8 +18,8 @@ import static org.easymock.EasyMock.expect; import static org.geowebcache.util.TestUtils.assertPresent; import static org.geowebcache.util.TestUtils.requirePresent; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; import com.google.common.base.Objects; import java.util.Collections; diff --git a/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesLayerConfigurationConformanceTest.java b/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesLayerConfigurationConformanceTest.java index b35af388b..2b6ab66c9 100644 --- a/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesLayerConfigurationConformanceTest.java +++ b/geowebcache/wms/src/test/java/org/geowebcache/config/wms/GetCapabilitiesLayerConfigurationConformanceTest.java @@ -16,8 +16,8 @@ import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; import java.util.Collections; import java.util.LinkedList; diff --git a/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSGetCapabilitiesTest.java b/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSGetCapabilitiesTest.java index 2e1adfc23..f7df04eec 100644 --- a/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSGetCapabilitiesTest.java +++ b/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSGetCapabilitiesTest.java @@ -3,9 +3,9 @@ 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.containsString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertThat; import java.io.StringReader; import java.nio.charset.StandardCharsets; diff --git a/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSServiceTest.java b/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSServiceTest.java index 4a672d0c8..3b2d3239d 100644 --- a/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSServiceTest.java +++ b/geowebcache/wms/src/test/java/org/geowebcache/service/wms/WMSServiceTest.java @@ -1,5 +1,6 @@ package org.geowebcache.service.wms; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasProperty; @@ -9,7 +10,6 @@ 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 static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.eq;