From 050f44d75bd06386477e34ffb1ca700653ccbd9a Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 11 Oct 2018 12:15:32 -0400 Subject: [PATCH] Rename WebTestClientConnectorTests to match class name --- .../web/reactive/server/DefaultControllerSpecTests.java | 2 -- .../test/web/reactive/server/HeaderAssertionTests.java | 2 -- .../test/web/reactive/server/HttpHandlerConnectorTests.java | 2 -- .../test/web/reactive/server/StatusAssertionTests.java | 2 -- ...ClientConnectorTests.java => WiretapConnectorTests.java} | 2 +- .../web/reactive/server/samples/bind/HttpServerTests.java | 6 +++--- 6 files changed, 4 insertions(+), 12 deletions(-) rename spring-test/src/test/java/org/springframework/test/web/reactive/server/{WebTestClientConnectorTests.java => WiretapConnectorTests.java} (98%) diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java index 524e1ea3ba3..781ca3726ce 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java @@ -37,9 +37,7 @@ import static org.junit.Assert.*; /** * Unit tests for {@link DefaultControllerSpec}. - * * @author Rossen Stoyanchev - * @since 5.0 */ public class DefaultControllerSpecTests { diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java index 44cf7c37f27..746840143f5 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java @@ -38,10 +38,8 @@ import static org.mockito.Mockito.*; /** * Unit tests for {@link HeaderAssertions}. - * * @author Rossen Stoyanchev * @author Sam Brannen - * @since 5.0 */ public class HeaderAssertionTests { diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java index 3278aedfca0..2afa9386d60 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HttpHandlerConnectorTests.java @@ -45,9 +45,7 @@ import static org.junit.Assert.assertEquals; /** * Unit tests for {@link HttpHandlerConnector}. - * * @author Rossen Stoyanchev - * @since 5.0 */ public class HttpHandlerConnectorTests { diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java index a570580cd65..cd63b3c8124 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/StatusAssertionTests.java @@ -32,9 +32,7 @@ import static org.mockito.Mockito.*; /** * Unit tests for {@link StatusAssertions}. - * * @author Rossen Stoyanchev - * @since 5.0 */ public class StatusAssertionTests { diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/WebTestClientConnectorTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java similarity index 98% rename from spring-test/src/test/java/org/springframework/test/web/reactive/server/WebTestClientConnectorTests.java rename to spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java index 3f84cea5ea0..60f3fb979cb 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/WebTestClientConnectorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/WiretapConnectorTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.*; * @author Rossen Stoyanchev * @since 5.0 */ -public class WebTestClientConnectorTests { +public class WiretapConnectorTests { @Test public void captureAndClaim() { diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java index 026a8e5e9a9..a389bf647e3 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -60,13 +60,13 @@ public class HttpServerTests { } @After - public void tearDown() throws Exception { + public void tearDown() { this.server.stop(); } @Test - public void test() throws Exception { + public void test() { this.client.get().uri("/test") .exchange() .expectStatus().isOk()