This is an automated email from the ASF dual-hosted git repository. adelbene pushed a commit to branch wicket-9.x in repository https://gitbox.apache.org/repos/asf/wicket.git
commit d1dfc8ded4ade372284bbea86fbdeb483b23536d Author: Tim te Beek <[email protected]> AuthorDate: Wed Oct 26 09:42:19 2022 +0200 WICKET-7011 Swap assertion arguments to conform to expected vs actual https://issues.apache.org/jira/browse/WICKET-7011 https://github.com/openrewrite/rewrite-testing-frameworks/pull/277 --- .../markup/html/repeater/data/table/DataTableTest.java | 12 ++++++------ .../apache/wicket/proxy/LazyInitProxyFactoryTest.java | 2 +- .../proxy/packageprivate/PackagePrivateTest.java | 2 +- .../apache/wicket/spring/FieldBeansCollectorTest.java | 4 ++-- .../annot/AnnotProxyFieldValueFactoryTest.java | 4 ++-- .../util/convert/converter/LocalDateConverterTest.java | 2 +- .../convert/converter/LocalDateTimeConverterTest.java | 2 +- .../util/convert/converter/LocalTimeConverterTest.java | 2 +- .../convert/converter/ZonedDateTimeConverterTest.java | 2 +- .../apache/wicket/util/resource/ResourceUtilsTest.java | 18 +++++++++--------- .../org/apache/wicket/util/value/ValueMapTest.java | 10 +++++----- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java index 46f8ef86f6..21b293bc66 100644 --- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java @@ -65,16 +65,16 @@ public class DataTableTest extends WicketTestCase String document = tester.getLastResponseAsString(); int index = document.indexOf("<thead"); assertTrue(index != -1, "Expected at least on <thead>"); - index = document.indexOf("<thead", index + 1); - assertEquals(index, -1, "There must be only one <thead>"); + index = document.indexOf("<thead", index + 1); + assertEquals(-1, index, "There must be only one <thead>"); index = document.indexOf("<tbody"); assertTrue(index != -1, "Expected at least on <tbody>"); - index = document.indexOf("<tbody", index + 1); - assertEquals(index, -1, "There must be only one <tbody>"); + index = document.indexOf("<tbody", index + 1); + assertEquals(-1, index, "There must be only one <tbody>"); - index = document.indexOf("<caption", index + 1); - assertEquals(index, -1, "There must be not be <caption>"); + index = document.indexOf("<caption", index + 1); + assertEquals(-1, index, "There must be not be <caption>"); } /** diff --git a/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java index d142e4164d..7d870adaac 100644 --- a/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java +++ b/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java @@ -158,7 +158,7 @@ class LazyInitProxyFactoryTest // test proxy implements ILazyInitProxy assertTrue(proxy instanceof ILazyInitProxy); final IProxyTargetLocator objectLocator = ((ILazyInitProxy) proxy).getObjectLocator(); - assertSame(objectLocator, concreteObjectLocator); + assertSame(concreteObjectLocator, objectLocator); // test we do not have a jdk dynamic proxy assertFalse(Proxy.isProxyClass(proxy.getClass())); diff --git a/wicket-ioc/src/test/java/org/apache/wicket/proxy/packageprivate/PackagePrivateTest.java b/wicket-ioc/src/test/java/org/apache/wicket/proxy/packageprivate/PackagePrivateTest.java index f7c82dcdd7..69dec9b364 100644 --- a/wicket-ioc/src/test/java/org/apache/wicket/proxy/packageprivate/PackagePrivateTest.java +++ b/wicket-ioc/src/test/java/org/apache/wicket/proxy/packageprivate/PackagePrivateTest.java @@ -66,7 +66,7 @@ class PackagePrivateTest // test proxy implements ILazyInitProxy assertTrue(proxy instanceof ILazyInitProxy); - assertSame(((ILazyInitProxy)proxy).getObjectLocator(), PACKAGE_PRIVATE_CONCRETE_OBJECT_LOCATOR); + assertSame(PACKAGE_PRIVATE_CONCRETE_OBJECT_LOCATOR, ((ILazyInitProxy)proxy).getObjectLocator()); // test we do not have a jdk dynamic proxy assertFalse(Proxy.isProxyClass(proxy.getClass())); diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java index 1d66b9b697..cb07f35c97 100644 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java +++ b/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java @@ -40,7 +40,7 @@ public class FieldBeansCollectorTest FieldBeansCollector fieldBeansCollector = new FieldBeansCollector(resolvableType); - assertEquals(fieldBeansCollector.getFieldType(), FieldType.LIST); + assertEquals(FieldType.LIST, fieldBeansCollector.getFieldType()); } @Test @@ -51,6 +51,6 @@ public class FieldBeansCollectorTest ResolvableType resolvableType = ResolvableType.forField(field); FieldBeansCollector fieldBeansCollector = new FieldBeansCollector(resolvableType); - assertEquals(fieldBeansCollector.getFieldType(), FieldType.LIST); + assertEquals(FieldType.LIST, fieldBeansCollector.getFieldType()); } } diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java index f913655080..b9070af8c4 100644 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java +++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java @@ -82,7 +82,7 @@ public abstract class AnnotProxyFieldValueFactoryTest field = obj.getClass().getDeclaredField("beanByClass"); proxy = factory.getFieldValue(field, obj); locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator(); - assertEquals(locator.getBeanType(), Bean.class); + assertEquals(Bean.class, locator.getBeanType()); assertSame(locator.getSpringContextLocator(), mockCtxLocator); assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy); @@ -90,7 +90,7 @@ public abstract class AnnotProxyFieldValueFactoryTest proxy = factory.getFieldValue(field, obj); locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator(); assertEquals("somebean", locator.getBeanName()); - assertEquals(locator.getBeanType(), Bean2.class); + assertEquals(Bean2.class, locator.getBeanType()); assertSame(locator.getSpringContextLocator(), mockCtxLocator); assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy); } diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java index f3fc687140..2359912873 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateConverterTest.java @@ -33,7 +33,7 @@ public class LocalDateConverterTest public void convertToString() { LocalDateConverter converter = new LocalDateConverter(); String date = converter.convertToString(LocalDate.of(2016, 7, 11), Locale.ENGLISH); - assertEquals(date, "7/11/16"); + assertEquals("7/11/16", date); } @Test diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java index 821d469e7b..9b3d0be3eb 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java @@ -33,7 +33,7 @@ public class LocalDateTimeConverterTest public void convertToString() { LocalDateTimeConverter converter = new LocalDateTimeConverter(); String date = converter.convertToString(LocalDateTime.of(2016, 7, 11, 1, 2, 3), Locale.ENGLISH); - assertEquals(date, "Jul 11, 2016, 1:02:03 AM"); + assertEquals("Jul 11, 2016, 1:02:03 AM", date); } @Test diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java index 3234e4d20a..14ee7bc9c7 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalTimeConverterTest.java @@ -33,7 +33,7 @@ public class LocalTimeConverterTest public void convertToString() { LocalTimeConverter converter = new LocalTimeConverter(); String time = converter.convertToString(LocalTime.of(1, 2, 3), Locale.ENGLISH); - assertEquals(time, "01:02:03"); + assertEquals("01:02:03", time); } @Test diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java index ad6f7824b3..add4fdf0e3 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java @@ -39,7 +39,7 @@ public class ZonedDateTimeConverterTest public void convertToString() { ZonedDateTimeConverter converter = new ZonedDateTimeConverter(); String date = converter.convertToString(ZonedDateTime.of(2016, 7, 11, 1, 2, 3, 0, zoneUCT), Locale.ENGLISH); - assertEquals(date, "Jul 11, 2016, 1:02:03 AM Coordinated Universal Time"); + assertEquals("Jul 11, 2016, 1:02:03 AM Coordinated Universal Time", date); } @Test diff --git a/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java index 89e935df34..a58a200d88 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/resource/ResourceUtilsTest.java @@ -35,27 +35,27 @@ public class ResourceUtilsTest ResourceUtils.PathLocale pathLocale; pathLocale = ResourceUtils.getLocaleFromFilename("some.ext"); - assertEquals(pathLocale.path, "some.ext"); + assertEquals("some.ext", pathLocale.path); assertNull(pathLocale.locale); pathLocale = ResourceUtils.getLocaleFromFilename("some.min.ext"); - assertEquals(pathLocale.path, "some.min.ext"); + assertEquals("some.min.ext", pathLocale.path); assertNull(pathLocale.locale); pathLocale = ResourceUtils.getLocaleFromFilename("some.min_en.ext"); - assertEquals(pathLocale.path, "some.min.ext"); - assertEquals(pathLocale.locale, Locale.ENGLISH); + assertEquals("some.min.ext", pathLocale.path); + assertEquals(Locale.ENGLISH, pathLocale.locale); pathLocale = ResourceUtils.getLocaleFromFilename("some_fr_CA.min.ext"); - assertEquals(pathLocale.path, "some.min.ext"); - assertEquals(pathLocale.locale, Locale.CANADA_FRENCH); + assertEquals("some.min.ext", pathLocale.path); + assertEquals(Locale.CANADA_FRENCH, pathLocale.locale); String localeVariant = "blah"; pathLocale = ResourceUtils .getLocaleFromFilename("some_fr_CA_" + localeVariant + ".min.ext"); - assertEquals(pathLocale.path, "some.min.ext"); - assertEquals(pathLocale.locale.getLanguage(), "fr"); - assertEquals(pathLocale.locale.getCountry(), "CA"); + assertEquals("some.min.ext", pathLocale.path); + assertEquals("fr", pathLocale.locale.getLanguage()); + assertEquals("CA", pathLocale.locale.getCountry()); assertEquals(pathLocale.locale.getVariant(), localeVariant); } } diff --git a/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java index 4c95b79290..85e53f026e 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/value/ValueMapTest.java @@ -130,18 +130,18 @@ public class ValueMapTest String name = "name"; TestEnum fetch = TestEnum.valueOf("one"); - assertEquals(fetch, TestEnum.one); + assertEquals(TestEnum.one, fetch); ValueMap vm = new ValueMap(); vm.put(name, "one"); // test get TestEnum test = vm.getAsEnum(name, TestEnum.class, TestEnum.three); - assertEquals(test, TestEnum.one); + assertEquals(TestEnum.one, test); // test get alternate test = vm.getAsEnum(name, TestEnum.three); - assertEquals(test, TestEnum.one); + assertEquals(TestEnum.one, test); // test get alternate null try @@ -156,7 +156,7 @@ public class ValueMapTest // test get if nothing there test = vm.getAsEnum("missing", TestEnum.class, TestEnum.two); - assertEquals(test, TestEnum.two); + assertEquals(TestEnum.two, test); test = vm.getAsEnum("missing", TestEnum.class, null); assertNull(test); @@ -167,7 +167,7 @@ public class ValueMapTest // test get if value doesn't match enum vm.put(name, "bogus"); test = vm.getAsEnum(name, TestEnum.class, TestEnum.one); - assertEquals(test, TestEnum.one); + assertEquals(TestEnum.one, test); } /**
