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
7f2af8b2
Commit
7f2af8b2
authored
Dec 13, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
fb7cc21d
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
85 additions
and
109 deletions
+85
-109
SpringBootContextLoaderTests.java
...ework/boot/test/context/SpringBootContextLoaderTests.java
+7
-7
JsonContentAssertTests.java
...pringframework/boot/test/json/JsonContentAssertTests.java
+40
-64
MockBeanForBeanFactoryIntegrationTests.java
.../mock/mockito/MockBeanForBeanFactoryIntegrationTests.java
+1
-1
ConfigurationMetadataAnnotationProcessorTests.java
...cessor/ConfigurationMetadataAnnotationProcessorTests.java
+37
-37
No files found.
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java
View file @
7f2af8b2
...
...
@@ -39,41 +39,41 @@ import static org.assertj.core.api.Assertions.assertThat;
public
class
SpringBootContextLoaderTests
{
@Test
public
void
environmentPropertiesSimple
()
throws
Exception
{
public
void
environmentPropertiesSimple
()
{
Map
<
String
,
Object
>
config
=
getEnvironmentProperties
(
SimpleConfig
.
class
);
assertKey
(
config
,
"key"
,
"myValue"
);
assertKey
(
config
,
"anotherKey"
,
"anotherValue"
);
}
@Test
public
void
environmentPropertiesSimpleNonAlias
()
throws
Exception
{
public
void
environmentPropertiesSimpleNonAlias
()
{
Map
<
String
,
Object
>
config
=
getEnvironmentProperties
(
SimpleConfigNonAlias
.
class
);
assertKey
(
config
,
"key"
,
"myValue"
);
assertKey
(
config
,
"anotherKey"
,
"anotherValue"
);
}
@Test
public
void
environmentPropertiesOverrideDefaults
()
throws
Exception
{
public
void
environmentPropertiesOverrideDefaults
()
{
Map
<
String
,
Object
>
config
=
getEnvironmentProperties
(
OverrideConfig
.
class
);
assertKey
(
config
,
"server.port"
,
"2345"
);
}
@Test
public
void
environmentPropertiesAppend
()
throws
Exception
{
public
void
environmentPropertiesAppend
()
{
Map
<
String
,
Object
>
config
=
getEnvironmentProperties
(
AppendConfig
.
class
);
assertKey
(
config
,
"key"
,
"myValue"
);
assertKey
(
config
,
"otherKey"
,
"otherValue"
);
}
@Test
public
void
environmentPropertiesSeparatorInValue
()
throws
Exception
{
public
void
environmentPropertiesSeparatorInValue
()
{
Map
<
String
,
Object
>
config
=
getEnvironmentProperties
(
SameSeparatorInValue
.
class
);
assertKey
(
config
,
"key"
,
"my=Value"
);
assertKey
(
config
,
"anotherKey"
,
"another:Value"
);
}
@Test
public
void
environmentPropertiesAnotherSeparatorInValue
()
throws
Exception
{
public
void
environmentPropertiesAnotherSeparatorInValue
()
{
Map
<
String
,
Object
>
config
=
getEnvironmentProperties
(
AnotherSeparatorInValue
.
class
);
assertKey
(
config
,
"key"
,
"my:Value"
);
...
...
@@ -82,7 +82,7 @@ public class SpringBootContextLoaderTests {
@Test
@Ignore
public
void
environmentPropertiesNewLineInValue
()
throws
Exception
{
public
void
environmentPropertiesNewLineInValue
()
{
// gh-4384
Map
<
String
,
Object
>
config
=
getEnvironmentProperties
(
NewLineInValue
.
class
);
assertKey
(
config
,
"key"
,
"myValue"
);
...
...
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java
View file @
7f2af8b2
This diff is collapsed.
Click to expand it.
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanForBeanFactoryIntegrationTests.java
View file @
7f2af8b2
...
...
@@ -48,7 +48,7 @@ public class MockBeanForBeanFactoryIntegrationTests {
@Test
@SuppressWarnings
({
"unchecked"
,
"rawtypes"
})
public
void
testName
()
throws
Exception
{
public
void
testName
()
{
TestBean
testBean
=
mock
(
TestBean
.
class
);
given
(
testBean
.
hello
()).
willReturn
(
"amock"
);
given
(
this
.
testFactoryBean
.
getObjectType
()).
willReturn
((
Class
)
TestBean
.
class
);
...
...
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
View file @
7f2af8b2
This diff is collapsed.
Click to expand it.
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