Commit Graph

105 Commits

Author SHA1 Message Date
Chris Beams 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 0146bf787a Suppressing warnings, polishing JavaDoc, etc.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3965 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 22:50:45 +00:00
Chris Beams 1ac7b56caf M1 cut of environment, profiles and property work (SPR-7508)
Decomposed Environment interface into PropertySources, PropertyResolver
objects

    Environment interface and implementations are still present, but
    simpler.

    PropertySources container aggregates PropertySource objects;
    PropertyResolver provides search, conversion, placeholder
    replacement. Single implementation for now is
    PropertySourcesPlaceholderResolver

Renamed EnvironmentAwarePropertyPlaceholderConfigurer to
PropertySourcesPlaceholderConfigurer

    <context:property-placeholder/> now registers PSPC by default, else
    PPC if systemPropertiesMode* settings are involved

Refined configuration and behavior of default profiles

    See Environment interface Javadoc for details

Added Portlet implementations of relevant interfaces:

    * DefaultPortletEnvironment
    * PortletConfigPropertySource, PortletContextPropertySource
    * Integrated each appropriately throughout Portlet app contexts

Added protected 'createEnvironment()' method to AbstractApplicationContext

    Subclasses can override at will to supply a custom Environment
    implementation.  In practice throughout the framework, this is how
    Web- and Portlet-related ApplicationContexts override use of the
    DefaultEnvironment and swap in DefaultWebEnvironment or
    DefaultPortletEnvironment as appropriate.

Introduced "stub-and-replace" behavior for Servlet- and Portlet-based
PropertySource implementations

    Allows for early registration and ordering of the stub, then
    replacement with actual backing object at refresh() time.

    Added AbstractApplicationContext.initPropertySources() method to
    support stub-and-replace behavior. Called from within existing
    prepareRefresh() method so as to avoid impact with
    ApplicationContext implementations that copy and modify AAC's
    refresh() method (e.g.: Spring DM).

    Added methods to WebApplicationContextUtils and
    PortletApplicationContextUtils to support stub-and-replace behavior

Added comprehensive Javadoc for all new or modified types and members

Added XSD documentation for all new or modified elements and attributes

    Including nested <beans>, <beans profile="..."/>, and changes for
    certain attributes type from xsd:IDREF to xsd:string

Improved fix for detecting non-file based Resources in
PropertiesLoaderSupport (SPR-7547, SPR-7552)

    Technically unrelated to environment work, but grouped in with
    this changeset for convenience.

Deprecated (removed) context:property-placeholder
'system-properties-mode' attribute from spring-context-3.1.xsd

    Functionality is preserved for those using schemas up to and including
    spring-context-3.0.  For 3.1, system-properties-mode is no longer
    supported as it conflicts with the idea of managing a set of property
    sources within the context's Environment object. See Javadoc in
    PropertyPlaceholderConfigurer, AbstractPropertyPlaceholderConfigurer
    and PropertySourcesPlaceholderConfigurer for details.

Introduced CollectionUtils.toArray(Enumeration<E>, A[])

Work items remaining for 3.1 M2:

    Consider repackaging PropertySource* types; eliminate internal use
    of SystemPropertyUtils and deprecate

    Further work on composition of Environment interface; consider
    repurposing existing PlaceholderResolver interface to obviate need
    for resolve[Required]Placeholder() methods currently in Environment.

    Ensure configurability of placeholder prefix, suffix, and value
    separator when working against an AbstractPropertyResolver

    Add JNDI-based Environment / PropertySource implementatinos

    Consider support for @Profile at the @Bean level

    Provide consistent logging for the entire property resolution
    lifecycle; consider issuing all such messages against a dedicated
    logger with a single category.

    Add reference documentation to cover the featureset.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3839 50f2f4bb-b051-0410-bef5-90022cba6387
2011-01-03 09:04:34 +00:00
David Syer 1a4fac31d9 SPR-7705: re-order rules and befores
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3801 50f2f4bb-b051-0410-bef5-90022cba6387
2010-11-17 17:27:03 +00:00
Juergen Hoeller 80e66fc84d getTestExecutionListeners() returns actual List which allows for iteration as well as modification (SPR-7595)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3709 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-02 01:05:40 +00:00
Juergen Hoeller 72b836f379 avoid ConcurrentModificationException when iterating attribute names (SPR-7557)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3707 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-01 22:27:34 +00:00
Juergen Hoeller bcd552abfe polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3592 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 23:01:10 +00:00
Juergen Hoeller 29c3bb3152 MockMultipartHttpServletRequest pre-defines method "POST" and content type "multipart/form-data"
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3587 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 22:46:15 +00:00
Juergen Hoeller 93fb8760ff consistent mocks between modules
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3586 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 22:02:40 +00:00
Juergen Hoeller 9fa9615409 MockHttpServletResponse supports multiple includes (SPR-7188)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3323 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-12 14:05:21 +00:00
Sam Brannen a59bad673d [SPR-6918] Now verifying support for @Value in conjunction with the Spring TestContext Framework.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3118 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-19 12:57:17 +00:00
Juergen Hoeller e054e8cd6b fixed test failures
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3102 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-12 20:55:44 +00:00
Juergen Hoeller 651d6636da polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3101 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-12 20:45:02 +00:00
Juergen Hoeller 630ecacac9 @Transactional qualifiers work in unit tests as well (SPR-6892)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3100 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-12 20:44:41 +00:00
Sam Brannen eb32403fcd [SPR-6879] @DirtiesContext is now an @Inherited annotation.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3033 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-23 17:43:00 +00:00
Juergen Hoeller 508d9ba48b added warning about pointing to a custom transaction manager bean (SPR-5174)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2924 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 16:47:57 +00:00
Juergen Hoeller d800fc21d3 revised javadoc (SPR-5720)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2607 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-09 15:24:47 +00:00
Juergen Hoeller 2cc308174e avoid potential NPE (SPR-6300)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2397 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-12 13:42:07 +00:00
Costin Leau c5a0c30f75 SPR-6194
+ add setter for servlet minor version to MockServletContext

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2296 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-09 11:51:30 +00:00
Sam Brannen b3f3c03505 [SPR-6124] Verified that timed transactional tests fail with the TestNG integration in the TestContext framework.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2182 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-26 13:38:59 +00:00
Sam Brannen 751f80d1bb [SPR-6128] Verified that claims raised in this issue no longer apply.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2181 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-26 13:00:04 +00:00
Sam Brannen 084ef7ce58 Now verifying support for @Named as well.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2057 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-06 21:10:06 +00:00
Sam Brannen 3a7c2ffa6b SpringJUnit4ClassRunnerAppCtxTests now verifies seamless support for using @Inject in addition to @Autowired, etc.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2053 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-05 22:08:01 +00:00
Juergen Hoeller 599910699a fixed overview files
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2005 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 08:47:18 +00:00
Sam Brannen c0d38136cc [SPR-6104] @TestExecutionListeners now supports a 'listeners' alias for its existing 'value' attribute.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1872 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-13 13:55:34 +00:00
Sam Brannen aca7cf4c58 [SPR-4643] SpringJUnit4ClassRunner now optionally calls JUnit 4.7's BlockJUnit4ClassRunner.withRules() method using reflection in order to provide backward compatibility with JUnit 4.5 and 4.6.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1835 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 21:03:32 +00:00
Sam Brannen 5e9f8ac4ce Including HibernateSessionFlushingTests in the suite.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1795 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-01 17:33:29 +00:00
Sam Brannen f2e434b960 [SPR-4702] now updating TestContext state before calling before/after test class life cycle callbacks.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1794 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-01 17:33:12 +00:00
Sam Brannen f2a3b079ad [SPR-6011] SpringJUnit4ClassRunner once again supports collective timeouts for repeated tests.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1786 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-28 17:28:25 +00:00
Sam Brannen 94b16a169b Added assertPersonCount() functionality for increased robustness.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1784 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-28 09:23:02 +00:00
Arjen Poutsma db7751e5ee SPR-2784: Support MultipartFile-array property
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1783 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-28 09:15:19 +00:00
Sam Brannen 9bfc5b6d28 [SPR-6043] @NotTransactional is now deprecated
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1769 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-26 23:23:07 +00:00
Sam Brannen d26121edbd [SPR-5995] Updated documentation regarding compatibility with JUnit 4.5, 4.6, and 4.7.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1764 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-26 13:13:06 +00:00
Sam Brannen 0c3f4fc03b [SPR-5995] Renamed makeNotifier() to springMakeNotifier() in order to allow compatibility with JUnit 4.5, 4.6, and 4.7.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1763 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-26 12:37:59 +00:00
Sam Brannen 9183af2c2e polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1749 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-24 12:14:57 +00:00
Sam Brannen 97efe7bffe [SPR-4702] Updated JavaDoc regarding before/after test class lifecycle callbacks.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1748 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-22 21:50:02 +00:00
Sam Brannen bf095ba26b Polishing test annotation declarations and JavaDoc.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1747 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-21 11:44:38 +00:00
Sam Brannen 2dda490944 [SPR-5963] Upgraded to JUnit 4.7
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1731 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-11 10:12:20 +00:00
Juergen Hoeller eedfe34258 turned requestedSessionId into a settable property
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1701 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-05 22:01:46 +00:00
Sam Brannen a3e99abeb7 [SPR-5315][SPR-5699] Reverted changes to TransactionalTestExecutionListener: transactions are no longer automatically flushed before rolling back.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1569 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-21 11:03:59 +00:00
Sam Brannen 9e529d9b42 [SPR-5916] polishing.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1562 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-20 12:14:56 +00:00
Sam Brannen 2d1d61cb0f [SPR-5916] ContextLoader class is now inherited from class hierarchy if not specified explicitly via @ContextConfiguration's loader attribute on the current test class.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1561 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-20 09:35:33 +00:00
Sam Brannen b9f726f7aa [SPR-5916] polishing.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1550 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-16 13:50:54 +00:00
Sam Brannen 27b6c0d7cc [SPR-5699] Investigating issues surrounding automatic flushing of the underlying ORM tool's session via TransactionalTestExecutionListener.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1519 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-11 16:45:48 +00:00
Sam Brannen c4b5960c13 [SPR-5914] ProfileValueUtils now properly ensures that class-level usage of @IfProfileValue overrides method-level usage.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1507 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-10 11:45:31 +00:00
Andy Clement f4a52f32b3 SPR-5906: test and fix for using expressions in property list keys and values
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1485 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-07 20:13:18 +00:00
Sam Brannen d6aec2552e [SPR-5902] JavaDoc polishing.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1481 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-06 22:36:47 +00:00
Sam Brannen bcc57cf59a [SPR-5640] polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1479 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-06 19:24:34 +00:00
Sam Brannen 4f9c1bf118 [SPR-5640] Added support for marking the test application context as 'dirty' after each test method within a given test class via the new DirtiesContext.classMode() attribute.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1477 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-06 19:17:16 +00:00
Sam Brannen aa84e3a83b [SPR-4702] Explicit tests for TestExecutionListener's new beforeTestClass() and afterTestClass()} lifecycle callback methods with TestNG support classes.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1474 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-06 15:08:06 +00:00