32bca54000
[SPR-8386] polishing JavaDoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4444 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 22:51:53 +00:00
39b790032f
[SPR-7326] MergedContextConfiguration now ensures that it holds non-null arrays with proper semantics for TestContext's cache key generation.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4443 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 22:46:43 +00:00
59dea815c7
[SPR-7326] Added unit tests to verify proper semantics of TestContext's cache key generation.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4442 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 21:38:05 +00:00
d0368e1f1c
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4440 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 16:19:41 +00:00
137353b2c2
Suppressing warnings for deprecation of SimpleJdbcTemplate; polishing JavaDoc; using TestNG assertions in TestNG tests.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4438 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 14:10:16 +00:00
06b6d0a908
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4437 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 13:40:45 +00:00
dba7795ed7
[SPR-6184] AnnotationConfigContextLoader now defines "$ContextConfiguration" as the resource suffix for generated default @Configuration class names.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4436 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 13:39:15 +00:00
03b79452a9
[SPR-6184] AnnotationConfigContextLoader now defines "$ContextConfiguration" as the resource suffix for generated default @Configuration class names.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4435 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 13:11:06 +00:00
b986a8f32b
[SPR-7960][SPR-8386] Supporting declarative configuration of bean definition profiles in the TestContext framework:
...
- TextContext now works with MergedContextConfiguration instead of locations and loader
- TextContext now builds context caching key from MergedContextConfiguration
- Test context caching is now based on locations, classes, active profiles, and context loader
- TextContext now delegates to SmartContextLoader or ContextLoader as appropriate
- AbstractContextLoader now implements SmartContextLoader
- AbstractGenericContextLoader now sets active profiles in the GenericApplicationContext
- Introduced integration tests for profile support in the TCF for both XML and annotation config
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4421 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:51:37 +00:00
4497a9ad8d
[SPR-7960][SPR-8386] First draft of SmartContextLoader SPI, MergedContextConfiguration, and ContextConfigurationAttributes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4416 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:45:22 +00:00
b6a38353ba
[SPR-7960] Trimming profiles for good measure.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4400 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 15:04:34 +00:00
42bc8518db
[SPR-7960] Renamed @ActivateProfiles to @ActiveProfiles and fleshed out JavaDoc.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4399 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 14:40:53 +00:00
5e669b45d7
[SPR-7960] Renamed resolveActivatedProfiles() to resolveActiveProfiles().
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4397 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:59:47 +00:00
7a63437224
[SPR-7960] resolveActivatedProfiles() now resolves a unique set of activated profiles
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4396 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:56:50 +00:00
4218599fa5
[SPR-7960] No longer tracking empty activated profiles.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4394 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 22:29:14 +00:00
4449e26b7f
[SPR-7960] No longer tracking empty activated profiles.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4393 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 22:12:53 +00:00
4e52a6da68
[SPR-7960] Initial support for @ActivateProfiles in tests.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4387 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 22:00:12 +00:00
675b6d0d33
[SPR-7960] Initial support for @ActivateProfiles in tests.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4386 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-30 21:59:12 +00:00
0b1f42ef66
Update MockEnvironment / MockPropertySource types
...
Reflecting signature changes in getProperty() methods
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4245 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 18:57:41 +00:00
ab05ddc486
[SPR-6184] Simplifying ContextLoader implmementation:
...
- Removed AbstractGenericContextLoader's createGenericApplicationContext() method.
- AnnotationConfigContextLoader now uses an AnnotatedBeanDefinitionReader instead of working with an AnnotationConfigApplicationContext.
- AnnotationConfigContextLoader now uses the supplied GenericApplicationContext to load configuration classes.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4243 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 12:05:56 +00:00
c7d9b440b9
[SPR-6184] completed JavaDoc for @ContextConfiguration.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4209 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-10 23:20:05 +00:00
ab2083d4b8
[SPR-6184] completed JavaDoc for AnnotationConfigContextLoader; polished JavaDoc for other concrete context loaders.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4207 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 23:24:34 +00:00
833e85d991
[SPR-6184] added tests to verify support for @Configuration classes with TestNG; simplified existing TestNG tests using Spring 3.0 and 3.1 features.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4206 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 22:44:53 +00:00
98346213c1
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4205 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 21:40:08 +00:00
689016f074
[SPR-6184] additional sanity check tests analogous to those developed for [SPR-3896].
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4204 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 21:39:42 +00:00
68f285d39d
[SPR-6184] polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4203 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 14:46:49 +00:00
3be106c34d
[SPR-6184] Fleshed out JavaDoc for ResourceTypeAwareContextLoader and ContextLoaderUtils.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4202 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 14:34:16 +00:00
0598e870f0
Updated Eclipse code formatter settings for use with STS 2.6. Specifically, format_javadoc_comments=false, which requires that JavaDoc be formatted manually.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4201 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 13:31:02 +00:00
5d0c5f7698
[SPR-6184] Introduced ResourceType enum for context loaders; documented tests.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4199 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-08 22:57:45 +00:00
772aee728b
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4177 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-04 22:06:05 +00:00
190da51082
[SPR-6184] Implemented recursive search for configuration classes; introduced LocationsResolver strategy in ContextLoaderUtils with ResourcePathLocationsResolver and ClassNameLocationsResolver implementations.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4168 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 23:10:28 +00:00
29c33bcd7d
[SPR-6184] Refactored internals of ContextLoaderUtils; @Ignore'd broken test.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4166 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:45:20 +00:00
d63dba327d
[SPR-6184] Updated TODOs.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4165 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:23:57 +00:00
9d601f8504
[SPR-6184] Added DefaultConfigClassInheritedTests to verify proper recursive search for configuration classes configured via @ContextConfiguration. This test is currently failing (as expected) and therefore @Ignore'd.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4164 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:22:43 +00:00
619ac47b00
Removed unnecessary declaration of @TestExecutionListeners.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4163 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:20:02 +00:00
7d88c46caa
[SPR-6184] Extracted ContextLoader resolution functionality from TestContext into a new ContextLoaderUtils utility class.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4162 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:00:45 +00:00
f4d500dfeb
[SPR-6184] Introduced ResourceTypeAwareContextLoader interface and removed dependency on AnnotationConfigContextLoader in TestContext.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4161 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 16:37:24 +00:00
caad437248
polishing JavaDoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4160 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 15:26:13 +00:00
dac8a4087c
[SPR-6184] Simplified AnnotationConfigContextLoader in TestContext.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4159 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 15:16:13 +00:00
f2c2fed6e1
[SPR-6184] AnnotationConfigContextLoader now generates a default configuration class name; fleshed out documentation of AnnotationConfigContextLoader; introduced sub-package and suite for configuration class tests.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4158 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 14:37:29 +00:00
3c25a17ddf
[SPR-6184] AnnotationConfigContextLoader now calls AnnotationConfigApplicationContext's register(Class<?>...) method in one go, via var-args.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4142 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-31 00:00:31 +00:00
d20150b0d5
[SPR-6184] AnnotationConfigContextLoader now extends AbstractGenericContextLoader; added new extension points to AbstractGenericContextLoader.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4141 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-30 23:50:19 +00:00
8c4a19caf8
[SPR-6184] Initial draft of the new AnnotationConfigContextLoader.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4132 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-29 23:42:59 +00:00
80e0a5b8a5
[SPR-6184] Initial draft of the new AnnotationConfigContextLoader.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4131 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-29 23:38:37 +00:00
c9ae95c578
[SPR-6184] Work in Progress
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4129 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-28 21:45:14 +00:00
e3526bde80
Updating JUnit and TestNG versions for IDEs and Maven.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4128 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-28 19:59:09 +00:00
da384be170
Polishing and fixed broken support for @IfProfileValue in AbstractJpaTests (even though it's deprecated).
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4118 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-28 17:23:48 +00:00
00c3ca6c3f
[SPR-8030] AbstractJUnit38SpringContextTests and AbstractTransactionalJUnit38SpringContextTests are now officially deprecated.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4116 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-28 14:43:01 +00:00
07b55d2bac
[SPR-8030] AbstractJUnit38SpringContextTests and AbstractTransactionalJUnit38SpringContextTests are now officially deprecated.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4070 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-09 11:45:43 +00:00
adc9400905
Include license.txt and notice.txt in module JARs
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3967 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 06:56:40 +00:00
Sam Brannen
Chris Beams