wicket-bean-validation / wicket-ioc / wicket-spring / wicket-velocity : Migrate to Junit5 WicketTestTag.java : Add proerty to distinguish slow tests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7d07e19d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7d07e19d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7d07e19d Branch: refs/heads/master Commit: 7d07e19d3c3844320fc3de1f70f67a21ff4fbae6 Parents: 645f239 Author: renoth <[email protected]> Authored: Fri Aug 31 23:55:25 2018 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 26 15:37:45 2018 +0300 ---------------------------------------------------------------------- .../validation/DefaultPropertyResolverTest.java | 177 ++++++++++--------- .../PropertyValidatorRequiredTest.java | 27 ++- .../validation/ValidationModelResolverTest.java | 23 +-- .../CompoundFieldValueFactoryTest.java | 20 +-- .../apache/wicket/injection/InjectorTest.java | 19 +- .../injection/NoopFieldValueFactoryTest.java | 11 +- .../wicket/proxy/LazyInitProxyFactoryTest.java | 27 +-- .../util/tester/SendPayloadWithContextTest.java | 29 ++- .../ws/util/tester/TestWebSocketResource.java | 17 +- .../util/tester/WebSocketBehaviorTestPage.java | 24 +-- .../tester/WebSocketTesterBehaviorTest.java | 23 +-- .../tester/WebSocketTesterProcessorTest.java | 25 +-- ...WebSocketTesterRequestCycleListenerTest.java | 34 ++-- .../tester/WebSocketTesterResourceTest.java | 28 +-- .../wicket/spring/FieldBeansCollectorTest.java | 8 +- .../wicket/spring/SpringBeanLocatorTest.java | 31 ++-- .../spring/SpringWebApplicationFactoryTest.java | 20 ++- .../annot/AnnotProxyFieldValueFactoryTest.java | 35 ++-- ...axInjectAnnotProxyFieldValueFactoryTest.java | 8 +- .../spring/injection/annot/SpringBeanTest.java | 14 +- .../annot/SpringBeanWithGenericsTest.java | 66 ++++--- .../java/org/apache/wicket/util/SlowTests.java | 25 --- .../org/apache/wicket/util/WicketTestTag.java | 25 +++ .../markup/html/velocity/VelocityPanelTest.java | 13 +- .../VelocityJavaScriptContributorTest.java | 5 +- 25 files changed, 381 insertions(+), 353 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java index 1dc6802..932c1d9 100644 --- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java +++ b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/DefaultPropertyResolverTest.java @@ -16,127 +16,112 @@ */ package org.apache.wicket.bean.validation; -import static org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation.CUSTOM_BUNDLE_KEY; -import static org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation.DEFAULT_BUNDLE_KEY; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; - -import java.util.List; -import java.util.Set; +import org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation; +import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.util.tester.WicketTesterExtension; +import org.apache.wicket.validation.ValidationError; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; +import java.util.List; +import java.util.Set; -import org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation; -import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.util.tester.WicketTesterScope; -import org.apache.wicket.validation.ValidationError; -import org.junit.Rule; -import org.junit.Test; +import static org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation.CUSTOM_BUNDLE_KEY; +import static org.apache.wicket.bean.validation.customconstraint.PasswordConstraintAnnotation.DEFAULT_BUNDLE_KEY; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultPropertyResolverTest { - @Rule - public WicketTesterScope scope = new WicketTesterScope(); - - public static class Bean1 - { - private String foo; - - public String getFoo() - { - return foo; - } - } + @RegisterExtension + public WicketTesterExtension scope = new WicketTesterExtension(); @Test - public void hasFieldAndGetter() + void hasFieldAndGetter() { DefaultPropertyResolver resolver = new DefaultPropertyResolver(); - TextField<?> component = new TextField<>("id", new PropertyModel<Bean1>(new Bean1(), "foo")); + TextField<?> component = new TextField<>("id", + new PropertyModel<Bean1>(new Bean1(), "foo")); Property property = resolver.resolveProperty(component); - assertThat(property, not(nullValue())); - assertThat(property.getName(), is("foo")); - assertThat(property.getOwner().getName(), is(Bean1.class.getName())); + assertNotNull(property); + assertEquals("foo", property.getName()); + assertEquals(Bean1.class.getName(), property.getOwner().getName()); } /** * https://issues.apache.org/jira/browse/WICKET-5505 */ @Test - public void booleanHasFieldAndGetter() + void booleanHasFieldAndGetter() { DefaultPropertyResolver resolver = new DefaultPropertyResolver(); - TextField<?> component = new TextField<>("id", new PropertyModel<BooleanBean>( - new BooleanBean(), "foo")); + TextField<?> component = new TextField<>("id", + new PropertyModel<BooleanBean>(new BooleanBean(), "foo")); Property property = resolver.resolveProperty(component); - assertThat(property, not(nullValue())); - assertThat(property.getName(), is("foo")); - assertThat(property.getOwner().getName(), is(BooleanBean.class.getName())); + assertNotNull(property); + assertEquals("foo", property.getName()); + assertEquals(BooleanBean.class.getName(), property.getOwner().getName()); } @Test - public void hasOnlyField() + void hasOnlyField() { DefaultPropertyResolver resolver = new DefaultPropertyResolver(); - TextField<?> component = new TextField<>("id", new PropertyModel<Bean2>(new Bean2(), "foo")); + TextField<?> component = new TextField<>("id", + new PropertyModel<Bean2>(new Bean2(), "foo")); Property property = resolver.resolveProperty(component); - assertThat(property, not(nullValue())); - assertThat(property.getName(), is("foo")); - assertThat(property.getOwner().getName(), is(Bean2.class.getName())); - } - - public static class Bean2 - { - private String foo; + assertNotNull(property); + assertEquals("foo", property.getName()); + assertEquals(Bean2.class.getName(), property.getOwner().getName()); } @Test - public void hasOnlyGetter() + void hasOnlyGetter() { DefaultPropertyResolver resolver = new DefaultPropertyResolver(); - TextField<?> component = new TextField<>("id", new PropertyModel<Bean3>(new Bean3(), "foo")); + TextField<?> component = new TextField<>("id", + new PropertyModel<Bean3>(new Bean3(), "foo")); Property property = resolver.resolveProperty(component); - assertThat(property, not(nullValue())); - assertThat(property.getName(), is("foo")); - assertThat(property.getOwner().getName(), is(Bean3.class.getName())); + assertNotNull(property); + assertEquals("foo", property.getName()); + assertEquals(Bean3.class.getName(), property.getOwner().getName()); } /** * https://issues.apache.org/jira/browse/WICKET-5506 */ @Test - public void getterHasPriorityOverField() + void getterHasPriorityOverField() { DefaultPropertyResolver resolver = new DefaultPropertyResolver(); - TextField<?> component = new TextField<>("id", new PropertyModel<Bean4>(new Bean4(), "foo")); + TextField<?> component = new TextField<>("id", + new PropertyModel<Bean4>(new Bean4(), "foo")); Property property = resolver.resolveProperty(component); - assertThat(property, not(nullValue())); - assertThat(property.getName(), is("foo")); - assertThat(property.getOwner().getName(), is(Bean4.class.getName())); + assertNotNull(property); + assertEquals("foo", property.getName()); + assertEquals(Bean4.class.getName(), property.getOwner().getName()); } /** * Test custom bundle mechanism of jsr 303 - * + * * https://issues.apache.org/jira/browse/WICKET-5654 - * + * * @throws Exception */ @Test - public void testBundleKeysResolution() throws Exception + void testBundleKeysResolution() throws Exception { ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); Validator validator = factory.getValidator(); @@ -163,7 +148,8 @@ public class DefaultPropertyResolverTest assertEquals(1, constraintViolations.size()); @SuppressWarnings("unchecked") - ConstraintViolation<BeanWithPassword> nonWordviolation = (ConstraintViolation<BeanWithPassword>)constraintViolations.toArray()[0]; + ConstraintViolation<BeanWithPassword> nonWordviolation = (ConstraintViolation<BeanWithPassword>)constraintViolations + .toArray()[0]; error = translator.convert(nonWordviolation); @@ -180,7 +166,7 @@ public class DefaultPropertyResolverTest /** * Checks that validation error has the expected keys as bundle keys, in the order they are * specified in {@code expectedKeys}. - * + * * @param error * @param expectedKeys */ @@ -188,8 +174,8 @@ public class DefaultPropertyResolverTest { List<String> keys = error.getKeys(); - assertEquals("The expected number for bundle keys is '" + expectedKeys.length - + "' but we have '" + keys.size() + "'", expectedKeys.length, keys.size()); + assertEquals(expectedKeys.length, keys.size(), "The expected number for bundle keys is '" + + expectedKeys.length + "' but we have '" + keys.size() + "'"); for (int i = 0; i < expectedKeys.length; i++) { @@ -199,6 +185,21 @@ public class DefaultPropertyResolverTest } } + public static class Bean1 + { + private String foo; + + public String getFoo() + { + return foo; + } + } + + public static class Bean2 + { + private String foo; + } + public static class Bean3 { public String getFoo() @@ -225,25 +226,25 @@ public class DefaultPropertyResolverTest return "foo4"; } } - + public static class BeanWithPassword - { - @PasswordConstraintAnnotation - private String password; - - public BeanWithPassword(String password) - { - this.password = password; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - } + { + @PasswordConstraintAnnotation + private String password; + + public BeanWithPassword(String password) + { + this.password = password; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java index 118b3fa..4e56c9b 100644 --- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java +++ b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java @@ -1,14 +1,5 @@ package org.apache.wicket.bean.validation; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.List; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; @@ -20,14 +11,22 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTester; -import org.apache.wicket.util.tester.WicketTesterScope; -import org.junit.Rule; -import org.junit.Test; +import org.apache.wicket.util.tester.WicketTesterExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PropertyValidatorRequiredTest { - @Rule - public WicketTesterScope scope = new WicketTesterScope() + @RegisterExtension + public WicketTesterExtension scope = new WicketTesterExtension() { protected WicketTester create() { http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java index cefb2e9..a174ed4 100644 --- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java +++ b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/ValidationModelResolverTest.java @@ -4,10 +4,13 @@ import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.IPropertyReflectionAwareModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.util.tester.WicketTesterScope; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import org.apache.wicket.util.tester.WicketTesterExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author alexander.v.morozov @@ -15,21 +18,21 @@ import org.junit.Test; public class ValidationModelResolverTest { - @Rule - public WicketTesterScope scope = new WicketTesterScope(); + @RegisterExtension + public WicketTesterExtension scope = new WicketTesterExtension(); @Test public void noModelBoundToComponent() { TextField<String> textField = new TextField<String>("field"); - Assert.assertNull(ValidationModelResolver.resolvePropertyModelFrom(textField)); + assertNull(ValidationModelResolver.resolvePropertyModelFrom(textField)); } @Test public void simpleModelBoundToComponent() { TextField<String> textField = new TextField<String>("text", new Model<String>()); - Assert.assertNull(ValidationModelResolver.resolvePropertyModelFrom(textField)); + assertNull(ValidationModelResolver.resolvePropertyModelFrom(textField)); } @Test @@ -37,8 +40,8 @@ public class ValidationModelResolverTest { TextField<String> textField = new TextField<String>("text", new PropertyModel<String>(new TestValidatableBean(), "text")); IPropertyReflectionAwareModel<?> model = ValidationModelResolver.resolvePropertyModelFrom(textField); - Assert.assertNotNull(model); - Assert.assertEquals("text", model.getPropertyField().getName()); + assertNotNull(model); + assertEquals("text", model.getPropertyField().getName()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java ---------------------------------------------------------------------- diff --git a/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java index f4eadbf..d8b5bcb 100644 --- a/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java +++ b/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java @@ -16,19 +16,19 @@ */ package org.apache.wicket.injection; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * Test {@link CompoundFieldValueFactory} @@ -36,7 +36,7 @@ import org.junit.Test; * @author Igor Vaynberg (ivaynberg) * */ -public class CompoundFieldValueFactoryTest extends Assert +public class CompoundFieldValueFactoryTest { private Integer testField; @@ -48,7 +48,7 @@ public class CompoundFieldValueFactoryTest extends Assert * * @throws Exception */ - @Before + @BeforeEach public void before() throws Exception { CompoundFieldValueFactoryTest.class.getDeclaredField("testField"); http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java ---------------------------------------------------------------------- diff --git a/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java b/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java index 63dd10d..9089371 100644 --- a/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java +++ b/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java @@ -16,12 +16,13 @@ */ package org.apache.wicket.injection; -import java.lang.reflect.Field; - import org.apache.wicket.injection.util.MockDependency; import org.apache.wicket.injection.util.TestObject; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import java.lang.reflect.Field; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests {@link Injector} @@ -29,7 +30,7 @@ import org.junit.Test; * @author Igor Vaynberg (ivaynberg) * */ -public class InjectorTest extends Assert +public class InjectorTest { private static MockDependency dependency = new MockDependency("inject"); @@ -70,10 +71,10 @@ public class InjectorTest extends Assert new TestInjector().inject(testObject, factory); - assertEquals(testObject.getDependency1().getMessage(), "inject"); - assertEquals(testObject.getDependency2().getMessage(), "dont-inject"); - assertEquals(testObject.getDependency3().getMessage(), "dont-inject"); - assertEquals(testObject.getDependency4().getMessage(), "inject"); + assertEquals("inject", testObject.getDependency1().getMessage()); + assertEquals("dont-inject", testObject.getDependency2().getMessage()); + assertEquals("dont-inject", testObject.getDependency3().getMessage()); + assertEquals("inject", testObject.getDependency4().getMessage()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java ---------------------------------------------------------------------- diff --git a/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java index 06ec9d6..fa95618 100644 --- a/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java +++ b/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java @@ -16,11 +16,12 @@ */ package org.apache.wicket.injection; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import java.lang.reflect.Field; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertNull; /** * Test {@link NoopFieldValueFactory} @@ -28,7 +29,7 @@ import org.junit.Test; * @author Igor Vaynberg (ivaynberg) * */ -public class NoopFieldValueFactoryTest extends Assert +public class NoopFieldValueFactoryTest { private Field field; @@ -38,7 +39,7 @@ public class NoopFieldValueFactoryTest extends Assert /** * @throws Exception */ - @Before + @BeforeEach public void before() throws Exception { NoopFieldValueFactoryTest.class.getDeclaredField("testField"); http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java ---------------------------------------------------------------------- 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 60bab12..5483ce4 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 @@ -16,10 +16,6 @@ */ package org.apache.wicket.proxy; -import static org.hamcrest.CoreMatchers.instanceOf; - -import java.lang.reflect.Proxy; - import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.proxy.LazyInitProxyFactory.ProxyReplacement; import org.apache.wicket.proxy.util.ConcreteObject; @@ -27,8 +23,15 @@ import org.apache.wicket.proxy.util.IInterface; import org.apache.wicket.proxy.util.IObjectMethodTester; import org.apache.wicket.proxy.util.InterfaceObject; import org.apache.wicket.proxy.util.ObjectMethodTester; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import java.lang.reflect.Proxy; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests lazy init proxy factory @@ -36,7 +39,7 @@ import org.junit.Test; * @author Igor Vaynberg (ivaynberg) * */ -public class LazyInitProxyFactoryTest extends Assert +public class LazyInitProxyFactoryTest { private static InterfaceObject interfaceObject = new InterfaceObject("interface"); @@ -102,7 +105,7 @@ public class LazyInitProxyFactoryTest extends Assert assertTrue(Proxy.isProxyClass(proxy.getClass())); // test proxy implements ILazyInitProxy - assertThat(proxy, instanceOf(ILazyInitProxy.class)); + assertTrue(proxy instanceof ILazyInitProxy); assertTrue(((ILazyInitProxy)proxy).getObjectLocator() == interfaceObjectLocator); // test method invocation @@ -146,8 +149,8 @@ public class LazyInitProxyFactoryTest extends Assert ConcreteObject.class, concreteObjectLocator); // test proxy implements ILazyInitProxy - assertThat(proxy, instanceOf(ILazyInitProxy.class)); - assertTrue(((ILazyInitProxy)proxy).getObjectLocator() == concreteObjectLocator); + assertTrue(proxy instanceof ILazyInitProxy); + assertSame(((ILazyInitProxy) proxy).getObjectLocator(), concreteObjectLocator); // test we do not have a jdk dynamic proxy assertFalse(Proxy.isProxyClass(proxy.getClass())); @@ -157,7 +160,7 @@ public class LazyInitProxyFactoryTest extends Assert // test serialization ConcreteObject proxy2 = WicketObjects.cloneObject(proxy); - assertTrue(proxy != proxy2); + assertNotSame(proxy, proxy2); assertEquals(proxy2.getMessage(), "concrete"); // test equals/hashcode method interception @@ -200,7 +203,7 @@ public class LazyInitProxyFactoryTest extends Assert PackagePrivateConcreteObject.class, PACKAGE_PRIVATE_CONCRETE_OBJECT_LOCATOR); // test proxy implements ILazyInitProxy - assertThat(proxy, instanceOf(ILazyInitProxy.class)); + assertTrue(proxy instanceof ILazyInitProxy); assertTrue(((ILazyInitProxy)proxy).getObjectLocator() == PACKAGE_PRIVATE_CONCRETE_OBJECT_LOCATOR); // test we do not have a jdk dynamic proxy http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java index db4f6c3..53429d8 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java @@ -16,11 +16,6 @@ */ package org.apache.wicket.protocol.ws.util.tester; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; - -import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; @@ -31,10 +26,14 @@ import org.apache.wicket.protocol.ws.api.message.TextMessage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.concurrent.atomic.AtomicBoolean; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test for https://issues.apache.org/jira/browse/WICKET-5627. @@ -42,13 +41,13 @@ import org.junit.Test; * * @since 6.17.0 */ -public class SendPayloadWithContextTest extends Assert +public class SendPayloadWithContextTest { final AtomicBoolean context = new AtomicBoolean(false); WicketTester tester; - @Before + @BeforeEach public void before() { tester = new WicketTester(); @@ -64,7 +63,7 @@ public class SendPayloadWithContextTest extends Assert }); } - @After + @AfterEach public void after() { tester.destroy(); @@ -80,12 +79,12 @@ public class SendPayloadWithContextTest extends Assert @Override protected void onOutMessage(String message) { - assertThat(Boolean.parseBoolean(message), is(equalTo(Boolean.TRUE))); + assertTrue(Boolean.parseBoolean(message)); } }; - assertThat(context.get(), is(false)); + assertFalse(context.get()); webSocketTester.sendMessage("trigger web socket communication"); - assertThat(context.get(), is(false)); + assertFalse(context.get()); webSocketTester.destroy(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java index 276c566..e6145cf 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/TestWebSocketResource.java @@ -16,10 +16,6 @@ */ package org.apache.wicket.protocol.ws.util.tester; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.wicket.util.string.Strings; -import org.junit.Assert; import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler; import org.apache.wicket.protocol.ws.api.WebSocketResource; import org.apache.wicket.protocol.ws.api.message.AbortedMessage; @@ -27,6 +23,11 @@ import org.apache.wicket.protocol.ws.api.message.BinaryMessage; import org.apache.wicket.protocol.ws.api.message.ClosedMessage; import org.apache.wicket.protocol.ws.api.message.ConnectedMessage; import org.apache.wicket.protocol.ws.api.message.TextMessage; +import org.apache.wicket.util.string.Strings; + +import java.util.concurrent.atomic.AtomicBoolean; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @@ -90,7 +91,7 @@ public class TestWebSocketResource extends WebSocketResource super.onMessage(handler, message); String text = message.getText(); - Assert.assertEquals(expectedMessage, text); + assertEquals(expectedMessage, text); handler.push(Strings.capitalize(text)); } @@ -103,9 +104,9 @@ public class TestWebSocketResource extends WebSocketResource int offset = binaryMessage.getOffset(); int length = binaryMessage.getLength(); - Assert.assertEquals(expectedBinaryMessage, data); - Assert.assertEquals(expectedOffset, offset); - Assert.assertEquals(expectedLength, length); + assertEquals(expectedBinaryMessage, data); + assertEquals(expectedOffset, offset); + assertEquals(expectedLength, length); handler.push(data, offset, length); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java index b00ed25..a6a03bd 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java @@ -16,22 +16,22 @@ */ package org.apache.wicket.protocol.ws.util.tester; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; - import org.apache.wicket.MarkupContainer; -import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.protocol.ws.api.WebSocketBehavior; +import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler; import org.apache.wicket.protocol.ws.api.message.BinaryMessage; import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage; import org.apache.wicket.protocol.ws.api.message.TextMessage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.string.Strings; -import org.hamcrest.CoreMatchers; -import org.junit.Assert; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * A page used for {@link WebSocketTesterBehaviorTest} @@ -53,7 +53,7 @@ class WebSocketBehaviorTestPage extends WebPage implements IMarkupResourceStream protected void onMessage(WebSocketRequestHandler handler, TextMessage message) { // assert the inbould message - Assert.assertThat(message.getText(), is(equalTo(expectedMessage))); + assertEquals(expectedMessage, message.getText()); // now send an outbound message handler.push(Strings.capitalize(expectedMessage)); @@ -68,9 +68,9 @@ class WebSocketBehaviorTestPage extends WebPage implements IMarkupResourceStream @Override protected void onMessage(WebSocketRequestHandler handler, BinaryMessage binaryMessage) { - Assert.assertArrayEquals(message, binaryMessage.getData()); - Assert.assertEquals(offset, binaryMessage.getOffset()); - Assert.assertEquals(length, binaryMessage.getLength()); + assertArrayEquals(binaryMessage.getData(), message); + assertEquals(offset, binaryMessage.getOffset()); + assertEquals(length, binaryMessage.getLength()); String msg = new String(message); byte[] pushedMessage = Strings.capitalize(msg).getBytes(); @@ -87,9 +87,9 @@ class WebSocketBehaviorTestPage extends WebPage implements IMarkupResourceStream @Override protected void onPush(WebSocketRequestHandler handler, IWebSocketPushMessage message) { - Assert.assertThat(message, CoreMatchers.instanceOf(WebSocketTesterBehaviorTest.BroadcastMessage.class)); + assertTrue(message instanceof WebSocketTesterBehaviorTest.BroadcastMessage); WebSocketTesterBehaviorTest.BroadcastMessage broadcastMessage = (WebSocketTesterBehaviorTest.BroadcastMessage) message; - Assert.assertSame(expectedMessage, broadcastMessage); + assertSame(expectedMessage, broadcastMessage); String pushedMessage = broadcastMessage.getText().toUpperCase(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java index 241047e..10a82df 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java @@ -16,17 +16,20 @@ */ package org.apache.wicket.protocol.ws.util.tester; -import java.io.UnsupportedEncodingException; -import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage; import org.apache.wicket.protocol.ws.api.registry.PageIdKey; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.UnsupportedEncodingException; +import java.util.concurrent.atomic.AtomicBoolean; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for WebSocketTester. @@ -34,17 +37,17 @@ import org.junit.Test; * * @since 6.0 */ -public class WebSocketTesterBehaviorTest extends Assert +public class WebSocketTesterBehaviorTest { WicketTester tester; - @Before + @BeforeEach public void before() { tester = new WicketTester(); } - @After + @AfterEach public void after() { tester.destroy(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java index 0a7dd10..0b807fb 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java @@ -16,11 +16,6 @@ */ package org.apache.wicket.protocol.ws.util.tester; -import java.util.Arrays; -import java.util.concurrent.atomic.AtomicBoolean; - -import javax.servlet.http.HttpServletRequest; - import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.protocol.http.mock.MockHttpServletRequest; @@ -28,15 +23,21 @@ import org.apache.wicket.protocol.ws.WebSocketSettings; import org.apache.wicket.protocol.ws.api.WebSocketConnectionOriginFilter; import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for https://issues.apache.org/jira/browse/WICKET-5860 */ -public class WebSocketTesterProcessorTest extends Assert +public class WebSocketTesterProcessorTest { final static AtomicBoolean messageReceived = new AtomicBoolean(false); @@ -72,14 +73,14 @@ public class WebSocketTesterProcessorTest extends Assert } }; - @Before + @BeforeEach public void before() { tester = new WicketTester(application); application.getWicketFilter().setFilterPath(""); } - @After + @AfterEach public void after() { tester.destroy(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java index d6701e7..562da94 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterRequestCycleListenerTest.java @@ -16,18 +16,18 @@ */ package org.apache.wicket.protocol.ws.util.tester; -import static org.hamcrest.CoreMatchers.is; - -import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.wicket.request.cycle.IRequestCycleListener; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.concurrent.atomic.AtomicBoolean; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for WebSocketTester. @@ -35,7 +35,7 @@ import org.junit.Test; * * @since 6.18.0 */ -public class WebSocketTesterRequestCycleListenerTest extends Assert +public class WebSocketTesterRequestCycleListenerTest { private final AtomicBoolean beginRequestCalled = new AtomicBoolean(false); private final AtomicBoolean endRequestCalled = new AtomicBoolean(false); @@ -43,7 +43,7 @@ public class WebSocketTesterRequestCycleListenerTest extends Assert private WicketTester tester; - @Before + @BeforeEach public void before() { tester = new WicketTester(); @@ -69,7 +69,7 @@ public class WebSocketTesterRequestCycleListenerTest extends Assert }); } - @After + @AfterEach public void after() { tester.destroy(); @@ -103,16 +103,16 @@ public class WebSocketTesterRequestCycleListenerTest extends Assert }; // assert and reset - assertThat(beginRequestCalled.compareAndSet(true, false), is(true)); - assertThat(endRequestCalled.compareAndSet(true, false), is(true)); - assertThat(detachCalled.compareAndSet(true, false), is(true)); + assertTrue(beginRequestCalled.compareAndSet(true, false)); + assertTrue(endRequestCalled.compareAndSet(true, false)); + assertTrue(detachCalled.compareAndSet(true, false)); // broadcasts WebSocket.TextMessage and notifies the listeners webSocketTester.sendMessage(expectedMessage); - assertThat(beginRequestCalled.get(), is(true)); - assertThat(endRequestCalled.get(), is(true)); - assertThat(detachCalled.get(), is(true)); + assertTrue(beginRequestCalled.get()); + assertTrue(endRequestCalled.get()); + assertTrue(detachCalled.get()); webSocketTester.destroy(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java index d64c35d..e39bedc 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java @@ -16,16 +16,20 @@ */ package org.apache.wicket.protocol.ws.util.tester; -import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.concurrent.atomic.AtomicBoolean; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for WebSocketTester. @@ -33,7 +37,7 @@ import org.junit.Test; * * @since 6.0 */ -public class WebSocketTesterResourceTest extends Assert +public class WebSocketTesterResourceTest { private static final String EXPECTED_TEXT = "expected text"; private static final byte[] EXPECTED_BINARY = new byte[] {1, 2, 3}; @@ -45,7 +49,7 @@ public class WebSocketTesterResourceTest extends Assert WicketTester tester; - @Before + @BeforeEach public void before() { TestWebSocketResource.ON_CONNECT_CALLED.set(false); @@ -70,7 +74,7 @@ public class WebSocketTesterResourceTest extends Assert tester = new WicketTester(application); } - @After + @AfterEach public void after() { tester.destroy(); @@ -123,9 +127,9 @@ public class WebSocketTesterResourceTest extends Assert protected void onOutMessage(byte[] message, int offset, int length) { ON_OUT_BINARY_CALLED.set(true); - Assert.assertArrayEquals(EXPECTED_BINARY, message); - Assert.assertEquals(offset, offset); - Assert.assertEquals(length, length); + assertArrayEquals(EXPECTED_BINARY, message); + assertEquals(offset, offset); + assertEquals(length, length); } }; http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/FieldBeansCollectorTest.java ---------------------------------------------------------------------- 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 62597f4..9d098e4 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 @@ -16,14 +16,14 @@ */ package org.apache.wicket.spring; -import static org.junit.Assert.assertTrue; +import org.apache.wicket.spring.FieldBeansCollector.FieldType; +import org.junit.jupiter.api.Test; +import org.springframework.core.ResolvableType; import java.lang.reflect.Field; import java.util.List; -import org.apache.wicket.spring.FieldBeansCollector.FieldType; -import org.junit.Test; -import org.springframework.core.ResolvableType; +import static org.junit.jupiter.api.Assertions.assertTrue; public class FieldBeansCollectorTest http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java index 0e09953..20800a3 100644 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java +++ b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java @@ -19,9 +19,14 @@ package org.apache.wicket.spring; import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.spring.test.ApplicationContextMock; import org.apache.wicket.spring.test.SpringContextLocatorMock; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests {@link SpringBeanLocator} @@ -29,7 +34,7 @@ import org.junit.Test; * @author ivaynberg * */ -public class SpringBeanLocatorTest extends Assert +public class SpringBeanLocatorTest { private ApplicationContextMock ctx; @@ -38,7 +43,7 @@ public class SpringBeanLocatorTest extends Assert /** * */ - @Before + @BeforeEach public void before() { ctx = new ApplicationContextMock(); @@ -56,7 +61,7 @@ public class SpringBeanLocatorTest extends Assert ctx.putBean("bean", bean); SpringBeanLocator locator = new SpringBeanLocator(Bean.class, ctxLocator); - assertTrue(locator.locateProxyTarget() == bean); + assertSame(locator.locateProxyTarget(), bean); } /** @@ -126,7 +131,7 @@ public class SpringBeanLocatorTest extends Assert ctx.putBean("bean", bean); SpringBeanLocator locator = new SpringBeanLocator("bean", Bean.class, ctxLocator); - assertTrue(locator.locateProxyTarget() == bean); + assertSame(locator.locateProxyTarget(), bean); } @@ -230,19 +235,19 @@ public class SpringBeanLocatorTest extends Assert assertEquals(aprime, a); assertEquals(a.hashCode(), aprime.hashCode()); - assertFalse(a.equals(b)); - assertFalse(a.equals(c)); - assertFalse(b.equals(c)); + assertNotEquals(a, b); + assertNotEquals(a, c); + assertNotEquals(b, c); assertEquals(d, dprime); assertEquals(dprime, d); ctx.putBean("locator", a); // we need to register a Bean of type d.getClass() assertEquals(d.hashCode(), dprime.hashCode()); - assertFalse(a.equals(d)); - assertFalse(d.equals(e)); + assertNotEquals(a, d); + assertNotEquals(d, e); - assertFalse(a.equals(ctxLocator)); + assertNotEquals(a, ctxLocator); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java index 89bf3e4..ca3dd81 100644 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java +++ b/wicket-spring/src/test/java/org/apache/wicket/spring/SpringWebApplicationFactoryTest.java @@ -16,26 +16,28 @@ */ package org.apache.wicket.spring; -import java.util.Enumeration; - -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; - import org.apache.wicket.Page; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.protocol.http.WicketFilter; import org.apache.wicket.protocol.http.mock.MockServletContext; import org.apache.wicket.spring.injection.annot.SpringComponentInjector; import org.apache.wicket.util.lang.Packages; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import java.util.Enumeration; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link SpringWebApplicationFactory}. * * @author svenmeier */ -public class SpringWebApplicationFactoryTest extends Assert +public class SpringWebApplicationFactoryTest { /** @@ -52,7 +54,7 @@ public class SpringWebApplicationFactoryTest extends Assert filter.destroy(); - assertTrue("is not destroyed", Destroyable.instance.destroyed); + assertTrue(Destroyable.instance.destroyed, "is not destroyed"); } private class FilterConfigImpl implements FilterConfig http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java ---------------------------------------------------------------------- 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 f8b7a81..f913655 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 @@ -16,10 +16,6 @@ */ package org.apache.wicket.spring.injection.annot; -import static org.hamcrest.CoreMatchers.instanceOf; - -import java.lang.reflect.Field; - import org.apache.wicket.proxy.ILazyInitProxy; import org.apache.wicket.spring.ISpringContextLocator; import org.apache.wicket.spring.SpringBeanLocator; @@ -27,16 +23,23 @@ import org.apache.wicket.spring.injection.util.Bean; import org.apache.wicket.spring.injection.util.Bean2; import org.apache.wicket.spring.injection.util.InjectableInterface; import org.apache.wicket.spring.test.ApplicationContextMock; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; +import java.lang.reflect.Field; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + /** * Tests for BeanAnnotLocatorFactory * * @author igor */ -public abstract class AnnotProxyFieldValueFactoryTest extends Assert +public abstract class AnnotProxyFieldValueFactoryTest { ISpringContextLocator mockCtxLocator = new ISpringContextLocator() { @@ -79,17 +82,17 @@ public abstract class AnnotProxyFieldValueFactoryTest extends Assert field = obj.getClass().getDeclaredField("beanByClass"); proxy = factory.getFieldValue(field, obj); locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator(); - assertTrue(locator.getBeanType().equals(Bean.class)); - assertTrue(locator.getSpringContextLocator() == mockCtxLocator); - assertThat(factory.getFieldValue(field, obj), instanceOf(ILazyInitProxy.class)); + assertEquals(locator.getBeanType(), Bean.class); + assertSame(locator.getSpringContextLocator(), mockCtxLocator); + assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy); field = obj.getClass().getDeclaredField("beanByName"); proxy = factory.getFieldValue(field, obj); locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator(); - assertTrue(locator.getBeanName().equals("somebean")); - assertTrue(locator.getBeanType().equals(Bean2.class)); - assertTrue(locator.getSpringContextLocator() == mockCtxLocator); - assertThat(factory.getFieldValue(field, obj), instanceOf(ILazyInitProxy.class)); + assertEquals("somebean", locator.getBeanName()); + assertEquals(locator.getBeanType(), Bean2.class); + assertSame(locator.getSpringContextLocator(), mockCtxLocator); + assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy); } /** @@ -103,12 +106,12 @@ public abstract class AnnotProxyFieldValueFactoryTest extends Assert Field field = obj.getClass().getDeclaredField("beanByClass"); Object proxy1 = factory.getFieldValue(field, obj); Object proxy2 = factory.getFieldValue(field, obj); - assertTrue(proxy1 == proxy2); + assertSame(proxy1, proxy2); field = obj.getClass().getDeclaredField("beanByName"); proxy1 = factory.getFieldValue(field, obj); proxy2 = factory.getFieldValue(field, obj); - assertTrue(proxy1 == proxy2); + assertSame(proxy1, proxy2); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java index 6d3d9cc..f128366 100644 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java +++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/JavaxInjectAnnotProxyFieldValueFactoryTest.java @@ -16,11 +16,13 @@ */ package org.apache.wicket.spring.injection.annot; -import java.lang.reflect.Field; - import org.apache.wicket.spring.injection.util.JavaxInjectInjectable; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import java.lang.reflect.Field; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for Spring injection with {@literal @javax.inject.Inject} annotation http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java index cc55ea2..4bdea91 100644 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java +++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanTest.java @@ -24,16 +24,20 @@ import org.apache.wicket.spring.SpringBeanLocator; import org.apache.wicket.spring.test.ApplicationContextMock; import org.apache.wicket.util.tester.DummyHomePage; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for SpringBean. * * @author Andrea Del Bene */ -public class SpringBeanTest extends Assert +public class SpringBeanTest { private WicketTester tester; private ApplicationContextMock ctx; @@ -41,7 +45,7 @@ public class SpringBeanTest extends Assert /** * @throws Exception */ - @Before + @BeforeEach public void before() throws Exception { tester = new WicketTester(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java index 74dca27..3eea80b 100644 --- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java +++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/SpringBeanWithGenericsTest.java @@ -16,10 +16,14 @@ */ package org.apache.wicket.spring.injection.annot; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; +import org.apache.wicket.spring.BeanWithGeneric; +import org.apache.wicket.util.tester.DummyHomePage; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import java.util.ArrayList; import java.util.Arrays; @@ -27,21 +31,15 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.wicket.spring.BeanWithGeneric; -import org.apache.wicket.util.tester.DummyHomePage; -import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Andrea Del Bene * */ -public class SpringBeanWithGenericsTest extends Assert +public class SpringBeanWithGenericsTest { private WicketTester tester; private AnnotationConfigApplicationContext ctx; @@ -49,7 +47,7 @@ public class SpringBeanWithGenericsTest extends Assert /** * @throws Exception */ - @Before + @BeforeEach public void before() throws Exception { tester = new WicketTester(); @@ -96,11 +94,11 @@ public class SpringBeanWithGenericsTest extends Assert List<BeanWithGeneric<String>> beans = page.getBeans(); - assertThat(beans, is(notNullValue())); - assertThat(beans.size(), is(1)); + assertNotNull(beans); + assertEquals(1, beans.size()); BeanWithGeneric<String> stringBean = (BeanWithGeneric<String>) ctx.getBean("stringBean"); - assertThat(beans, hasItem(stringBean)); + assertTrue(beans.contains(stringBean)); } @Test @@ -142,28 +140,28 @@ public class SpringBeanWithGenericsTest extends Assert List<String> stringsList = page.getStringsList(); assertNotNull(stringsList); assertEquals(3, stringsList.size()); - assertThat(stringsList.get(0), is(equalTo("foo"))); - assertThat(stringsList.get(1), is(equalTo("bar"))); - assertThat(stringsList.get(2), is(equalTo("baz"))); + assertEquals("foo", stringsList.get(0)); + assertEquals("bar", stringsList.get(1)); + assertEquals("baz", stringsList.get(2)); ArrayList<String> arrayListStrings = page.getArrayListStrings(); - assertThat(arrayListStrings, is(notNullValue())); - assertThat(arrayListStrings.size(), is(3)); - assertThat(arrayListStrings.get(0), is(equalTo("one"))); - assertThat(arrayListStrings.get(1), is(equalTo("two"))); - assertThat(arrayListStrings.get(2), is(equalTo("three"))); + assertNotNull(arrayListStrings); + assertEquals(3, arrayListStrings.size()); + assertEquals("one", arrayListStrings.get(0)); + assertEquals("two", arrayListStrings.get(1)); + assertEquals("three", arrayListStrings.get(2)); ArrayList<Integer> arrayListIntegers = page.getArrayListIntegers(); - assertThat(arrayListIntegers, is(notNullValue())); - assertThat(arrayListIntegers.size(), is(3)); - assertThat(arrayListIntegers.get(0), is(1)); - assertThat(arrayListIntegers.get(1), is(2)); - assertThat(arrayListIntegers.get(2), is(3)); + assertNotNull(arrayListIntegers); + assertEquals(3, arrayListIntegers.size()); + assertEquals(Integer.valueOf(1), arrayListIntegers.get(0)); + assertEquals(Integer.valueOf(2), arrayListIntegers.get(1)); + assertEquals(Integer.valueOf(3), arrayListIntegers.get(2)); MyList<String> myList = page.getMyList(); - assertThat(myList, is(notNullValue())); - assertThat(myList.size(), is(1)); - assertThat(myList.get(0), is("one")); + assertNotNull(myList); + assertEquals(1, myList.size()); + assertEquals("one", myList.get(0)); } @Test http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java b/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java deleted file mode 100644 index b67013c..0000000 --- a/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.util; - -/** - * JUnit Category marker. - * Used to mark slow running tests which are not executed with Maven profile 'fast' - */ -public interface SlowTests { - -} http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java b/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java new file mode 100644 index 0000000..cf92bca --- /dev/null +++ b/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.util; + +/** + * JUnit Category marker. + * Used to mark slow running tests which are not executed with Maven profile 'fast' + */ +public interface WicketTestTag { + public static final String SLOW = "SLOW"; +} http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java index 5dc102b..9ead683 100644 --- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java +++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java @@ -17,24 +17,23 @@ package org.apache.wicket.contrib.markup.html.velocity; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for <code>VelocityPanel</code> * * @see org.apache.wicket.velocity.markup.html.VelocityPanel */ -public class VelocityPanelTest extends Assert +public class VelocityPanelTest { WicketTester tester; /** * */ - @Before + @BeforeEach public void before() { tester = new WicketTester(); @@ -43,7 +42,7 @@ public class VelocityPanelTest extends Assert /** * */ - @After + @AfterEach public void after() { tester.destroy(); http://git-wip-us.apache.org/repos/asf/wicket/blob/7d07e19d/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java ---------------------------------------------------------------------- diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java index 13a3282..0ae70a0 100644 --- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java +++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptContributorTest.java @@ -17,13 +17,12 @@ package org.apache.wicket.contrib.velocity; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test header contributions. */ -public class VelocityJavaScriptContributorTest extends Assert +public class VelocityJavaScriptContributorTest { /** * Test that the header contribution is added correctly.
