diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2016-08-02 11:13:32 +0200 |
|---|---|---|
| committer | Emmanuel Bourg <ebourg@apache.org> | 2016-08-02 11:13:32 +0200 |
| commit | f69f2a4b8ea697b3a631c0dc7a470e3c9793fee3 (patch) | |
| tree | db2f25b29aa3e59c463ab41d3f2856f6265bb1a5 /spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java | |
| parent | 5575b60c30c5a0c308c4ba3a2db93956d8c1746c (diff) | |
Imported Upstream version 4.2.6
Diffstat (limited to 'spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java')
| -rw-r--r-- | spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java index 3da7bf81..bf8eba04 100644 --- a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,8 @@ import static org.junit.Assert.*; * Unit tests for {@link MergedContextConfiguration}. * * <p>These tests primarily exist to ensure that {@code MergedContextConfiguration} - * can safely be used as the cache key for {@link ContextCache}. + * can safely be used as the cache key for + * {@link org.springframework.test.context.cache.ContextCache ContextCache}. * * @author Sam Brannen * @since 3.1 @@ -140,7 +141,7 @@ public class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader); - assertEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); + assertNotEquals(mergedConfig1.hashCode(), mergedConfig2.hashCode()); } @Test @@ -336,7 +337,7 @@ public class MergedContextConfigurationTests { EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles1, loader); MergedContextConfiguration mergedConfig2 = new MergedContextConfiguration(getClass(), EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, activeProfiles2, loader); - assertEquals(mergedConfig1, mergedConfig2); + assertNotEquals(mergedConfig1, mergedConfig2); } @Test |