Commit Graph

212 Commits

Author SHA1 Message Date
Sam Brannen 732493951e [SPR-6184] AnnotationConfigContextLoader now extends AbstractGenericContextLoader; added new extension points to AbstractGenericContextLoader. 2011-03-30 23:50:19 +00:00
Sam Brannen 10640233dc [SPR-6184] Initial draft of the new AnnotationConfigContextLoader. 2011-03-29 23:42:59 +00:00
Sam Brannen 334e4f2212 [SPR-6184] Initial draft of the new AnnotationConfigContextLoader. 2011-03-29 23:38:37 +00:00
Sam Brannen b50338fd32 [SPR-6184] Work in Progress 2011-03-28 21:45:14 +00:00
Sam Brannen 726564c84d Polishing and fixed broken support for @IfProfileValue in AbstractJpaTests (even though it's deprecated). 2011-03-28 17:23:48 +00:00
Sam Brannen 657b145ea2 [SPR-8030] AbstractJUnit38SpringContextTests and AbstractTransactionalJUnit38SpringContextTests are now officially deprecated. 2011-03-28 14:43:01 +00:00
Sam Brannen c736e6b873 [SPR-8030] AbstractJUnit38SpringContextTests and AbstractTransactionalJUnit38SpringContextTests are now officially deprecated. 2011-03-09 11:45:43 +00:00
Chris Beams 2f7c2230f0 Include license.txt and notice.txt in module JARs 2011-02-09 06:56:40 +00:00
Sam Brannen 6926e0f563 Suppressing warnings, polishing JavaDoc, etc. 2011-02-08 22:50:45 +00:00
Chris Beams b3ff9be78f 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.
2011-01-03 09:04:34 +00:00
David Syer b109a07fd9 SPR-7705: re-order rules and befores 2010-11-17 17:27:03 +00:00
Juergen Hoeller 3f0462510e getTestExecutionListeners() returns actual List which allows for iteration as well as modification (SPR-7595) 2010-10-02 01:05:40 +00:00
Juergen Hoeller aac2de9221 avoid ConcurrentModificationException when iterating attribute names (SPR-7557) 2010-10-01 22:27:34 +00:00
Juergen Hoeller 0aec5efb56 polishing 2010-08-15 23:01:10 +00:00
Juergen Hoeller 5b0448c609 MockMultipartHttpServletRequest pre-defines method "POST" and content type "multipart/form-data" 2010-08-15 22:46:15 +00:00
Juergen Hoeller 1841b14b21 consistent mocks between modules 2010-08-15 22:02:40 +00:00
Juergen Hoeller bd1b559d47 MockHttpServletResponse supports multiple includes (SPR-7188) 2010-05-12 14:05:21 +00:00
Sam Brannen 69cbadf7e9 [SPR-6918] Now verifying support for @Value in conjunction with the Spring TestContext Framework. 2010-03-19 12:57:17 +00:00
Juergen Hoeller ac5c75690a fixed test failures 2010-03-12 20:55:44 +00:00
Juergen Hoeller 795a5e02cd polishing 2010-03-12 20:45:02 +00:00
Juergen Hoeller bb75662a7e @Transactional qualifiers work in unit tests as well (SPR-6892) 2010-03-12 20:44:41 +00:00
Sam Brannen 80b8fb8b83 [SPR-6879] @DirtiesContext is now an @Inherited annotation. 2010-02-23 17:43:00 +00:00
Juergen Hoeller 59360f4f65 added warning about pointing to a custom transaction manager bean (SPR-5174) 2010-02-04 16:47:57 +00:00
Juergen Hoeller 31144591b0 revised javadoc (SPR-5720) 2009-12-09 15:24:47 +00:00
Juergen Hoeller 613b4d182b avoid potential NPE (SPR-6300) 2009-11-12 13:42:07 +00:00
Costin Leau 9a111e504f SPR-6194
+ add setter for servlet minor version to MockServletContext
2009-11-09 11:51:30 +00:00
Sam Brannen 1b92a2fae1 [SPR-6124] Verified that timed transactional tests fail with the TestNG integration in the TestContext framework. 2009-10-26 13:38:59 +00:00
Sam Brannen 02dfe94396 [SPR-6128] Verified that claims raised in this issue no longer apply. 2009-10-26 13:00:04 +00:00
Sam Brannen c200715076 Now verifying support for @Named as well. 2009-10-06 21:10:06 +00:00
Sam Brannen 710ae3a9d2 SpringJUnit4ClassRunnerAppCtxTests now verifies seamless support for using @Inject in addition to @Autowired, etc. 2009-10-05 22:08:01 +00:00
Juergen Hoeller 09e6a85edd fixed overview files 2009-09-25 08:47:18 +00:00
Sam Brannen f1bfcf0d25 [SPR-6104] @TestExecutionListeners now supports a 'listeners' alias for its existing 'value' attribute. 2009-09-13 13:55:34 +00:00
Sam Brannen f9f9b431a6 [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. 2009-09-07 21:03:32 +00:00
Sam Brannen 0a781f3084 Including HibernateSessionFlushingTests in the suite. 2009-09-01 17:33:29 +00:00
Sam Brannen 2dee54b78a [SPR-4702] now updating TestContext state before calling before/after test class life cycle callbacks. 2009-09-01 17:33:12 +00:00
Sam Brannen 984504735e [SPR-6011] SpringJUnit4ClassRunner once again supports collective timeouts for repeated tests. 2009-08-28 17:28:25 +00:00
Sam Brannen eda193fc98 Added assertPersonCount() functionality for increased robustness. 2009-08-28 09:23:02 +00:00
Arjen Poutsma 66a799552f SPR-2784: Support MultipartFile-array property 2009-08-28 09:15:19 +00:00
Sam Brannen a07da0d950 [SPR-6043] @NotTransactional is now deprecated 2009-08-26 23:23:07 +00:00
Sam Brannen 8fb53c801e [SPR-5995] Updated documentation regarding compatibility with JUnit 4.5, 4.6, and 4.7. 2009-08-26 13:13:06 +00:00
Sam Brannen da3eb580f6 [SPR-5995] Renamed makeNotifier() to springMakeNotifier() in order to allow compatibility with JUnit 4.5, 4.6, and 4.7. 2009-08-26 12:37:59 +00:00
Sam Brannen 9f9f2349cd polishing 2009-08-24 12:14:57 +00:00
Sam Brannen 77821845a7 [SPR-4702] Updated JavaDoc regarding before/after test class lifecycle callbacks. 2009-08-22 21:50:02 +00:00
Sam Brannen 9eb19ac816 Polishing test annotation declarations and JavaDoc. 2009-08-21 11:44:38 +00:00
Sam Brannen 42638585b5 [SPR-5963] Upgraded to JUnit 4.7 2009-08-11 10:12:20 +00:00
Juergen Hoeller a7a97316e7 turned requestedSessionId into a settable property 2009-08-05 22:01:46 +00:00
Sam Brannen ee1938eb74 [SPR-5315][SPR-5699] Reverted changes to TransactionalTestExecutionListener: transactions are no longer automatically flushed before rolling back. 2009-07-21 11:03:59 +00:00
Sam Brannen b2c723a76e [SPR-5916] polishing. 2009-07-20 12:14:56 +00:00
Sam Brannen fc79d98b6a [SPR-5916] ContextLoader class is now inherited from class hierarchy if not specified explicitly via @ContextConfiguration's loader attribute on the current test class. 2009-07-20 09:35:33 +00:00
Sam Brannen ba27c29dc4 [SPR-5916] polishing. 2009-07-16 13:50:54 +00:00
Sam Brannen 29327798c1 [SPR-5699] Investigating issues surrounding automatic flushing of the underlying ORM tool's session via TransactionalTestExecutionListener. 2009-07-11 16:45:48 +00:00
Sam Brannen 696d78c144 [SPR-5914] ProfileValueUtils now properly ensures that class-level usage of @IfProfileValue overrides method-level usage. 2009-07-10 11:45:31 +00:00
Andy Clement dcb52dbbc1 SPR-5906: test and fix for using expressions in property list keys and values 2009-07-07 20:13:18 +00:00
Sam Brannen 2b869d57f2 [SPR-5902] JavaDoc polishing. 2009-07-06 22:36:47 +00:00
Sam Brannen eef6fd3f09 [SPR-5640] polishing 2009-07-06 19:24:34 +00:00
Sam Brannen c254f389c0 [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. 2009-07-06 19:17:16 +00:00
Sam Brannen 1f087b412d [SPR-4702] Explicit tests for TestExecutionListener's new beforeTestClass() and afterTestClass()} lifecycle callback methods with TestNG support classes. 2009-07-06 15:08:06 +00:00
Sam Brannen 0483cb5a3d [SPR-4702] Explicit tests for TestExecutionListener's new beforeTestClass() and afterTestClass()} lifecycle callback methods. 2009-07-06 14:48:27 +00:00
Sam Brannen 51b8b99dfc [SPR-4702] JavaDoc updates 2009-07-06 13:41:01 +00:00
Sam Brannen 8dec6af038 [SPR-4702] Added support for @DirtiesContext at the test class level. 2009-07-06 12:58:56 +00:00
Sam Brannen 0222a4a56c Polishing: suppressing warnings. 2009-07-05 21:29:28 +00:00
Sam Brannen f26e2e3d7b [SPR-4702] Improving JavaDoc for TestExecutionListener. 2009-07-05 11:50:19 +00:00
Sam Brannen ba746a8e51 [SPR-5887] Upgraded to JUnit 4.6. 2009-07-03 11:21:39 +00:00
Sam Brannen 91c9f544b1 [SPR-5889] Renaming TestNG tests from *Tests_ back to *Tests, but keeping @org.junit.Ignore to exclude them from the JUnit test run. 2009-07-03 09:57:19 +00:00
Sam Brannen 8bfb56c75b [SPR-5887] Upgraded to JUnit 4.6.0. 2009-07-02 18:07:55 +00:00
Chris Beams a9696c7282 RESOLVED - SPR-5523: Replace all 'package.html' artifacts with 'package-info.java'
* Applied patch submitted by Carlos Zuniga
2009-06-01 04:14:22 +00:00
Sam Brannen af56f6497c Updated regarding generics; fixed typos. 2009-05-25 09:04:05 +00:00
Sam Brannen 5f473b9f26 polishing 2009-05-25 08:59:01 +00:00
Sam Brannen 18039162b9 polishing 2009-05-25 08:58:27 +00:00
Sam Brannen be7bbcd228 Corrected typos and polishing. 2009-05-24 16:30:13 +00:00
Sam Brannen b47c81ea2c Suppressing serialization warnings 2009-05-19 15:33:45 +00:00
Sam Brannen 72c330fffb Updated copyright. 2009-05-17 10:22:40 +00:00
Sam Brannen 76aa8b2119 Spring TestContext Framework autowiring tests now include an explicit test for the @Autowired-@Qualifier combination. 2009-05-17 10:22:03 +00:00
Juergen Hoeller 59101c096f replaced Commons Collections dependency with Spring-provided LinkedCaseInsensitiveMap; revised CollectionFactory and Spring Map implementations for consistency 2009-05-12 23:37:43 +00:00
Sam Brannen 7d4da0085c [SPR-5713] JavaDoc polishing for @ContextConfiguration. 2009-05-06 22:52:27 +00:00
Sam Brannen d159195b79 [SPR-5145] Updated package.html files regarding upgrade to JUnit 4.5. 2009-05-06 07:37:25 +00:00
Sam Brannen c0c9501005 [SPR-5145] Updated reference manual regarding upgrade to JUnit 4.5; additional improvements in the testing chapter as well. 2009-05-06 06:25:03 +00:00
Juergen Hoeller b15e77d5d0 renamed "contextProperties" attribute to "contextParameters" (matching web.xml naming); "contextParameters" contains Servlet/PortletConfig parameters as well; added default "servletContext" and "servletConfig" environment beans; added default "portletContext" and "portletConfig" environment beans; added default web scope "application", wrapping a ServletContext/PortletContext; MockPortletSession supports destruction of session attributes on invalidation 2009-05-05 12:12:01 +00:00
Sam Brannen 781da89d92 [SPR-5713] Added 'value' alias for @ContextConfiguration's 'locations' attribute. 2009-05-05 07:37:14 +00:00
Sam Brannen a637912762 [SPR-5710] Subclasses of SpringJUnit4ClassRunner can now override the default ContextLoader class via the new getDefaultContextLoaderClassName(Class) method. 2009-05-02 23:24:48 +00:00
Sam Brannen d3af831334 Now parameterizing with <?> where appropriate. 2009-04-30 00:58:08 +00:00
Sam Brannen 6327b3484b [SPR-5145] Improved test suite for SpringJUnit4ClassRunner: added specific unit tests for test timeouts, repeated tests, and expected exceptions. 2009-04-29 21:29:53 +00:00
Sam Brannen 751e0f0eb7 [SPR-5145] Completed migration to JUnit 4.5: SpringJUnit4ClassRunner now extends BlockJUnit4ClassRunner and uses custom Statements; removed obsolete SpringMethodRoadie and SpringTestMethod classes. 2009-04-29 08:21:23 +00:00
Sam Brannen b36f95bcee Corrected typos and sorted Eclipse classpath. 2009-04-28 21:45:14 +00:00
Sam Brannen e5d2570c8d [SPR-5145] Adding custom JUnit 4.5 Statements. 2009-04-28 07:29:24 +00:00
Sam Brannen 2796e72de1 Updated JavaDoc for @TestExecutionListeners. 2009-04-27 22:49:34 +00:00
Keith Donald eb4d1bf20e deleted old test data source factory 2009-04-22 21:29:47 +00:00
Keith Donald b8b74db01a test datasource factory initial commit; needs review from Juergen on how to best make DataSource available as a Spring bean when desired 2009-04-21 21:31:16 +00:00
Juergen Hoeller ee5e76c48c officially deprecated AbstractJpaTests 2009-04-12 21:16:12 +00:00
Juergen Hoeller 4cc42bf16f added "flush()" method to TransactionStatus and TransactionSynchronization interfaces; test context manager automatically flushes transactions before rolling back; general polishing of transaction management code 2009-02-19 00:24:05 +00:00
Juergen Hoeller d3d0111439 polishing 2009-02-18 23:51:03 +00:00
Juergen Hoeller 76a6527c4c consistent copies of mocks 2009-01-20 18:01:26 +00:00
Juergen Hoeller 8af66c83ad consistent mock behavior 2009-01-19 23:35:42 +00:00
Juergen Hoeller 7cdc195331 Portlet mocks support Portlet API 2.0 2009-01-14 09:34:07 +00:00
Chris Beams 9845f56ba0 reverting accidentally deleted (in r469) mock/web/* classes 2008-12-18 22:16:16 +00:00
Juergen Hoeller 1cc845af6d got rid of Commons Collections dependency 2008-12-18 19:14:49 +00:00
Juergen Hoeller bbe4da4f19 removed dependency on Servlet API mocks 2008-12-18 19:13:35 +00:00
Chris Beams 685f2fbc1c + updated petclinic dependency metadata from junit 4.4->4.5; servlet 2.4->2.5
+ deprecated AssertThrows (slated for complete removal by 3.0 GA)
2008-12-18 18:32:05 +00:00
Chris Beams 579280d7bf Whitespace polishing: leading spaces->tabs; updated eclipse configuration to default to leading tabs for all bundles 2008-12-18 14:50:25 +00:00
Chris Beams 750bcf36a6 moving unit tests from .testsuite -> .test, .web.servlet 2008-12-17 16:28:56 +00:00
Chris Beams 68444367b7 moving .test.* unit tests from .testsuite -> .test 2008-12-17 07:32:58 +00:00
Chris Beams f4d8b69126 moving unit tests from .testsuite -> .orm 2008-12-17 05:33:45 +00:00
Chris Beams 10be5f08a5 moving .jndi, .mail and .mock.web unit tests from .testsuite to .context, .context.support, and .test bundles respectively 2008-12-17 02:20:01 +00:00
Juergen Hoeller b3866a974a fixed header value type 2008-12-05 07:07:06 +00:00
Juergen Hoeller c8e23290ca consistent use of model name Strings 2008-11-27 21:24:42 +00:00
Juergen Hoeller e3cc9237c4 updated mocks to Servlet 2.5 and JSP 2.1 API level 2008-11-27 21:23:23 +00:00
Juergen Hoeller b0790bf5e7 Java 5 code style 2008-11-27 00:27:52 +00:00
Juergen Hoeller e9649b3a34 added JUnit 4.5 compatibility note 2008-11-20 22:28:00 +00:00
Juergen Hoeller ae34a8cb1b basic JUnit 4.5 compatibility (accepting use of deprecated SPI) 2008-11-20 21:33:08 +00:00
Juergen Hoeller 347f34c68a EL container integration; support for contextual objects; removal of deprecated Spring 2.0 functionality; Java 5 code style 2008-11-20 02:10:53 +00:00
Arjen Poutsma 58dbd04cec Moved tests over from testsuite to test 2008-10-29 13:58:15 +00:00
Arjen Poutsma 995a323a6f Initial import of test module 2008-10-27 11:59:27 +00:00