URL Cleanup - Fix broken tests

See gh-22677

spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml

@@ -3,9 +3,9 @@
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:test="http://www.springframework.org/schema/beans/test"
 	   xmlns:util="http://www.springframework.org/schema/util"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
-       http://www.springframework.org/schema/beans/test http://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.0.xsd
+       http://www.springframework.org/schema/beans/test https://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd"
 	default-lazy-init="true">
 
 	<test:testBean id="testBean" name="Rob Harrop" age="23"/>

spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -83,7 +83,7 @@ public class SimpMessagingTemplateTests {
 				MessageHeaderAccessor.getAccessor(messages.get(0), SimpMessageHeaderAccessor.class);
 
 		assertNotNull(headerAccessor);
-		assertEquals("/user/http:%2F%2Fjoe.openid.example.org%2F/queue/foo", headerAccessor.getDestination());
+		assertEquals("/user/https:%2F%2Fjoe.openid.example.org%2F/queue/foo", headerAccessor.getDestination());
 	}
 
 	@Test

spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.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.
@@ -79,7 +79,7 @@ public abstract class AbstractMarshallerTests<M extends Marshaller> {
 		marshaller.marshal(flights, domResult);
 		Document expected = builder.newDocument();
 		Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights");
-		Attr namespace = expected.createAttributeNS("https://www.w3.org/2000/xmlns/", "xmlns:tns");
+		Attr namespace = expected.createAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:tns");
 		namespace.setNodeValue("http://samples.springframework.org/flight");
 		flightsElement.setAttributeNode(namespace);
 		expected.appendChild(flightsElement);
@@ -103,7 +103,7 @@ public abstract class AbstractMarshallerTests<M extends Marshaller> {
 		Document result = (Document) domResult.getNode();
 		Document expected = builder.newDocument();
 		Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights");
-		Attr namespace = expected.createAttributeNS("https://www.w3.org/2000/xmlns/", "xmlns:tns");
+		Attr namespace = expected.createAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:tns");
 		namespace.setNodeValue("http://samples.springframework.org/flight");
 		flightsElement.setAttributeNode(namespace);
 		expected.appendChild(flightsElement);

spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.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.
@@ -82,7 +82,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests<CastorMarshal
 	 */
 	private static final String XSI_EXPECTED_STRING = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
 			"<objects><castor-object xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
-			" xmlns:java=\"https://java.sun.com\"" +
+			" xmlns:java=\"http://java.sun.com\"" +
 			" xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">" +
 			"<name>test</name><value>8</value></castor-object></objects>";
 
@@ -97,7 +97,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests<CastorMarshal
 	 */
 	private static final String ROOT_WITH_XSI_EXPECTED_STRING = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
 			"<objects xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
-			" xmlns:java=\"https://java.sun.com\"" +
+			" xmlns:java=\"http://java.sun.com\"" +
 			" xsi:type=\"java:java.util.Arrays$ArrayList\">" +
 			"<castor-object xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">" +
 			"<name>test</name><value>8</value></castor-object></objects>";
@@ -107,7 +107,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests<CastorMarshal
 	 */
 	private static final String ROOT_WITHOUT_XSI_EXPECTED_STRING = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
 			"<objects><castor-object xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
-			" xmlns:java=\"https://java.sun.com\"" +
+			" xmlns:java=\"http://java.sun.com\"" +
 			" xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">" +
 			"<name>test</name><value>8</value></castor-object></objects>";
 

spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.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.
@@ -91,9 +91,9 @@ public class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests<Jaxb2Marsh
 		given(mimeContainer.getAttachment("<99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws>")).willReturn(dataHandler);
 		given(mimeContainer.getAttachment("696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png")).willReturn(dataHandler);
 		String content = "<binaryObject xmlns='http://springframework.org/spring-ws'>" + "<bytes>" +
-				"<xop:Include href='cid:6b76528d-7a9c-4def-8e13-095ab89e9bb7@http://springframework.org/spring-ws' xmlns:xop='https://www.w3.org/2004/08/xop/include'/>" +
+				"<xop:Include href='cid:6b76528d-7a9c-4def-8e13-095ab89e9bb7@http://springframework.org/spring-ws' xmlns:xop='http://www.w3.org/2004/08/xop/include'/>" +
 				"</bytes>" + "<dataHandler>" +
-				"<xop:Include href='cid:99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws' xmlns:xop='https://www.w3.org/2004/08/xop/include'/>" +
+				"<xop:Include href='cid:99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws' xmlns:xop='http://www.w3.org/2004/08/xop/include'/>" +
 				"</dataHandler>" +
 				"<swaDataHandler>696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png</swaDataHandler>" +
 				"</binaryObject>";

spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java

@@ -596,7 +596,7 @@ public class HtmlUnitRequestBuilderTests {
 
 	@Test
 	public void buildRequestRemotePort80WithDefault() throws Exception {
-		webRequest.setUrl(new URL("https://example.com/"));
+		webRequest.setUrl(new URL("http://example.com/"));
 
 		MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
 
@@ -628,7 +628,7 @@ public class HtmlUnitRequestBuilderTests {
 	@Test
 	public void buildRequestUrl() {
 		String uri = requestBuilder.buildRequest(servletContext).getRequestURL().toString();
-		assertThat(uri, equalTo("https://example.com/test/this/here"));
+		assertThat(uri, equalTo("http://example.com/test/this/here"));
 	}
 
 	@Test

spring-web/src/test/java/org/springframework/http/RequestEntityTests.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.
@@ -58,7 +58,7 @@ public class RequestEntityTests {
 		URI uri = new UriTemplate("https://example.com/{foo}").expand("bar");
 		RequestEntity.get(uri).accept(MediaType.TEXT_PLAIN).build();
 
-		String url = "http://www.{host}.com/{path}";
+		String url = "https://www.{host}.com/{path}";
 		String host = "example";
 		String path = "foo/bar";
 		URI expected = new URI("https://www.example.com/foo/bar");

spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.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.
@@ -57,6 +57,7 @@ public class ServletServerHttpRequestTests {
 	@Test
 	public void getURI() throws Exception {
 		URI uri = new URI("https://example.com/path?query");
+		mockRequest.setScheme(uri.getScheme());
 		mockRequest.setServerName(uri.getHost());
 		mockRequest.setServerPort(uri.getPort());
 		mockRequest.setRequestURI(uri.getPath());

spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.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.
@@ -57,6 +57,7 @@ public class RequestPartServletServerHttpRequestTests {
 		ServerHttpRequest request = new RequestPartServletServerHttpRequest(this.mockRequest, "part");
 
 		URI uri = new URI("https://example.com/path?query");
+		this.mockRequest.setScheme("https");
 		this.mockRequest.setServerName(uri.getHost());
 		this.mockRequest.setServerPort(uri.getPort());
 		this.mockRequest.setRequestURI(uri.getPath());

spring-web/src/test/java/org/springframework/web/util/DefaultUriTemplateHandlerTests.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.

spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.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.
@@ -49,8 +49,8 @@ public class UriComponentsBuilderTests {
 	@Test
 	public void plain() throws URISyntaxException {
 		UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
-		UriComponents result = builder.scheme("http").host("example.com").path("foo").queryParam("bar").fragment("baz").build();
-		assertEquals("http", result.getScheme());
+		UriComponents result = builder.scheme("https").host("example.com").path("foo").queryParam("bar").fragment("baz").build();
+		assertEquals("https", result.getScheme());
 		assertEquals("example.com", result.getHost());
 		assertEquals("foo", result.getPath());
 		assertEquals("bar", result.getQuery());
@@ -62,18 +62,18 @@ public class UriComponentsBuilderTests {
 
 	@Test
 	public void multipleFromSameBuilder() throws URISyntaxException {
-		UriComponentsBuilder builder = UriComponentsBuilder.newInstance().scheme("http").host("example.com").pathSegment("foo");
+		UriComponentsBuilder builder = UriComponentsBuilder.newInstance().scheme("https").host("example.com").pathSegment("foo");
 		UriComponents result1 = builder.build();
 		builder = builder.pathSegment("foo2").queryParam("bar").fragment("baz");
 		UriComponents result2 = builder.build();
 
-		assertEquals("http", result1.getScheme());
+		assertEquals("https", result1.getScheme());
 		assertEquals("example.com", result1.getHost());
 		assertEquals("/foo", result1.getPath());
 		URI expected = new URI("https://example.com/foo");
 		assertEquals("Invalid result URI", expected, result1.toUri());
 
-		assertEquals("http", result2.getScheme());
+		assertEquals("https", result2.getScheme());
 		assertEquals("example.com", result2.getHost());
 		assertEquals("/foo/foo2", result2.getPath());
 		assertEquals("bar", result2.getQuery());
@@ -105,7 +105,7 @@ public class UriComponentsBuilderTests {
 	public void fromHierarchicalUri() throws URISyntaxException {
 		URI uri = new URI("https://example.com/foo?bar#baz");
 		UriComponents result = UriComponentsBuilder.fromUri(uri).build();
-		assertEquals("http", result.getScheme());
+		assertEquals("https", result.getScheme());
 		assertEquals("example.com", result.getHost());
 		assertEquals("/foo", result.getPath());
 		assertEquals("bar", result.getQuery());
@@ -137,7 +137,7 @@ public class UriComponentsBuilderTests {
 	@Test
 	public void fromUriString() {
 		UriComponents result = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc3986.txt").build();
-		assertEquals("http", result.getScheme());
+		assertEquals("https", result.getScheme());
 		assertNull(result.getUserInfo());
 		assertEquals("www.ietf.org", result.getHost());
 		assertEquals(-1, result.getPort());
@@ -149,7 +149,7 @@ public class UriComponentsBuilderTests {
 		result = UriComponentsBuilder.fromUriString(
 				"https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)")
 				.build();
-		assertEquals("http", result.getScheme());
+		assertEquals("https", result.getScheme());
 		assertEquals("arjen:foobar", result.getUserInfo());
 		assertEquals("java.sun.com", result.getHost());
 		assertEquals(80, result.getPort());
@@ -266,7 +266,7 @@ public class UriComponentsBuilderTests {
 	@Test //SPR-14761
 	public void fromHttpRequestWithForwardedIPv4Host() {
 		MockHttpServletRequest request = new MockHttpServletRequest();
-		request.setScheme("http");
+		request.setScheme("https");
 		request.setServerName("localhost");
 		request.setServerPort(-1);
 		request.setRequestURI("/mvc-showcase");
@@ -275,7 +275,7 @@ public class UriComponentsBuilderTests {
 		HttpRequest httpRequest = new ServletServerHttpRequest(request);
 		UriComponents result = UriComponentsBuilder.fromHttpRequest(httpRequest).build();
 
-		assertEquals("http://192.168.0.1/mvc-showcase", result.toString());
+		assertEquals("https://192.168.0.1/mvc-showcase", result.toString());
 	}
 
 	@Test //SPR-14761
@@ -449,7 +449,7 @@ public class UriComponentsBuilderTests {
 		HttpRequest httpRequest = new ServletServerHttpRequest(request);
 		UriComponents result = UriComponentsBuilder.fromHttpRequest(httpRequest).build();
 
-		assertEquals("https://a.example.org/mvc-showcase", result.toString());
+		assertEquals("http://a.example.org/mvc-showcase", result.toString());
 	}
 
 	@Test // SPR-12816

spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.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.
@@ -116,21 +116,21 @@ public class WebUtilsTests {
 	@Test
 	public void isValidOrigin() {
 		List<String> allowed = Collections.emptyList();
-		assertTrue(checkValidOrigin("mydomain1.com", -1, "https://mydomain1.com", allowed));
+		assertTrue(checkValidOrigin("mydomain1.com", -1, "http://mydomain1.com", allowed));
 		assertFalse(checkValidOrigin("mydomain1.com", -1, "http://mydomain2.com", allowed));
 
 		allowed = Collections.singletonList("*");
 		assertTrue(checkValidOrigin("mydomain1.com", -1, "http://mydomain2.com", allowed));
 
-		allowed = Collections.singletonList("https://mydomain1.com");
-		assertTrue(checkValidOrigin("mydomain2.com", -1, "https://mydomain1.com", allowed));
+		allowed = Collections.singletonList("http://mydomain1.com");
+		assertTrue(checkValidOrigin("mydomain2.com", -1, "http://mydomain1.com", allowed));
 		assertFalse(checkValidOrigin("mydomain2.com", -1, "http://mydomain3.com", allowed));
 	}
 
 	@Test
 	public void isSameOrigin() {
-		assertTrue(checkSameOrigin("mydomain1.com", -1, "https://mydomain1.com"));
-		assertTrue(checkSameOrigin("mydomain1.com", -1, "https://www.mydomain1.com/"));
+		assertTrue(checkSameOrigin("mydomain1.com", -1, "http://mydomain1.com"));
+		assertTrue(checkSameOrigin("mydomain1.com", -1, "http://mydomain1.com:80"));
 		assertTrue(checkSameOrigin("mydomain1.com", 443, "https://mydomain1.com"));
 		assertTrue(checkSameOrigin("mydomain1.com", 443, "https://mydomain1.com:443"));
 		assertTrue(checkSameOrigin("mydomain1.com", 123, "https://mydomain1.com:123"));
@@ -142,14 +142,14 @@ public class WebUtilsTests {
 		assertFalse(checkSameOrigin("mydomain1.com", -1, "invalid-origin"));
 
 		// Handling of invalid origins as described in SPR-13478
-		assertTrue(checkSameOrigin("mydomain1.com", -1, "https://mydomain1.com/"));
-		assertTrue(checkSameOrigin("mydomain1.com", -1, "https://www.mydomain1.com/"));
-		assertTrue(checkSameOrigin("mydomain1.com", -1, "https://mydomain1.com/path"));
-		assertTrue(checkSameOrigin("mydomain1.com", -1, "https://www.mydomain1.com/path"));
-		assertFalse(checkSameOrigin("mydomain2.com", -1, "https://mydomain1.com/"));
-		assertFalse(checkSameOrigin("mydomain2.com", -1, "https://www.mydomain1.com/"));
-		assertFalse(checkSameOrigin("mydomain2.com", -1, "https://mydomain1.com/path"));
-		assertFalse(checkSameOrigin("mydomain2.com", -1, "https://www.mydomain1.com/path"));
+		assertTrue(checkSameOrigin("mydomain1.com", -1, "http://mydomain1.com/"));
+		assertTrue(checkSameOrigin("mydomain1.com", -1, "http://mydomain1.com:80"));
+		assertTrue(checkSameOrigin("mydomain1.com", -1, "http://mydomain1.com/path"));
+		assertTrue(checkSameOrigin("mydomain1.com", -1, "http://mydomain1.com:80/path"));
+		assertFalse(checkSameOrigin("mydomain2.com", -1, "http://mydomain1.com/"));
+		assertFalse(checkSameOrigin("mydomain2.com", -1, "http://mydomain1.com:80/"));
+		assertFalse(checkSameOrigin("mydomain2.com", -1, "http://mydomain1.com/path"));
+		assertFalse(checkSameOrigin("mydomain2.com", -1, "http://mydomain1.com:80/path"));
 
 		// Handling of IPv6 hosts as described in SPR-13525
 		assertTrue(checkSameOrigin("[::1]", -1, "http://[::1]"));

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -104,7 +104,7 @@ public class AppCacheManifestTransformerTests {
 		assertThat("should not rewrite external resources", content,
 				Matchers.containsString("//example.org/style.css"));
 		assertThat("should not rewrite external resources", content,
-				Matchers.containsString("https://example.org/image.png"));
+				Matchers.containsString("http://example.org/image.png"));
 
 		assertThat("should generate fingerprint", content,
 				Matchers.containsString("# Hash: 4bf0338bcbeb0a5b3a4ec9ed8864107d"));

spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/appcache.manifest

@@ -11,7 +11,7 @@ NETWORK:
 
 CACHE:
 js/bar.js
-https://example.org/image.png
+http://example.org/image.png
 
 FALLBACK:
 /main /static.html