Browse Source

Delete trailing white space in spring-test

pull/623/merge
Sam Brannen 10 years ago
parent
commit
f4c23d8715
  1. 2
      spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
  2. 2
      spring-test/src/test/java/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.java
  3. 2
      spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml

2
spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java

@ -43,7 +43,7 @@ import org.springframework.util.StringUtils; @@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
* values in the test class hierarchy taking into consideration the semantics
* of the {@link ContextConfiguration#inheritLocations},
* {@link ActiveProfiles#inheritProfiles},
* {@link TestPropertySource#inheritLocations}, and
* {@link TestPropertySource#inheritLocations}, and
* {@link TestPropertySource#inheritProperties} flags.
*
* <p>A {@link SmartContextLoader} uses {@code MergedContextConfiguration}

2
spring-test/src/test/java/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.java vendored

@ -31,7 +31,7 @@ import static org.junit.Assert.*; @@ -31,7 +31,7 @@ import static org.junit.Assert.*;
/**
* Integration tests for {@link TestPropertySource @TestPropertySource}
* support with an explicitly named properties file that overrides a
* support with an explicitly named properties file that overrides a
* system property.
*
* @author Sam Brannen

2
spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml

@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
</bean>
<!-- spr5847 -->
<bean id="andy"
class="org.springframework.test.context.expression.ExpressionUsageTests$Foo">
<property name="name" value="#{properties.username}" />

Loading…
Cancel
Save