GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polishing

pull/713/head
Juergen Hoeller 11 years ago
parent
9542313710
commit
8c700b19da
5 changed files with 248 additions and 277 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 192
      spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
  2. 77
      spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
  3. 240
      spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
  4. 13
      spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
  5. 3
      spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java

192
spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
Unescape View File

@ -68,35 +68,47 @@ public class MergedContextConfiguration implements Serializable {
private static final long serialVersionUID = -3290560718464957422L; private static final long serialVersionUID = -3290560718464957422L;
private static final String[] EMPTY_STRING_ARRAY = new String[0]; private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0]; private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
private static final Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> EMPTY_INITIALIZER_CLASSES = //
Collections.<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> emptySet(); private static final Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> EMPTY_INITIALIZER_CLASSES =
Collections.<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> emptySet();
private final Class<?> testClass; private final Class<?> testClass;
private final String[] locations; private final String[] locations;
private final Class<?>[] classes; private final Class<?>[] classes;
private final Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses; private final Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses;
private final String[] activeProfiles; private final String[] activeProfiles;
private final String[] propertySourceLocations; private final String[] propertySourceLocations;
private final String[] propertySourceProperties; private final String[] propertySourceProperties;
private final ContextLoader contextLoader; private final ContextLoader contextLoader;
private final CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate; private final CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate;
private final MergedContextConfiguration parent; private final MergedContextConfiguration parent;
private static String[] processStrings(String[] array) { private static String[] processStrings(String[] array) {
return array == null ? EMPTY_STRING_ARRAY : array; return (array != null ? array : EMPTY_STRING_ARRAY);
} }
private static Class<?>[] processClasses(Class<?>[] classes) { private static Class<?>[] processClasses(Class<?>[] classes) {
return classes == null ? EMPTY_CLASS_ARRAY : classes; return (classes != null ? classes : EMPTY_CLASS_ARRAY);
} }
private static Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> processContextInitializerClasses( private static Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> processContextInitializerClasses(
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses) { Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses) {
return contextInitializerClasses == null ? EMPTY_INITIALIZER_CLASSES
: Collections.unmodifiableSet(contextInitializerClasses); return (contextInitializerClasses != null ?
Collections.unmodifiableSet(contextInitializerClasses) : EMPTY_INITIALIZER_CLASSES);
} }
private static String[] processActiveProfiles(String[] activeProfiles) { private static String[] processActiveProfiles(String[] activeProfiles) {
@ -117,15 +129,15 @@ public class MergedContextConfiguration implements Serializable {
* loader or &quot;null&quot; if the supplied loaded is {@code null}. * loader or &quot;null&quot; if the supplied loaded is {@code null}.
*/ */
protected static String nullSafeToString(ContextLoader contextLoader) { protected static String nullSafeToString(ContextLoader contextLoader) {
return contextLoader == null ? "null" : contextLoader.getClass().getName(); return (contextLoader != null ? contextLoader.getClass().getName() : "null");
} }
/** /**
* Create a new {@code MergedContextConfiguration} instance for the * Create a new {@code MergedContextConfiguration} instance for the
* supplied parameters. * supplied parameters.
* <p>Delegates to * <p>Delegates to
* {@link #MergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}. * {@link #MergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}.
*
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@ -134,6 +146,7 @@ public class MergedContextConfiguration implements Serializable {
*/ */
public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes, public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
String[] activeProfiles, ContextLoader contextLoader) { String[] activeProfiles, ContextLoader contextLoader) {
this(testClass, locations, classes, null, activeProfiles, contextLoader); this(testClass, locations, classes, null, activeProfiles, contextLoader);
} }
@ -142,7 +155,6 @@ public class MergedContextConfiguration implements Serializable {
* supplied parameters. * supplied parameters.
* <p>Delegates to * <p>Delegates to
* {@link #MergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}. * {@link #MergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}.
*
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@ -151,12 +163,10 @@ public class MergedContextConfiguration implements Serializable {
* @param contextLoader the resolved {@code ContextLoader} * @param contextLoader the resolved {@code ContextLoader}
* @see #MergedContextConfiguration(Class, String[], Class[], Set, String[], ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration) * @see #MergedContextConfiguration(Class, String[], Class[], Set, String[], ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)
*/ */
public MergedContextConfiguration( public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
Class<?> testClass,
String[] locations,
Class<?>[] classes,
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses, Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses,
String[] activeProfiles, ContextLoader contextLoader) { String[] activeProfiles, ContextLoader contextLoader) {
this(testClass, locations, classes, contextInitializerClasses, activeProfiles, contextLoader, null, null); this(testClass, locations, classes, contextInitializerClasses, activeProfiles, contextLoader, null, null);
} }
@ -165,7 +175,6 @@ public class MergedContextConfiguration implements Serializable {
* supplied parameters. * supplied parameters.
* <p>Delegates to * <p>Delegates to
* {@link #MergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}. * {@link #MergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}.
*
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@ -177,13 +186,11 @@ public class MergedContextConfiguration implements Serializable {
* @param parent the parent configuration or {@code null} if there is no parent * @param parent the parent configuration or {@code null} if there is no parent
* @since 3.2.2 * @since 3.2.2
*/ */
public MergedContextConfiguration( public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
Class<?> testClass,
String[] locations,
Class<?>[] classes,
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses, Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses,
String[] activeProfiles, ContextLoader contextLoader, String[] activeProfiles, ContextLoader contextLoader,
CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate, MergedContextConfiguration parent) { CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate, MergedContextConfiguration parent) {
this(testClass, locations, classes, contextInitializerClasses, activeProfiles, null, null, contextLoader, this(testClass, locations, classes, contextInitializerClasses, activeProfiles, null, null, contextLoader,
cacheAwareContextLoaderDelegate, parent); cacheAwareContextLoaderDelegate, parent);
} }
@ -203,7 +210,6 @@ public class MergedContextConfiguration implements Serializable {
/** /**
* Create a new {@code MergedContextConfiguration} instance for the * Create a new {@code MergedContextConfiguration} instance for the
* supplied parameters. * supplied parameters.
*
* <p>If a {@code null} value is supplied for {@code locations}, * <p>If a {@code null} value is supplied for {@code locations},
* {@code classes}, {@code activeProfiles}, {@code propertySourceLocations}, * {@code classes}, {@code activeProfiles}, {@code propertySourceLocations},
* or {@code propertySourceProperties} an empty array will be stored instead. * or {@code propertySourceProperties} an empty array will be stored instead.
@ -211,7 +217,6 @@ public class MergedContextConfiguration implements Serializable {
* {@code contextInitializerClasses} an empty set will be stored instead. * {@code contextInitializerClasses} an empty set will be stored instead.
* Furthermore, active profiles will be sorted, and duplicate profiles * Furthermore, active profiles will be sorted, and duplicate profiles
* will be removed. * will be removed.
*
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged context resource locations * @param locations the merged context resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@ -225,14 +230,12 @@ public class MergedContextConfiguration implements Serializable {
* @param parent the parent configuration or {@code null} if there is no parent * @param parent the parent configuration or {@code null} if there is no parent
* @since 4.1 * @since 4.1
*/ */
public MergedContextConfiguration( public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
Class<?> testClass,
String[] locations,
Class<?>[] classes,
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses, Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses,
String[] activeProfiles, String[] propertySourceLocations, String[] propertySourceProperties, String[] activeProfiles, String[] propertySourceLocations, String[] propertySourceProperties,
ContextLoader contextLoader, CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate, ContextLoader contextLoader, CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate,
MergedContextConfiguration parent) { MergedContextConfiguration parent) {
this.testClass = testClass; this.testClass = testClass;
this.locations = processStrings(locations); this.locations = processStrings(locations);
this.classes = processClasses(classes); this.classes = processClasses(classes);
@ -245,11 +248,13 @@ public class MergedContextConfiguration implements Serializable {
this.parent = parent; this.parent = parent;
} }
/** /**
* Get the {@linkplain Class test class} associated with this {@code MergedContextConfiguration}. * Get the {@linkplain Class test class} associated with this
* {@code MergedContextConfiguration}.
*/ */
public Class<?> getTestClass() { public Class<?> getTestClass() {
return testClass; return this.testClass;
} }
/** /**
@ -259,20 +264,19 @@ public class MergedContextConfiguration implements Serializable {
* files or Groovy scripts. * files or Groovy scripts.
*/ */
public String[] getLocations() { public String[] getLocations() {
return locations; return this.locations;
} }
/** /**
* Get the merged annotated classes for the {@linkplain #getTestClass() test class}. * Get the merged annotated classes for the {@linkplain #getTestClass() test class}.
*/ */
public Class<?>[] getClasses() { public Class<?>[] getClasses() {
return classes; return this.classes;
} }
/** /**
* Determine if this {@code MergedContextConfiguration} instance has * Determine if this {@code MergedContextConfiguration} instance has
* path-based context resource locations. * path-based context resource locations.
*
* @return {@code true} if the {@link #getLocations() locations} array is not empty * @return {@code true} if the {@link #getLocations() locations} array is not empty
* @since 4.0.4 * @since 4.0.4
* @see #hasResources() * @see #hasResources()
@ -285,7 +289,6 @@ public class MergedContextConfiguration implements Serializable {
/** /**
* Determine if this {@code MergedContextConfiguration} instance has * Determine if this {@code MergedContextConfiguration} instance has
* class-based resources. * class-based resources.
*
* @return {@code true} if the {@link #getClasses() classes} array is not empty * @return {@code true} if the {@link #getClasses() classes} array is not empty
* @since 4.0.4 * @since 4.0.4
* @see #hasResources() * @see #hasResources()
@ -298,7 +301,6 @@ public class MergedContextConfiguration implements Serializable {
/** /**
* Determine if this {@code MergedContextConfiguration} instance has * Determine if this {@code MergedContextConfiguration} instance has
* either path-based context resource locations or class-based resources. * either path-based context resource locations or class-based resources.
*
* @return {@code true} if either the {@link #getLocations() locations} * @return {@code true} if either the {@link #getLocations() locations}
* or the {@link #getClasses() classes} array is not empty * or the {@link #getClasses() classes} array is not empty
* @since 4.0.4 * @since 4.0.4
@ -306,7 +308,7 @@ public class MergedContextConfiguration implements Serializable {
* @see #hasClasses() * @see #hasClasses()
*/ */
public boolean hasResources() { public boolean hasResources() {
return hasLocations() || hasClasses(); return (hasLocations() || hasClasses());
} }
/** /**
@ -314,7 +316,7 @@ public class MergedContextConfiguration implements Serializable {
* {@linkplain #getTestClass() test class}. * {@linkplain #getTestClass() test class}.
*/ */
public Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> getContextInitializerClasses() { public Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> getContextInitializerClasses() {
return contextInitializerClasses; return this.contextInitializerClasses;
} }
/** /**
@ -323,17 +325,17 @@ public class MergedContextConfiguration implements Serializable {
* @see ActiveProfiles * @see ActiveProfiles
*/ */
public String[] getActiveProfiles() { public String[] getActiveProfiles() {
return activeProfiles; return this.activeProfiles;
} }
/** /**
* Get the merged resource locations for test {@code PropertySources} for the * Get the merged resource locations for test {@code PropertySources}
* {@linkplain #getTestClass() test class}. * for the {@linkplain #getTestClass() test class}.
* @see TestPropertySource#locations * @see TestPropertySource#locations
* @see java.util.Properties * @see java.util.Properties
*/ */
public String[] getPropertySourceLocations() { public String[] getPropertySourceLocations() {
return propertySourceLocations; return this.propertySourceLocations;
} }
/** /**
@ -345,20 +347,19 @@ public class MergedContextConfiguration implements Serializable {
* @see java.util.Properties * @see java.util.Properties
*/ */
public String[] getPropertySourceProperties() { public String[] getPropertySourceProperties() {
return propertySourceProperties; return this.propertySourceProperties;
} }
/** /**
* Get the resolved {@link ContextLoader} for the {@linkplain #getTestClass() test class}. * Get the resolved {@link ContextLoader} for the {@linkplain #getTestClass() test class}.
*/ */
public ContextLoader getContextLoader() { public ContextLoader getContextLoader() {
return contextLoader; return this.contextLoader;
} }
/** /**
* Get the {@link MergedContextConfiguration} for the parent application context in a * Get the {@link MergedContextConfiguration} for the parent application context
* context hierarchy. * in a context hierarchy.
*
* @return the parent configuration or {@code null} if there is no parent * @return the parent configuration or {@code null} if there is no parent
* @see #getParentApplicationContext() * @see #getParentApplicationContext()
* @since 3.2.2 * @since 3.2.2
@ -370,43 +371,21 @@ public class MergedContextConfiguration implements Serializable {
/** /**
* Get the parent {@link ApplicationContext} for the context defined by this * Get the parent {@link ApplicationContext} for the context defined by this
* {@code MergedContextConfiguration} from the context cache. * {@code MergedContextConfiguration} from the context cache.
* <p> * <p>If the parent context has not yet been loaded, it will be loaded, stored
* If the parent context has not yet been loaded, it will be loaded, stored in the * in the cache, and then returned.
* cache, and then returned.
*
* @return the parent {@code ApplicationContext} or {@code null} if there is no parent * @return the parent {@code ApplicationContext} or {@code null} if there is no parent
* @see #getParent() * @see #getParent()
* @since 3.2.2 * @since 3.2.2
*/ */
public ApplicationContext getParentApplicationContext() { public ApplicationContext getParentApplicationContext() {
if (parent == null) { if (this.parent == null) {
return null; return null;
} }
Assert.state(this.cacheAwareContextLoaderDelegate != null,
Assert.state(cacheAwareContextLoaderDelegate != null, "Cannot retrieve a parent application context without access to the CacheAwareContextLoaderDelegate");
"Cannot retrieve a parent application context without access to the CacheAwareContextLoaderDelegate."); return this.cacheAwareContextLoaderDelegate.loadContext(this.parent);
return cacheAwareContextLoaderDelegate.loadContext(parent);
} }
/**
* Generate a unique hash code for all properties of this
* {@code MergedContextConfiguration} excluding the
* {@linkplain #getTestClass() test class}.
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + Arrays.hashCode(locations);
result = prime * result + Arrays.hashCode(classes);
result = prime * result + contextInitializerClasses.hashCode();
result = prime * result + Arrays.hashCode(activeProfiles);
result = prime * result + Arrays.hashCode(propertySourceLocations);
result = prime * result + Arrays.hashCode(propertySourceProperties);
result = prime * result + (parent == null ? 0 : parent.hashCode());
result = prime * result + nullSafeToString(contextLoader).hashCode();
return result;
}
/** /**
* Determine if the supplied object is equal to this {@code MergedContextConfiguration} * Determine if the supplied object is equal to this {@code MergedContextConfiguration}
@ -420,57 +399,68 @@ public class MergedContextConfiguration implements Serializable {
* {@link #getContextLoader() ContextLoaders}. * {@link #getContextLoader() ContextLoaders}.
*/ */
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object other) {
if (this == other) {
if (this == obj) {
return true; return true;
} }
if (!(obj instanceof MergedContextConfiguration)) { if (!(other instanceof MergedContextConfiguration)) {
return false; return false;
} }
final MergedContextConfiguration that = (MergedContextConfiguration) obj; MergedContextConfiguration otherConfig = (MergedContextConfiguration) other;
if (!Arrays.equals(this.locations, otherConfig.locations)) {
if (!Arrays.equals(this.locations, that.locations)) {
return false; return false;
} }
if (!Arrays.equals(this.classes, otherConfig.classes)) {
if (!Arrays.equals(this.classes, that.classes)) {
return false; return false;
} }
if (!this.contextInitializerClasses.equals(otherConfig.contextInitializerClasses)) {
if (!this.contextInitializerClasses.equals(that.contextInitializerClasses)) {
return false; return false;
} }
if (!Arrays.equals(this.activeProfiles, otherConfig.activeProfiles)) {
if (!Arrays.equals(this.activeProfiles, that.activeProfiles)) {
return false; return false;
} }
if (!Arrays.equals(this.propertySourceLocations, otherConfig.propertySourceLocations)) {
if (!Arrays.equals(this.propertySourceLocations, that.propertySourceLocations)) {
return false; return false;
} }
if (!Arrays.equals(this.propertySourceProperties, otherConfig.propertySourceProperties)) {
if (!Arrays.equals(this.propertySourceProperties, that.propertySourceProperties)) {
return false; return false;
} }
if (this.parent == null) { if (this.parent == null) {
if (that.parent != null) { if (otherConfig.parent != null) {
return false; return false;
} }
} }
else if (!this.parent.equals(that.parent)) { else if (!this.parent.equals(otherConfig.parent)) {
return false; return false;
} }
if (!nullSafeToString(this.contextLoader).equals(nullSafeToString(that.contextLoader))) { if (!nullSafeToString(this.contextLoader).equals(nullSafeToString(otherConfig.contextLoader))) {
return false; return false;
} }
return true; return true;
} }
/**
* Generate a unique hash code for all properties of this
* {@code MergedContextConfiguration} excluding the
* {@linkplain #getTestClass() test class}.
*/
@Override
public int hashCode() {
int result = Arrays.hashCode(this.locations);
result = 31 * result + Arrays.hashCode(this.classes);
result = 31 * result + this.contextInitializerClasses.hashCode();
result = 31 * result + Arrays.hashCode(this.activeProfiles);
result = 31 * result + Arrays.hashCode(this.propertySourceLocations);
result = 31 * result + Arrays.hashCode(this.propertySourceProperties);
result = 31 * result + (this.parent != null ? this.parent.hashCode() : 0);
result = 31 * result + nullSafeToString(this.contextLoader).hashCode();
return result;
}
/** /**
* Provide a String representation of the {@linkplain #getTestClass() test class}, * Provide a String representation of the {@linkplain #getTestClass() test class},
* {@linkplain #getLocations() locations}, {@linkplain #getClasses() annotated classes}, * {@linkplain #getLocations() locations}, {@linkplain #getClasses() annotated classes},
@ -483,17 +473,17 @@ public class MergedContextConfiguration implements Serializable {
*/ */
@Override @Override
public String toString() { public String toString() {
return new ToStringCreator(this)// return new ToStringCreator(this)
.append("testClass", testClass)// .append("testClass", this.testClass)
.append("locations", ObjectUtils.nullSafeToString(locations))// .append("locations", ObjectUtils.nullSafeToString(this.locations))
.append("classes", ObjectUtils.nullSafeToString(classes))// .append("classes", ObjectUtils.nullSafeToString(this.classes))
.append("contextInitializerClasses", ObjectUtils.nullSafeToString(contextInitializerClasses))// .append("contextInitializerClasses", ObjectUtils.nullSafeToString(this.contextInitializerClasses))
.append("activeProfiles", ObjectUtils.nullSafeToString(activeProfiles))// .append("activeProfiles", ObjectUtils.nullSafeToString(this.activeProfiles))
.append("propertySourceLocations", ObjectUtils.nullSafeToString(propertySourceLocations))// .append("propertySourceLocations", ObjectUtils.nullSafeToString(this.propertySourceLocations))
.append("propertySourceProperties", ObjectUtils.nullSafeToString(propertySourceProperties))// .append("propertySourceProperties", ObjectUtils.nullSafeToString(this.propertySourceProperties))
.append("contextLoader", nullSafeToString(contextLoader))// .append("contextLoader", nullSafeToString(this.contextLoader))
.append("parent", parent)// .append("parent", this.parent)
.toString(); .toString();
} }
} }

77
spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
Unescape View File

@ -63,7 +63,6 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* supplied parameters. * supplied parameters.
* <p>Delegates to * <p>Delegates to
* {@link #WebMergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], String, ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}. * {@link #WebMergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], String, ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}.
*
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged resource locations * @param locations the merged resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@ -76,10 +75,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* {@link #WebMergedContextConfiguration(Class, String[], Class[], Set, String[], String, ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)} instead. * {@link #WebMergedContextConfiguration(Class, String[], Class[], Set, String[], String, ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)} instead.
*/ */
@Deprecated @Deprecated
public WebMergedContextConfiguration( public WebMergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
Class<?> testClass,
String[] locations,
Class<?>[] classes,
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses, Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses,
String[] activeProfiles, String resourceBasePath, ContextLoader contextLoader) { String[] activeProfiles, String resourceBasePath, ContextLoader contextLoader) {
@ -92,7 +88,6 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* supplied parameters. * supplied parameters.
* <p>Delegates to * <p>Delegates to
* {@link #WebMergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], String, ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}. * {@link #WebMergedContextConfiguration(Class, String[], Class[], Set, String[], String[], String[], String, ContextLoader, CacheAwareContextLoaderDelegate, MergedContextConfiguration)}.
*
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged resource locations * @param locations the merged resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@ -109,10 +104,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* instead. * instead.
*/ */
@Deprecated @Deprecated
public WebMergedContextConfiguration( public WebMergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
Class<?> testClass,
String[] locations,
Class<?>[] classes,
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses, Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses,
String[] activeProfiles, String resourceBasePath, ContextLoader contextLoader, String[] activeProfiles, String resourceBasePath, ContextLoader contextLoader,
CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate, MergedContextConfiguration parent) { CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate, MergedContextConfiguration parent) {
@ -137,7 +129,6 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
/** /**
* Create a new {@code WebMergedContextConfiguration} instance for the * Create a new {@code WebMergedContextConfiguration} instance for the
* supplied parameters. * supplied parameters.
*
* <p>If a {@code null} value is supplied for {@code locations}, * <p>If a {@code null} value is supplied for {@code locations},
* {@code classes}, {@code activeProfiles}, {@code propertySourceLocations}, * {@code classes}, {@code activeProfiles}, {@code propertySourceLocations},
* or {@code propertySourceProperties} an empty array will be stored instead. * or {@code propertySourceProperties} an empty array will be stored instead.
@ -146,7 +137,6 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* If an <em>empty</em> value is supplied for the {@code resourceBasePath} * If an <em>empty</em> value is supplied for the {@code resourceBasePath}
* an empty string will be used. Furthermore, active profiles will be sorted, * an empty string will be used. Furthermore, active profiles will be sorted,
* and duplicate profiles will be removed. * and duplicate profiles will be removed.
*
* @param testClass the test class for which the configuration was merged * @param testClass the test class for which the configuration was merged
* @param locations the merged resource locations * @param locations the merged resource locations
* @param classes the merged annotated classes * @param classes the merged annotated classes
@ -161,10 +151,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* @param parent the parent configuration or {@code null} if there is no parent * @param parent the parent configuration or {@code null} if there is no parent
* @since 4.1 * @since 4.1
*/ */
public WebMergedContextConfiguration( public WebMergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
Class<?> testClass,
String[] locations,
Class<?>[] classes,
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses, Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> contextInitializerClasses,
String[] activeProfiles, String[] propertySourceLocations, String[] propertySourceProperties, String[] activeProfiles, String[] propertySourceLocations, String[] propertySourceProperties,
String resourceBasePath, ContextLoader contextLoader, String resourceBasePath, ContextLoader contextLoader,
@ -176,6 +163,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
this.resourceBasePath = !StringUtils.hasText(resourceBasePath) ? "" : resourceBasePath; this.resourceBasePath = !StringUtils.hasText(resourceBasePath) ? "" : resourceBasePath;
} }
/** /**
* Get the resource path to the root directory of the web application for the * Get the resource path to the root directory of the web application for the
* {@linkplain #getTestClass() test class}, configured via {@code @WebAppConfiguration}. * {@linkplain #getTestClass() test class}, configured via {@code @WebAppConfiguration}.
@ -185,18 +173,6 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
return this.resourceBasePath; return this.resourceBasePath;
} }
/**
* Generate a unique hash code for all properties of this
* {@code WebMergedContextConfiguration} excluding the
* {@linkplain #getTestClass() test class}.
*/
@Override
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
result = prime * result + resourceBasePath.hashCode();
return result;
}
/** /**
* Determine if the supplied object is equal to this {@code WebMergedContextConfiguration} * Determine if the supplied object is equal to this {@code WebMergedContextConfiguration}
@ -209,18 +185,25 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
* {@link #getContextLoader() ContextLoaders}. * {@link #getContextLoader() ContextLoaders}.
*/ */
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object other) {
if (this == other) {
if (this == obj) {
return true; return true;
} }
if (!(obj instanceof WebMergedContextConfiguration)) { if (!(other instanceof WebMergedContextConfiguration)) {
return false; return false;
} }
WebMergedContextConfiguration otherConfig = (WebMergedContextConfiguration) other;
return super.equals(otherConfig) && this.getResourceBasePath().equals(otherConfig.getResourceBasePath());
}
final WebMergedContextConfiguration that = (WebMergedContextConfiguration) obj; /**
* Generate a unique hash code for all properties of this
return super.equals(that) && this.getResourceBasePath().equals(that.getResourceBasePath()); * {@code WebMergedContextConfiguration} excluding the
* {@linkplain #getTestClass() test class}.
*/
@Override
public int hashCode() {
return 31 * super.hashCode() + this.resourceBasePath.hashCode();
} }
/** /**
@ -236,18 +219,18 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
*/ */
@Override @Override
public String toString() { public String toString() {
return new ToStringCreator(this)// return new ToStringCreator(this)
.append("testClass", getTestClass())// .append("testClass", getTestClass())
.append("locations", ObjectUtils.nullSafeToString(getLocations()))// .append("locations", ObjectUtils.nullSafeToString(getLocations()))
.append("classes", ObjectUtils.nullSafeToString(getClasses()))// .append("classes", ObjectUtils.nullSafeToString(getClasses()))
.append("contextInitializerClasses", ObjectUtils.nullSafeToString(getContextInitializerClasses()))// .append("contextInitializerClasses", ObjectUtils.nullSafeToString(getContextInitializerClasses()))
.append("activeProfiles", ObjectUtils.nullSafeToString(getActiveProfiles()))// .append("activeProfiles", ObjectUtils.nullSafeToString(getActiveProfiles()))
.append("propertySourceLocations", ObjectUtils.nullSafeToString(getPropertySourceLocations()))// .append("propertySourceLocations", ObjectUtils.nullSafeToString(getPropertySourceLocations()))
.append("propertySourceProperties", ObjectUtils.nullSafeToString(getPropertySourceProperties()))// .append("propertySourceProperties", ObjectUtils.nullSafeToString(getPropertySourceProperties()))
.append("resourceBasePath", getResourceBasePath())// .append("resourceBasePath", getResourceBasePath())
.append("contextLoader", nullSafeToString(getContextLoader()))// .append("contextLoader", nullSafeToString(getContextLoader()))
.append("parent", getParent())// .append("parent", getParent())
.toString(); .toString();
} }
} }

240
spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -41,8 +41,10 @@ import static org.junit.Assert.*;
public class MergedContextConfigurationTests { public class MergedContextConfigurationTests {
private static final String[] EMPTY_STRING_ARRAY = new String[0]; private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0]; private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
private final GenericXmlContextLoader loader = new GenericXmlContextLoader(); private final GenericXmlContextLoader loader = new GenericXmlContextLoader();
@ -50,7 +52,6 @@ public class MergedContextConfigurationTests {
public void hashCodeWithNulls() { public void hashCodeWithNulls() {
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(null, null, null, null, null); MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(null, null, null, null, null);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(null, null, null, null, null); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(null, null, null, null, null);
assertTrue(mergedConfig1.hashCode() > 0);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -63,19 +64,19 @@ public class MergedContextConfigurationTests {
@Test @Test
public void hashCodeWithEmptyArrays() { public void hashCodeWithEmptyArrays() {
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@Test @Test
public void hashCodeWithEmptyArraysAndDifferentLoaders() { public void hashCodeWithEmptyArraysAndDifferentLoaders() {
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, new AnnotationConfigContextLoader()); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, new AnnotationConfigContextLoader());
assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -83,9 +84,9 @@ public class MergedContextConfigurationTests {
public void hashCodeWithSameLocations() { public void hashCodeWithSameLocations() {
String[] locations = new String[] { "foo", "bar}" }; String[] locations = new String[] { "foo", "bar}" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), locations, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), locations,
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), locations, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), locations,
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -94,19 +95,19 @@ public class MergedContextConfigurationTests {
String[] locations1 = new String[] { "foo", "bar}" }; String[] locations1 = new String[] { "foo", "bar}" };
String[] locations2 = new String[] { "baz", "quux}" }; String[] locations2 = new String[] { "baz", "quux}" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), locations1, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), locations1,
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), locations2, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), locations2,
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@Test @Test
public void hashCodeWithSameConfigClasses() { public void hashCodeWithSameConfigClasses() {
Class<?>[] classes = new Class<?>[] { String.class, Integer.class }; Class<?>[] classes = new Class<?>[] { String.class, Integer.class };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
classes, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, classes, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
classes, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, classes, EMPTY_STRING_ARRAY, loader);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -114,20 +115,20 @@ public class MergedContextConfigurationTests {
public void hashCodeWithDifferentConfigClasses() { public void hashCodeWithDifferentConfigClasses() {
Class<?>[] classes1 = new Class<?>[] { String.class, Integer.class }; Class<?>[] classes1 = new Class<?>[] { String.class, Integer.class };
Class<?>[] classes2 = new Class<?>[] { Boolean.class, Number.class }; Class<?>[] classes2 = new Class<?>[] { Boolean.class, Number.class };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
classes1, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, classes1, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
classes2, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, classes2, EMPTY_STRING_ARRAY, loader);
assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@Test @Test
public void hashCodeWithSameProfiles() { public void hashCodeWithSameProfiles() {
String[] activeProfiles = new String[] { "catbert", "dogbert" }; String[] activeProfiles = new String[] { "catbert", "dogbert" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles, loader);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -135,10 +136,10 @@ public class MergedContextConfigurationTests {
public void hashCodeWithSameProfilesReversed() { public void hashCodeWithSameProfilesReversed() {
String[] activeProfiles1 = new String[] { "catbert", "dogbert" }; String[] activeProfiles1 = new String[] { "catbert", "dogbert" };
String[] activeProfiles2 = new String[] { "dogbert", "catbert" }; String[] activeProfiles2 = new String[] { "dogbert", "catbert" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles1, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles2, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -146,10 +147,10 @@ public class MergedContextConfigurationTests {
public void hashCodeWithSameDuplicateProfiles() { public void hashCodeWithSameDuplicateProfiles() {
String[] activeProfiles1 = new String[] { "catbert", "dogbert" }; String[] activeProfiles1 = new String[] { "catbert", "dogbert" };
String[] activeProfiles2 = new String[] { "catbert", "dogbert", "catbert", "dogbert", "catbert" }; String[] activeProfiles2 = new String[] { "catbert", "dogbert", "catbert", "dogbert", "catbert" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles1, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles2, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -157,46 +158,46 @@ public class MergedContextConfigurationTests {
public void hashCodeWithDifferentProfiles() { public void hashCodeWithDifferentProfiles() {
String[] activeProfiles1 = new String[] { "catbert", "dogbert" }; String[] activeProfiles1 = new String[] { "catbert", "dogbert" };
String[] activeProfiles2 = new String[] { "X", "Y" }; String[] activeProfiles2 = new String[] { "X", "Y" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles1, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles2, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader);
assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@Test @Test
public void hashCodeWithSameInitializers() { public void hashCodeWithSameInitializers() {
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses1 = // Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses1 =
new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>(); new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>();
initializerClasses1.add(FooInitializer.class); initializerClasses1.add(FooInitializer.class);
initializerClasses1.add(BarInitializer.class); initializerClasses1.add(BarInitializer.class);
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses2 = // Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses2 =
new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>(); new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>();
initializerClasses2.add(BarInitializer.class); initializerClasses2.add(BarInitializer.class);
initializerClasses2.add(FooInitializer.class); initializerClasses2.add(FooInitializer.class);
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@Test @Test
public void hashCodeWithDifferentInitializers() { public void hashCodeWithDifferentInitializers() {
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses1 = // Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses1 =
new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>(); new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>();
initializerClasses1.add(FooInitializer.class); initializerClasses1.add(FooInitializer.class);
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses2 = // Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses2 =
new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>(); new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>();
initializerClasses2.add(BarInitializer.class); initializerClasses2.add(BarInitializer.class);
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader);
assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -206,12 +207,12 @@ public class MergedContextConfigurationTests {
@Test @Test
public void hashCodeWithSameParent() { public void hashCodeWithSameParent() {
MergedContextConfiguration parent = new MergedContextConfiguration(getClass(), new String[] { "foo", "bar}" }, MergedContextConfiguration parent = new MergedContextConfiguration(getClass(), new String[] { "foo", "bar}" },
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY,
EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent); EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent);
assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -221,14 +222,14 @@ public class MergedContextConfigurationTests {
@Test @Test
public void hashCodeWithDifferentParents() { public void hashCodeWithDifferentParents() {
MergedContextConfiguration parent1 = new MergedContextConfiguration(getClass(), new String[] { "foo", "bar}" }, MergedContextConfiguration parent1 = new MergedContextConfiguration(getClass(), new String[] { "foo", "bar}" },
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration parent2 = new MergedContextConfiguration(getClass(), new String[] { "baz", "quux" }, MergedContextConfiguration parent2 = new MergedContextConfiguration(getClass(), new String[] { "baz", "quux" },
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY,
EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent1); EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent1);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY,
EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent2); EMPTY_CLASS_ARRAY, null, EMPTY_STRING_ARRAY, loader, null, parent2);
assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode());
} }
@ -237,7 +238,7 @@ public class MergedContextConfigurationTests {
MergedContextConfiguration mergedConfig = new MergedContextConfiguration(null, null, null, null, null); MergedContextConfiguration mergedConfig = new MergedContextConfiguration(null, null, null, null, null);
assertEquals(mergedConfig, mergedConfig); assertEquals(mergedConfig, mergedConfig);
assertNotEquals(mergedConfig, null); assertNotEquals(mergedConfig, null);
assertNotEquals(mergedConfig, new Integer(1)); assertNotEquals(mergedConfig, 1);
} }
@Test @Test
@ -256,19 +257,19 @@ public class MergedContextConfigurationTests {
@Test @Test
public void equalsWithEmptyArrays() { public void equalsWithEmptyArrays() {
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
assertEquals(mergedConfig1, mergedConfig2); assertEquals(mergedConfig1, mergedConfig2);
} }
@Test @Test
public void equalsWithEmptyArraysAndDifferentLoaders() { public void equalsWithEmptyArraysAndDifferentLoaders() {
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, new AnnotationConfigContextLoader()); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, new AnnotationConfigContextLoader());
assertNotEquals(mergedConfig1, mergedConfig2); assertNotEquals(mergedConfig1, mergedConfig2);
assertNotEquals(mergedConfig2, mergedConfig1); assertNotEquals(mergedConfig2, mergedConfig1);
} }
@ -276,10 +277,10 @@ public class MergedContextConfigurationTests {
@Test @Test
public void equalsWithSameLocations() { public void equalsWithSameLocations() {
String[] locations = new String[] { "foo", "bar}" }; String[] locations = new String[] { "foo", "bar}" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), locations, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); locations, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), locations, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); locations, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
assertEquals(mergedConfig1, mergedConfig2); assertEquals(mergedConfig1, mergedConfig2);
} }
@ -287,10 +288,10 @@ public class MergedContextConfigurationTests {
public void equalsWithDifferentLocations() { public void equalsWithDifferentLocations() {
String[] locations1 = new String[] { "foo", "bar}" }; String[] locations1 = new String[] { "foo", "bar}" };
String[] locations2 = new String[] { "baz", "quux}" }; String[] locations2 = new String[] { "baz", "quux}" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), locations1, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); locations1, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), locations2, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader); locations2, EMPTY_CLASS_ARRAY, EMPTY_STRING_ARRAY, loader);
assertNotEquals(mergedConfig1, mergedConfig2); assertNotEquals(mergedConfig1, mergedConfig2);
assertNotEquals(mergedConfig2, mergedConfig1); assertNotEquals(mergedConfig2, mergedConfig1);
} }
@ -298,10 +299,10 @@ public class MergedContextConfigurationTests {
@Test @Test
public void equalsWithSameConfigClasses() { public void equalsWithSameConfigClasses() {
Class<?>[] classes = new Class<?>[] { String.class, Integer.class }; Class<?>[] classes = new Class<?>[] { String.class, Integer.class };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
classes, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, classes, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
classes, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, classes, EMPTY_STRING_ARRAY, loader);
assertEquals(mergedConfig1, mergedConfig2); assertEquals(mergedConfig1, mergedConfig2);
} }
@ -309,10 +310,10 @@ public class MergedContextConfigurationTests {
public void equalsWithDifferentConfigClasses() { public void equalsWithDifferentConfigClasses() {
Class<?>[] classes1 = new Class<?>[] { String.class, Integer.class }; Class<?>[] classes1 = new Class<?>[] { String.class, Integer.class };
Class<?>[] classes2 = new Class<?>[] { Boolean.class, Number.class }; Class<?>[] classes2 = new Class<?>[] { Boolean.class, Number.class };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
classes1, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, classes1, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
classes2, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, classes2, EMPTY_STRING_ARRAY, loader);
assertNotEquals(mergedConfig1, mergedConfig2); assertNotEquals(mergedConfig1, mergedConfig2);
assertNotEquals(mergedConfig2, mergedConfig1); assertNotEquals(mergedConfig2, mergedConfig1);
} }
@ -320,10 +321,10 @@ public class MergedContextConfigurationTests {
@Test @Test
public void equalsWithSameProfiles() { public void equalsWithSameProfiles() {
String[] activeProfiles = new String[] { "catbert", "dogbert" }; String[] activeProfiles = new String[] { "catbert", "dogbert" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles, loader);
assertEquals(mergedConfig1, mergedConfig2); assertEquals(mergedConfig1, mergedConfig2);
} }
@ -331,10 +332,10 @@ public class MergedContextConfigurationTests {
public void equalsWithSameProfilesReversed() { public void equalsWithSameProfilesReversed() {
String[] activeProfiles1 = new String[] { "catbert", "dogbert" }; String[] activeProfiles1 = new String[] { "catbert", "dogbert" };
String[] activeProfiles2 = new String[] { "dogbert", "catbert" }; String[] activeProfiles2 = new String[] { "dogbert", "catbert" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles1, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles2, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader);
assertEquals(mergedConfig1, mergedConfig2); assertEquals(mergedConfig1, mergedConfig2);
} }
@ -342,10 +343,10 @@ public class MergedContextConfigurationTests {
public void equalsWithSameDuplicateProfiles() { public void equalsWithSameDuplicateProfiles() {
String[] activeProfiles1 = new String[] { "catbert", "dogbert" }; String[] activeProfiles1 = new String[] { "catbert", "dogbert" };
String[] activeProfiles2 = new String[] { "catbert", "dogbert", "catbert", "dogbert", "catbert" }; String[] activeProfiles2 = new String[] { "catbert", "dogbert", "catbert", "dogbert", "catbert" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles1, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles2, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader);
assertEquals(mergedConfig1, mergedConfig2); assertEquals(mergedConfig1, mergedConfig2);
} }
@ -353,47 +354,47 @@ public class MergedContextConfigurationTests {
public void equalsWithDifferentProfiles() { public void equalsWithDifferentProfiles() {
String[] activeProfiles1 = new String[] { "catbert", "dogbert" }; String[] activeProfiles1 = new String[] { "catbert", "dogbert" };
String[] activeProfiles2 = new String[] { "X", "Y" }; String[] activeProfiles2 = new String[] { "X", "Y" };
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles1, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, activeProfiles2, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader);
assertNotEquals(mergedConfig1, mergedConfig2); assertNotEquals(mergedConfig1, mergedConfig2);
assertNotEquals(mergedConfig2, mergedConfig1); assertNotEquals(mergedConfig2, mergedConfig1);
} }
@Test @Test
public void equalsWithSameInitializers() { public void equalsWithSameInitializers() {
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses1 = // Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses1 =
new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>(); new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>();
initializerClasses1.add(FooInitializer.class); initializerClasses1.add(FooInitializer.class);
initializerClasses1.add(BarInitializer.class); initializerClasses1.add(BarInitializer.class);
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses2 = // Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses2 =
new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>(); new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>();
initializerClasses2.add(BarInitializer.class); initializerClasses2.add(BarInitializer.class);
initializerClasses2.add(FooInitializer.class); initializerClasses2.add(FooInitializer.class);
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader);
assertEquals(mergedConfig1, mergedConfig2); assertEquals(mergedConfig1, mergedConfig2);
} }
@Test @Test
public void equalsWithDifferentInitializers() { public void equalsWithDifferentInitializers() {
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses1 = // Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses1 =
new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>(); new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>();
initializerClasses1.add(FooInitializer.class); initializerClasses1.add(FooInitializer.class);
Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses2 = // Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses2 =
new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>(); new HashSet<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>>();
initializerClasses2.add(BarInitializer.class); initializerClasses2.add(BarInitializer.class);
MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig1 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses1, EMPTY_STRING_ARRAY, loader);
MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(),
EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader); EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, initializerClasses2, EMPTY_STRING_ARRAY, loader);
assertNotEquals(mergedConfig1, mergedConfig2); assertNotEquals(mergedConfig1, mergedConfig2);
assertNotEquals(mergedConfig2, mergedConfig1); assertNotEquals(mergedConfig2, mergedConfig1);
} }
@ -440,6 +441,7 @@ public class MergedContextConfigurationTests {
} }
} }
private static class BarInitializer implements ApplicationContextInitializer<GenericApplicationContext> { private static class BarInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
@Override @Override

13
spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
Unescape View File

@ -42,11 +42,13 @@ public class HttpHeadersTests {
private HttpHeaders headers; private HttpHeaders headers;
@Before @Before
public void setUp() { public void setUp() {
headers = new HttpHeaders(); headers = new HttpHeaders();
} }
@Test @Test
public void accept() { public void accept() {
MediaType mediaType1 = new MediaType("text", "html"); MediaType mediaType1 = new MediaType("text", "html");
@ -59,9 +61,7 @@ public class HttpHeadersTests {
assertEquals("Invalid Accept header", "text/html, text/plain", headers.getFirst("Accept")); assertEquals("Invalid Accept header", "text/html, text/plain", headers.getFirst("Accept"));
} }
// SPR-9655 @Test // SPR-9655
@Test
public void acceptiPlanet() { public void acceptiPlanet() {
headers.add("Accept", "text/html"); headers.add("Accept", "text/html");
headers.add("Accept", "text/plain"); headers.add("Accept", "text/plain");
@ -228,7 +228,7 @@ public class HttpHeadersTests {
calendar.setTimeZone(TimeZone.getTimeZone("CET")); calendar.setTimeZone(TimeZone.getTimeZone("CET"));
long date = calendar.getTimeInMillis(); long date = calendar.getTimeInMillis();
headers.setIfModifiedSince(date); headers.setIfModifiedSince(date);
assertEquals("Invalid If-Modified-Since header", date, headers.getIfNotModifiedSince()); assertEquals("Invalid If-Modified-Since header", date, headers.getIfModifiedSince());
assertEquals("Invalid If-Modified-Since header", "Thu, 18 Dec 2008 10:20:00 GMT", assertEquals("Invalid If-Modified-Since header", "Thu, 18 Dec 2008 10:20:00 GMT",
headers.getFirst("if-modified-since")); headers.getFirst("if-modified-since"));
} }
@ -260,12 +260,9 @@ public class HttpHeadersTests {
headers.getFirst("Content-Disposition")); headers.getFirst("Content-Disposition"));
} }
// SPR-11917 @Test // SPR-11917
@Test
public void getAllowEmptySet() { public void getAllowEmptySet() {
headers.setAllow(Collections.<HttpMethod> emptySet()); headers.setAllow(Collections.<HttpMethod> emptySet());
assertThat(headers.getAllow(), Matchers.emptyCollectionOf(HttpMethod.class)); assertThat(headers.getAllow(), Matchers.emptyCollectionOf(HttpMethod.class));
} }

3
spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -30,7 +30,6 @@ public class UriUtilsTests {
private static final String ENC = "UTF-8"; private static final String ENC = "UTF-8";
@Test @Test
public void encodeScheme() throws UnsupportedEncodingException { public void encodeScheme() throws UnsupportedEncodingException {
assertEquals("Invalid encoded result", "foobar+-.", UriUtils.encodeScheme("foobar+-.", ENC)); assertEquals("Invalid encoded result", "foobar+-.", UriUtils.encodeScheme("foobar+-.", ENC));

Write Preview
Loading…
Cancel
Save