diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java index 1c469274c2..36c0c4be39 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -126,7 +126,7 @@ public class DefinitionMetadataEqualsHashCodeTests { assertThat(equal.hashCode()).as("Hash code for equal instances should match").isEqualTo(master.hashCode()); assertThat(notEqual).as("Should not be equal").isNotEqualTo(master); - assertThat(notEqual.hashCode()).as("Hash code for non-equal instances should not match").isNotEqualTo((long) master.hashCode()); + assertThat(notEqual.hashCode()).as("Hash code for non-equal instances should not match").isNotEqualTo(master.hashCode()); assertThat(subclass).as("Subclass should be equal").isEqualTo(master); assertThat(subclass.hashCode()).as("Hash code for subclass should match").isEqualTo(master.hashCode()); diff --git a/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java b/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java index 160aa064fb..6f5220f277 100644 --- a/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java +++ b/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ class MethodParameterTests { Method method = getClass().getMethod("method", String.class, Long.TYPE); MethodParameter methodParameter = new MethodParameter(method, 0); assertThat(methodParameter.hashCode()).isEqualTo(stringParameter.hashCode()); - assertThat(methodParameter.hashCode()).isNotEqualTo((long) longParameter.hashCode()); + assertThat(methodParameter.hashCode()).isNotEqualTo(longParameter.hashCode()); } @Test diff --git a/spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java b/spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java index 52b1c77f3d..a1eea09131 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/SynthesizingMethodParameterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -86,7 +86,7 @@ class SynthesizingMethodParameterTests { Method method = getClass().getMethod("method", String.class, Long.TYPE); SynthesizingMethodParameter methodParameter = new SynthesizingMethodParameter(method, 0); assertThat(methodParameter.hashCode()).isEqualTo(stringParameter.hashCode()); - assertThat(methodParameter.hashCode()).isNotEqualTo((long) longParameter.hashCode()); + assertThat(methodParameter.hashCode()).isNotEqualTo(longParameter.hashCode()); } @Test diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java index faa5878003..c651d41d47 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,8 +89,8 @@ public class ReflectionHelperTests extends AbstractExpressionTests { assertThat(tv1).isNotEqualTo(tv3); assertThat(tv2).isNotEqualTo(tv3); assertThat(tv2.hashCode()).isEqualTo(tv1.hashCode()); - assertThat(tv3.hashCode()).isNotEqualTo((long) tv1.hashCode()); - assertThat(tv3.hashCode()).isNotEqualTo((long) tv2.hashCode()); + assertThat(tv3.hashCode()).isNotEqualTo(tv1.hashCode()); + assertThat(tv3.hashCode()).isNotEqualTo(tv2.hashCode()); } @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java index 3311f14443..26bac7594c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java @@ -55,14 +55,14 @@ class MergedContextConfigurationTests { void hashCodeWithNulls() { MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(null, null, null, null, null); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(null, null, null, null, null); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test void hashCodeWithNullArrays() { MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), null, null, null, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), null, null, null, loader); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test @@ -71,7 +71,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test @@ -80,7 +80,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, new AnnotationConfigContextLoader()); - assertThat(mergedConfig2.hashCode()).isNotEqualTo((long) mergedConfig1.hashCode()); + assertThat(mergedConfig2.hashCode()).isNotEqualTo(mergedConfig1.hashCode()); } @Test @@ -90,7 +90,7 @@ class MergedContextConfigurationTests { EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), locations, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test @@ -101,7 +101,7 @@ class MergedContextConfigurationTests { EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), locations2, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); - assertThat(mergedConfig2.hashCode()).isNotEqualTo((long) mergedConfig1.hashCode()); + assertThat(mergedConfig2.hashCode()).isNotEqualTo(mergedConfig1.hashCode()); } @Test @@ -111,7 +111,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, classes, EMPTY_STRING_ARRAY, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, classes, EMPTY_STRING_ARRAY, loader); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test @@ -122,7 +122,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, classes1, EMPTY_STRING_ARRAY, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, classes2, EMPTY_STRING_ARRAY, loader); - assertThat(mergedConfig2.hashCode()).isNotEqualTo((long) mergedConfig1.hashCode()); + assertThat(mergedConfig2.hashCode()).isNotEqualTo(mergedConfig1.hashCode()); } @Test @@ -132,7 +132,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles, loader); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test @@ -143,7 +143,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader); - assertThat(mergedConfig2.hashCode()).isNotEqualTo((long) mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test @@ -154,7 +154,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test @@ -165,7 +165,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader); - assertThat(mergedConfig2.hashCode()).isNotEqualTo((long) mergedConfig1.hashCode()); + assertThat(mergedConfig2.hashCode()).isNotEqualTo(mergedConfig1.hashCode()); } @Test @@ -184,7 +184,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } @Test @@ -201,7 +201,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader); - assertThat(mergedConfig2.hashCode()).isNotEqualTo((long) mergedConfig1.hashCode()); + assertThat(mergedConfig2.hashCode()).isNotEqualTo(mergedConfig1.hashCode()); } /** @@ -216,7 +216,7 @@ class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent); - assertThat(mergedConfig2.hashCode()).isEqualTo(mergedConfig1.hashCode()); + assertThat(mergedConfig2).hasSameHashCodeAs(mergedConfig1); } /** @@ -233,7 +233,7 @@ class MergedContextConfigurationTests { EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent1); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent2); - assertThat(mergedConfig2.hashCode()).isNotEqualTo((long) mergedConfig1.hashCode()); + assertThat(mergedConfig2.hashCode()).isNotEqualTo(mergedConfig1.hashCode()); } @Test diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestIntegrationTests.java index 901180f5e1..8e0ca6179c 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ class ServerHttpRequestIntegrationTests extends AbstractHttpHandlerIntegrationTe URI uri = request.getURI(); assertThat(uri.getScheme()).isEqualTo("http"); assertThat(uri.getHost()).isNotNull(); - assertThat(uri.getPort()).isNotEqualTo((long) -1); + assertThat(uri.getPort()).isNotEqualTo(-1); assertThat(request.getRemoteAddress()).isNotNull(); assertThat(uri.getPath()).isEqualTo("/foo"); assertThat(uri.getQuery()).isEqualTo("param=bar"); diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpsRequestIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpsRequestIntegrationTests.java index 0599911088..b8deed7afa 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpsRequestIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpsRequestIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,7 +95,7 @@ class ServerHttpsRequestIntegrationTests { URI uri = request.getURI(); assertThat(uri.getScheme()).isEqualTo("https"); assertThat(uri.getHost()).isNotNull(); - assertThat(uri.getPort()).isNotEqualTo((long) -1); + assertThat(uri.getPort()).isNotEqualTo(-1); assertThat(request.getRemoteAddress()).isNotNull(); assertThat(uri.getPath()).isEqualTo("/foo"); assertThat(uri.getQuery()).isEqualTo("param=bar"); diff --git a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java index 6f03200068..67e063dab7 100644 --- a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternParserTests.java @@ -109,12 +109,11 @@ public class PathPatternParserTests { assertThat(pp2).isEqualTo(pp1); assertThat(pp2.hashCode()).isEqualTo(pp1.hashCode()); assertThat(pp3).isNotEqualTo(pp1); - assertThat(pp1.equals("abc")).isFalse(); pp1 = caseInsensitiveParser.parse("/abc"); pp2 = caseSensitiveParser.parse("/abc"); assertThat(pp1.equals(pp2)).isFalse(); - assertThat(pp2.hashCode()).isNotEqualTo((long) pp1.hashCode()); + assertThat(pp2.hashCode()).isNotEqualTo(pp1.hashCode()); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java index cb5020949b..badbb70024 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java @@ -233,7 +233,7 @@ public class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = paths("/foo").methods(RequestMethod.GET, RequestMethod.POST) .params("foo=bar").headers("foo=bar") @@ -242,7 +242,7 @@ public class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = paths("/foo").methods(RequestMethod.GET) .params("/NOOOOOO").headers("foo=bar") @@ -251,7 +251,7 @@ public class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = paths("/foo").methods(RequestMethod.GET) .params("foo=bar").headers("/NOOOOOO") @@ -260,7 +260,7 @@ public class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = paths("/foo").methods(RequestMethod.GET) .params("foo=bar").headers("foo=bar") @@ -269,7 +269,7 @@ public class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = paths("/foo").methods(RequestMethod.GET) .params("foo=bar").headers("foo=bar") @@ -278,7 +278,7 @@ public class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = paths("/foo").methods(RequestMethod.GET) .params("foo=bar").headers("foo=bar") @@ -287,7 +287,7 @@ public class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java index a6c0187c49..3a8bca0742 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java @@ -251,7 +251,7 @@ class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = infoBuilder.paths("/foo").methods(GET, RequestMethod.POST) .params("foo=bar", "customFoo=customBar").headers("foo=bar") @@ -259,7 +259,7 @@ class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = infoBuilder.paths("/foo").methods(GET) .params("/NOOOOOO", "customFoo=customBar").headers("foo=bar") @@ -267,7 +267,7 @@ class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = infoBuilder.paths("/foo").methods(GET) .params("foo=bar", "customFoo=customBar").headers("/NOOOOOO") @@ -275,7 +275,7 @@ class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = infoBuilder.paths("/foo").methods(GET) .params("foo=bar", "customFoo=customBar").headers("foo=bar") @@ -283,7 +283,7 @@ class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = infoBuilder.paths("/foo").methods(GET) .params("foo=bar", "customFoo=customBar").headers("foo=bar") @@ -291,7 +291,7 @@ class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); info2 = infoBuilder.paths("/foo").methods(GET) .params("foo=bar", "customFoo=NOOOOOO").headers("foo=bar") @@ -299,7 +299,7 @@ class RequestMappingInfoTests { .build(); assertThat(info1.equals(info2)).isFalse(); - assertThat(info2.hashCode()).isNotEqualTo((long) info1.hashCode()); + assertThat(info2.hashCode()).isNotEqualTo(info1.hashCode()); } @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptorTests.java index e724ce8594..a53ef5c118 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class OriginHandshakeInterceptorTests extends AbstractHttpRequestTests { List allowed = Collections.singletonList("https://mydomain1.example"); OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(allowed); assertThat(interceptor.beforeHandshake(request, response, wsHandler, attributes)).isTrue(); - assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo((long) servletResponse.getStatus()); + assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo(servletResponse.getStatus()); } @Test @@ -75,7 +75,7 @@ public class OriginHandshakeInterceptorTests extends AbstractHttpRequestTests { List allowed = Arrays.asList("https://mydomain1.example", "https://mydomain2.example", "http://mydomain3.example"); OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(allowed); assertThat(interceptor.beforeHandshake(request, response, wsHandler, attributes)).isTrue(); - assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo((long) servletResponse.getStatus()); + assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo(servletResponse.getStatus()); } @Test @@ -104,7 +104,7 @@ public class OriginHandshakeInterceptorTests extends AbstractHttpRequestTests { OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(); interceptor.setAllowedOrigins(Collections.singletonList("*")); assertThat(interceptor.beforeHandshake(request, response, wsHandler, attributes)).isTrue(); - assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo((long) servletResponse.getStatus()); + assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo(servletResponse.getStatus()); } @Test @@ -113,7 +113,7 @@ public class OriginHandshakeInterceptorTests extends AbstractHttpRequestTests { this.servletRequest.setServerName("mydomain2.example"); OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(Collections.emptyList()); assertThat(interceptor.beforeHandshake(request, response, wsHandler, attributes)).isTrue(); - assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo((long) servletResponse.getStatus()); + assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo(servletResponse.getStatus()); } @Test @@ -122,7 +122,7 @@ public class OriginHandshakeInterceptorTests extends AbstractHttpRequestTests { this.servletRequest.setServerName("mydomain2.example"); OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(Arrays.asList("http://mydomain1.example")); assertThat(interceptor.beforeHandshake(request, response, wsHandler, attributes)).isTrue(); - assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo((long) servletResponse.getStatus()); + assertThat(HttpStatus.FORBIDDEN.value()).isNotEqualTo(servletResponse.getStatus()); } @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java index 083e105c01..3a651c015b 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -286,7 +286,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { String sockJsPath = "/websocket"; setRequest("GET", sockJsPrefix + sockJsPath); wsService.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); - assertThat(this.servletResponse.getStatus()).isNotEqualTo((long) 403); + assertThat(this.servletResponse.getStatus()).isNotEqualTo(403); resetRequestAndResponse(); List allowed = Collections.singletonList("https://mydomain1.example"); @@ -295,7 +295,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { setRequest("GET", sockJsPrefix + sockJsPath); this.servletRequest.addHeader(HttpHeaders.ORIGIN, "https://mydomain1.example"); wsService.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); - assertThat(this.servletResponse.getStatus()).isNotEqualTo((long) 403); + assertThat(this.servletResponse.getStatus()).isNotEqualTo(403); resetRequestAndResponse(); setRequest("GET", sockJsPrefix + sockJsPath); @@ -309,7 +309,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { String sockJsPath = "/iframe.html"; setRequest("GET", sockJsPrefix + sockJsPath); this.service.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); - assertThat(this.servletResponse.getStatus()).isNotEqualTo((long) 404); + assertThat(this.servletResponse.getStatus()).isNotEqualTo(404); assertThat(this.servletResponse.getHeader("X-Frame-Options")).isEqualTo("SAMEORIGIN"); resetRequestAndResponse(); @@ -323,7 +323,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { setRequest("GET", sockJsPrefix + sockJsPath); this.service.setAllowedOrigins(Collections.singletonList("*")); this.service.handleRequest(this.request, this.response, sockJsPath, this.wsHandler); - assertThat(this.servletResponse.getStatus()).isNotEqualTo((long) 404); + assertThat(this.servletResponse.getStatus()).isNotEqualTo(404); assertThat(this.servletResponse.getHeader("X-Frame-Options")).isNull(); }