Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
00134934
Commit
00134934
authored
Jul 21, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move port in use exception test as it does not apply to Tomcat
See gh-8737
parent
9b6b663c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
15 deletions
+24
-15
NettyReactiveWebServerFactoryTests.java
...eb/embedded/netty/NettyReactiveWebServerFactoryTests.java
+18
-0
AbstractReactiveWebServerFactoryTests.java
...eactive/server/AbstractReactiveWebServerFactoryTests.java
+6
-15
No files found.
spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java
View file @
00134934
...
@@ -16,8 +16,13 @@
...
@@ -16,8 +16,13 @@
package
org
.
springframework
.
boot
.
web
.
embedded
.
netty
;
package
org
.
springframework
.
boot
.
web
.
embedded
.
netty
;
import
org.junit.Test
;
import
org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactory
;
import
org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactory
;
import
org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactoryTests
;
import
org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactoryTests
;
import
org.springframework.boot.web.server.PortInUseException
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
/**
/**
* Tests for {@link NettyReactiveWebServerFactory}.
* Tests for {@link NettyReactiveWebServerFactory}.
...
@@ -32,4 +37,17 @@ public class NettyReactiveWebServerFactoryTests
...
@@ -32,4 +37,17 @@ public class NettyReactiveWebServerFactoryTests
return
new
NettyReactiveWebServerFactory
(
0
);
return
new
NettyReactiveWebServerFactory
(
0
);
}
}
@Test
public
void
portInUseExceptionIsThrownWhenPortIsAlreadyInUse
()
throws
Exception
{
AbstractReactiveWebServerFactory
factory
=
getFactory
();
factory
.
setPort
(
0
);
this
.
webServer
=
factory
.
getWebServer
(
new
EchoHandler
());
this
.
webServer
.
start
();
factory
.
setPort
(
this
.
webServer
.
getPort
());
this
.
thrown
.
expect
(
PortInUseException
.
class
);
this
.
thrown
.
expectMessage
(
equalTo
(
"Port "
+
this
.
webServer
.
getPort
()
+
" is already in use"
));
factory
.
getWebServer
(
new
EchoHandler
()).
start
();
}
}
}
spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
View file @
00134934
...
@@ -25,7 +25,6 @@ import reactor.core.publisher.Mono;
...
@@ -25,7 +25,6 @@ import reactor.core.publisher.Mono;
import
reactor.test.StepVerifier
;
import
reactor.test.StepVerifier
;
import
org.springframework.boot.testsupport.rule.OutputCapture
;
import
org.springframework.boot.testsupport.rule.OutputCapture
;
import
org.springframework.boot.web.server.PortInUseException
;
import
org.springframework.boot.web.server.WebServer
;
import
org.springframework.boot.web.server.WebServer
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
...
@@ -38,7 +37,6 @@ import org.springframework.web.reactive.function.client.ClientResponse;
...
@@ -38,7 +37,6 @@ import org.springframework.web.reactive.function.client.ClientResponse;
import
org.springframework.web.reactive.function.client.WebClient
;
import
org.springframework.web.reactive.function.client.WebClient
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
equalTo
;
/**
/**
* Base for testing classes that extends {@link AbstractReactiveWebServerFactory}.
* Base for testing classes that extends {@link AbstractReactiveWebServerFactory}.
...
@@ -104,29 +102,22 @@ public abstract class AbstractReactiveWebServerFactoryTests {
...
@@ -104,29 +102,22 @@ public abstract class AbstractReactiveWebServerFactoryTests {
assertThat
(
this
.
webServer
.
getPort
()).
isEqualTo
(
specificPort
);
assertThat
(
this
.
webServer
.
getPort
()).
isEqualTo
(
specificPort
);
}
}
@Test
public
void
portInUseExceptionIsThrownWhenPortIsAlreadyInUse
()
throws
Exception
{
AbstractReactiveWebServerFactory
factory
=
getFactory
();
factory
.
setPort
(
0
);
this
.
webServer
=
factory
.
getWebServer
(
new
EchoHandler
());
this
.
webServer
.
start
();
factory
.
setPort
(
this
.
webServer
.
getPort
());
this
.
thrown
.
expect
(
PortInUseException
.
class
);
this
.
thrown
.
expectMessage
(
equalTo
(
"Port "
+
this
.
webServer
.
getPort
()
+
" is already in use"
));
factory
.
getWebServer
(
new
EchoHandler
()).
start
();
}
protected
WebClient
getWebClient
()
{
protected
WebClient
getWebClient
()
{
return
WebClient
.
create
(
"http://localhost:"
+
this
.
webServer
.
getPort
());
return
WebClient
.
create
(
"http://localhost:"
+
this
.
webServer
.
getPort
());
}
}
protected
static
class
EchoHandler
implements
HttpHandler
{
protected
static
class
EchoHandler
implements
HttpHandler
{
public
EchoHandler
()
{
}
@Override
@Override
public
Mono
<
Void
>
handle
(
ServerHttpRequest
request
,
ServerHttpResponse
response
)
{
public
Mono
<
Void
>
handle
(
ServerHttpRequest
request
,
ServerHttpResponse
response
)
{
response
.
setStatusCode
(
HttpStatus
.
OK
);
response
.
setStatusCode
(
HttpStatus
.
OK
);
return
response
.
writeWith
(
request
.
getBody
());
return
response
.
writeWith
(
request
.
getBody
());
}
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment