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
b3d33754
Commit
b3d33754
authored
Apr 22, 2020
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove outdated FIXMEs from tests
Closes gh-19782
parent
c85918b8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
16 deletions
+6
-16
ReactiveCloudFoundrySecurityServiceTests.java
...ry/reactive/ReactiveCloudFoundrySecurityServiceTests.java
+0
-2
InfoEndpointAutoConfigurationTests.java
...utoconfigure/info/InfoEndpointAutoConfigurationTests.java
+0
-1
JmxEndpointDiscovererTests.java
...e/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java
+4
-10
HikariDataSourceConfigurationTests.java
...utoconfigure/jdbc/HikariDataSourceConfigurationTests.java
+0
-1
OutputCapture.java
.../springframework/boot/testsupport/rule/OutputCapture.java
+2
-2
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java
View file @
b3d33754
...
...
@@ -204,8 +204,6 @@ public class ReactiveCloudFoundrySecurityServiceTests {
});
StepVerifier
.
create
(
this
.
securityService
.
getUaaUrl
())
.
consumeNextWith
((
uaaUrl
)
->
assertThat
(
uaaUrl
).
isEqualTo
(
UAA_URL
)).
expectComplete
().
verify
();
// this.securityService.getUaaUrl().block(); //FIXME subscribe again to check that
// it isn't called again
expectRequest
((
request
)
->
assertThat
(
request
.
getPath
()).
isEqualTo
(
CLOUD_CONTROLLER
+
"/info"
));
expectRequestCount
(
1
);
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfigurationTests.java
View file @
b3d33754
...
...
@@ -42,7 +42,6 @@ public class InfoEndpointAutoConfigurationTests {
@Test
public
void
runShouldHaveEndpointBeanEvenIfDefaultIsDisabled
()
{
// FIXME
this
.
contextRunner
.
withPropertyValues
(
"management.endpoint.default.enabled:false"
)
.
run
((
context
)
->
assertThat
(
context
).
hasSingleBean
(
InfoEndpoint
.
class
));
}
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java
View file @
b3d33754
...
...
@@ -79,18 +79,18 @@ public class JmxEndpointDiscovererTests {
assertThat
(
getSomething
.
getDescription
()).
isEqualTo
(
"Invoke getSomething for endpoint test"
);
assertThat
(
getSomething
.
getOutputType
()).
isEqualTo
(
String
.
class
);
assertThat
(
getSomething
.
getParameters
()).
hasSize
(
1
);
hasDefaultParameter
(
getSomething
,
0
,
String
.
class
);
assertThat
(
getSomething
.
getParameters
().
get
(
0
).
getType
()).
isEqualTo
(
String
.
class
);
JmxOperation
update
=
operationByName
.
get
(
"update"
);
assertThat
(
update
.
getDescription
()).
isEqualTo
(
"Invoke update for endpoint test"
);
assertThat
(
update
.
getOutputType
()).
isEqualTo
(
Void
.
TYPE
);
assertThat
(
update
.
getParameters
()).
hasSize
(
2
);
hasDefaultParameter
(
update
,
0
,
String
.
class
);
hasDefaultParameter
(
update
,
1
,
String
.
class
);
assertThat
(
update
.
getParameters
().
get
(
0
).
getType
()).
isEqualTo
(
String
.
class
);
assertThat
(
update
.
getParameters
().
get
(
1
).
getType
()).
isEqualTo
(
String
.
class
);
JmxOperation
deleteSomething
=
operationByName
.
get
(
"deleteSomething"
);
assertThat
(
deleteSomething
.
getDescription
()).
isEqualTo
(
"Invoke deleteSomething for endpoint test"
);
assertThat
(
deleteSomething
.
getOutputType
()).
isEqualTo
(
Void
.
TYPE
);
assertThat
(
deleteSomething
.
getParameters
()).
hasSize
(
1
);
hasDefaultParameter
(
deleteSomething
,
0
,
String
.
class
);
assertThat
(
deleteSomething
.
getParameters
().
get
(
0
).
getType
()).
isEqualTo
(
String
.
class
);
});
}
...
...
@@ -239,12 +239,6 @@ public class JmxEndpointDiscovererTests {
assertThat
(
parameter
.
getDescription
()).
isEqualTo
(
description
);
}
// FIXME rename
private
void
hasDefaultParameter
(
JmxOperation
operation
,
int
index
,
Class
<?>
type
)
{
JmxOperationParameter
parameter
=
operation
.
getParameters
().
get
(
index
);
assertThat
(
parameter
.
getType
()).
isEqualTo
(
type
);
}
private
Map
<
EndpointId
,
ExposableJmxEndpoint
>
discover
(
JmxEndpointDiscoverer
discoverer
)
{
Map
<
EndpointId
,
ExposableJmxEndpoint
>
byId
=
new
HashMap
<>();
discoverer
.
getEndpoints
().
forEach
((
endpoint
)
->
byId
.
put
(
endpoint
.
getEndpointId
(),
endpoint
));
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java
View file @
b3d33754
...
...
@@ -55,7 +55,6 @@ public class HikariDataSourceConfigurationTests {
assertThat
(
ds
.
getJdbcUrl
()).
isEqualTo
(
"jdbc:foo//bar/spam"
);
assertThat
(
ds
.
getMaxLifetime
()).
isEqualTo
(
1234
);
});
// TODO: test JDBC4 isValid()
}
@Test
...
...
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/rule/OutputCapture.java
View file @
b3d33754
...
...
@@ -51,6 +51,7 @@ public class OutputCapture implements TestRule {
@Override
public
Statement
apply
(
Statement
base
,
Description
description
)
{
return
new
Statement
()
{
@Override
public
void
evaluate
()
throws
Throwable
{
captureOutput
();
...
...
@@ -69,11 +70,11 @@ public class OutputCapture implements TestRule {
}
}
}
};
}
protected
void
captureOutput
()
{
// FIXME AnsiOutput.setEnabled(Enabled.NEVER);
this
.
copy
=
new
ByteArrayOutputStream
();
this
.
captureOut
=
new
CaptureOutputStream
(
System
.
out
,
this
.
copy
);
this
.
captureErr
=
new
CaptureOutputStream
(
System
.
err
,
this
.
copy
);
...
...
@@ -82,7 +83,6 @@ public class OutputCapture implements TestRule {
}
protected
void
releaseOutput
()
{
// FIXME AnsiOutput.setEnabled(Enabled.DETECT);
System
.
setOut
(
this
.
captureOut
.
getOriginal
());
System
.
setErr
(
this
.
captureErr
.
getOriginal
());
this
.
copy
=
null
;
...
...
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