From b7b34610da7f2bf8d45e95a1c3ad7f9e1badb327 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 27 Mar 2019 12:57:02 +0100 Subject: [PATCH] URL Cleanup - Fix broken tests See gh-22673 --- .../converter/feed/RssChannelHttpMessageConverterTests.java | 4 ++-- .../web/servlet/config/MvcNamespaceTests.java | 6 +++--- .../socket/config/HandlersBeanDefinitionParserTests.java | 6 +++--- .../config/MessageBrokerBeanDefinitionParserTests.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java index 94b797d638f..09a37926522 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2019 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. @@ -69,7 +69,7 @@ public class RssChannelHttpMessageConverterTests { inputMessage.getHeaders().setContentType(new MediaType("application", "rss+xml", StandardCharsets.UTF_8)); Channel result = converter.read(Channel.class, inputMessage); assertEquals("title", result.getTitle()); - assertEquals("http://example.com", result.getLink()); + assertEquals("https://example.com", result.getLink()); assertEquals("description", result.getDescription()); List items = result.getItems(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 6068fb1fdfd..d2fb559bef7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2019 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. @@ -922,14 +922,14 @@ public class MvcNamespaceTests { assertEquals(2, configs.size()); CorsConfiguration config = configs.get("/api/**"); assertNotNull(config); - assertArrayEquals(new String[]{"http://domain1.com", "http://domain2.com"}, config.getAllowedOrigins().toArray()); + assertArrayEquals(new String[]{"https://domain1.com", "https://domain2.com"}, config.getAllowedOrigins().toArray()); assertArrayEquals(new String[]{"GET", "PUT"}, config.getAllowedMethods().toArray()); assertArrayEquals(new String[]{"header1", "header2", "header3"}, config.getAllowedHeaders().toArray()); assertArrayEquals(new String[]{"header1", "header2"}, config.getExposedHeaders().toArray()); assertFalse(config.getAllowCredentials()); assertEquals(Long.valueOf(123), config.getMaxAge()); config = configs.get("/resources/**"); - assertArrayEquals(new String[]{"http://domain1.com"}, config.getAllowedOrigins().toArray()); + assertArrayEquals(new String[]{"https://domain1.com"}, config.getAllowedOrigins().toArray()); assertArrayEquals(new String[]{"GET", "HEAD", "POST"}, config.getAllowedMethods().toArray()); assertArrayEquals(new String[]{"*"}, config.getAllowedHeaders().toArray()); assertNull(config.getExposedHeaders()); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java index 6aa65771d8c..b821868db17 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2019 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. @@ -228,8 +228,8 @@ public class HandlersBeanDefinitionParserTests { List interceptors = transportService.getHandshakeInterceptors(); assertThat(interceptors, contains(instanceOf(OriginHandshakeInterceptor.class))); assertTrue(transportService.shouldSuppressCors()); - assertTrue(transportService.getAllowedOrigins().contains("http://mydomain1.com")); - assertTrue(transportService.getAllowedOrigins().contains("http://mydomain2.com")); + assertTrue(transportService.getAllowedOrigins().contains("https://mydomain1.com")); + assertTrue(transportService.getAllowedOrigins().contains("https://mydomain2.com")); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java index fe5757567f6..c467151ab42 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java @@ -183,8 +183,8 @@ public class MessageBrokerBeanDefinitionParserTests { interceptors = defaultSockJsService.getHandshakeInterceptors(); assertThat(interceptors, contains(instanceOf(FooTestInterceptor.class), instanceOf(BarTestInterceptor.class), instanceOf(OriginHandshakeInterceptor.class))); - assertTrue(defaultSockJsService.getAllowedOrigins().contains("http://mydomain3.com")); - assertTrue(defaultSockJsService.getAllowedOrigins().contains("http://mydomain4.com")); + assertTrue(defaultSockJsService.getAllowedOrigins().contains("https://mydomain3.com")); + assertTrue(defaultSockJsService.getAllowedOrigins().contains("https://mydomain4.com")); SimpUserRegistry userRegistry = this.appContext.getBean(SimpUserRegistry.class); assertNotNull(userRegistry);