Fix swapped Assert.equals arguments

Author: aaime

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

@@ -41,9 +41,6 @@
 import org.junit.Test;
 import org.w3c.dom.Document;
 
-@SuppressWarnings(
-        "AssertEqualsArgumentOrderChecker") // TODO: several assertEquals calls have the expected and actual values
-// swapped
 public class XMLConfigurationBackwardsCompatibilityTest {
 
     public static final String GWC_125_CONFIG_FILE = "geowebcache_125.xml";
@@ -85,8 +82,8 @@ public void testLoad101() throws Exception {
         assertNotNull(grid);
 
         // The additions in 1.0.1 are allowCacheBypass and backendTimeout
-        assertEquals(layer.getBackendTimeout().intValue(), 60);
-        assertEquals(layer2.getBackendTimeout().intValue(), 235);
+        assertEquals(60, layer.getBackendTimeout().intValue());
+        assertEquals(235, layer2.getBackendTimeout().intValue());
         assertTrue(layer.isCacheBypassAllowed().booleanValue());
         assertFalse(layer2.isCacheBypassAllowed().booleanValue());
     }
@@ -103,18 +100,18 @@ public void testLoad114() throws Exception {
         assertNotNull(grid);
 
         // The additions in 1.0.1 are allowCacheBypass and backendTimeout
-        assertEquals(layer.getBackendTimeout().intValue(), 120);
-        assertEquals(layer2.getBackendTimeout().intValue(), 120);
+        assertEquals(120, layer.getBackendTimeout().intValue());
+        assertEquals(120, layer2.getBackendTimeout().intValue());
         assertTrue(layer.isCacheBypassAllowed().booleanValue());
         assertTrue(layer2.isCacheBypassAllowed().booleanValue());
 
         FormatModifier fm = layer.getFormatModifier(ImageMime.jpeg);
-        assertEquals(fm.getBgColor(), "0xDDDDDD");
-        assertEquals(fm.getRequestFormat(), ImageMime.png);
+        assertEquals("0xDDDDDD", fm.getBgColor());
+        assertEquals(ImageMime.png, fm.getRequestFormat());
 
         List<RequestFilter> filters = layer.getRequestFilters();
-        assertEquals(filters.get(0).getName(), "testWMSRasterFilter");
-        assertEquals(filters.get(1).getName(), "testFileRasterFilter");
+        assertEquals("testWMSRasterFilter", filters.get(0).getName());
+        assertEquals("testFileRasterFilter", filters.get(1).getName());
     }
 
     @Test
@@ -129,20 +126,20 @@ public void testLoad115() throws Exception {
         assertNotNull(grid);
 
         // The additions in 1.0.1 are allowCacheBypass and backendTimeout
-        assertEquals(layer.getBackendTimeout().intValue(), 120);
-        assertEquals(layer2.getBackendTimeout().intValue(), 120);
+        assertEquals(120, layer.getBackendTimeout().intValue());
+        assertEquals(120, layer2.getBackendTimeout().intValue());
         assertTrue(layer.isCacheBypassAllowed().booleanValue());
         assertTrue(layer2.isCacheBypassAllowed().booleanValue());
 
         FormatModifier fm = layer.getFormatModifier(ImageMime.jpeg);
-        assertEquals(fm.getBgColor(), "0xDDDDDD");
-        assertEquals(fm.getRequestFormat(), ImageMime.png);
+        assertEquals("0xDDDDDD", fm.getBgColor());
+        assertEquals(ImageMime.png, fm.getRequestFormat());
 
         List<RequestFilter> filters = layer.getRequestFilters();
         RequestFilter filter0 = filters.get(0);
-        assertEquals(filter0.getName(), "testWMSRasterFilter");
+        assertEquals("testWMSRasterFilter", filter0.getName());
         RequestFilter filter1 = filters.get(1);
-        assertEquals(filter1.getName(), "testFileRasterFilter");
+        assertEquals("testFileRasterFilter", filter1.getName());
     }
 
     @Test

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

@@ -24,7 +24,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-@SuppressWarnings("AssertEqualsArgumentOrderChecker") // TODO: un-swap assertEquals() arguments
 public class MetaTileTest {
 
     GridSetBroker gridSetBroker = new GridSetBroker(Collections.singletonList(new DefaultGridsets(false, false)));
@@ -159,7 +158,7 @@ public void test5MetaTileGutter() throws Exception {
 
         int height = Integer.parseInt(wmsParams.get("HEIGHT"));
 
-        Assert.assertEquals(height, 256 + 50);
+        Assert.assertEquals(256 + 50, height);
 
         long[] midGridPos = {83, 45, 6};
         mt = new WMSMetaTile(
@@ -181,7 +180,7 @@ public void test5MetaTileGutter() throws Exception {
 
         height = Integer.parseInt(wmsParams.get("HEIGHT"));
 
-        Assert.assertEquals(height, 768 + 2 * 50);
+        Assert.assertEquals(768 + 2 * 50, height);
 
         String[] coordStrs = wmsParams.get("BBOX").split(",");
 
@@ -223,7 +222,7 @@ public void test6MetaTileNoGutterWithVector() throws Exception {
 
         int height = Integer.parseInt(wmsParams.get("HEIGHT"));
 
-        Assert.assertEquals(height, 256);
+        Assert.assertEquals(256, height);
     }
 
     private WMSLayer createWMSLayer(BoundingBox layerBounds) {