Author: berndf
Date: Mon Jul 16 06:14:57 2007
New Revision: 556616
URL: http://svn.apache.org/viewvc?view=rev&rev=556616
Log:
make test pass by providing custom test configurations
Added:
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
- copied, changed from r556458,
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/james-assembly.xml
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml
- copied, changed from r556458,
james/server/sandbox/spring-integration/src/main/config/beans-base-config.xml
Modified:
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/BeanFactoryTestCase.java
Modified:
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java?view=diff&rev=556616&r1=556615&r2=556616
==============================================================================
---
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java
(original)
+++
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java
Mon Jul 16 06:14:57 2007
@@ -28,8 +28,8 @@
public class AvalonApplicationContextTestCase extends TestCase {
public void testJointLoadingContainerAndApplicationConfig() {
- Resource containerResource = new
ClassPathResource("beans-base-config.xml");
- Resource applicationResource = new
ClassPathResource("org/apache/james/container/spring/beanfactory/james-assembly.xml");
+ Resource containerResource = new
ClassPathResource("org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml");
+ Resource applicationResource = new
ClassPathResource("org/apache/james/container/spring/beanfactory/testing-james-assembly.xml");
AvalonApplicationContext context = new
AvalonApplicationContext(containerResource, applicationResource);
James james = (James)context.getBean("James");
}
Modified:
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/BeanFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/BeanFactoryTestCase.java?view=diff&rev=556616&r1=556615&r2=556616
==============================================================================
---
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/BeanFactoryTestCase.java
(original)
+++
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/BeanFactoryTestCase.java
Mon Jul 16 06:14:57 2007
@@ -31,7 +31,7 @@
GenericApplicationContext ctx = new GenericApplicationContext();
AvalonBeanDefinitionReader xmlReader = new
AvalonBeanDefinitionReader(ctx);
- int count = xmlReader.loadBeanDefinitions(new
ClassPathResource("org/apache/james/container/spring/beanfactory/james-assembly.xml"));
+ int count = xmlReader.loadBeanDefinitions(new
ClassPathResource("org/apache/james/container/spring/beanfactory/testing-james-assembly.xml"));
// assertTrue("all blocks loaded", count == 34);
ctx.refresh();
Copied:
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
(from r556458,
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/james-assembly.xml)
URL:
http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml?view=diff&rev=556616&p1=james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/james-assembly.xml&r1=556458&p2=james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml&r2=556616
==============================================================================
---
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/james-assembly.xml
(original)
+++
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
Mon Jul 16 06:14:57 2007
@@ -19,6 +19,13 @@
under the License.
-->
+<!--
+
+THIS IS A TEST james-assembly.xml for UNIT TESTING.
+It might become outdated. Check for production quality configs outside the
test sources.
+
+-->
+
<assembly>
<!-- The list of blocks being run in this Phoenix server. -->
Copied:
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml
(from r556458,
james/server/sandbox/spring-integration/src/main/config/beans-base-config.xml)
URL:
http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml?view=diff&rev=556616&p1=james/server/sandbox/spring-integration/src/main/config/beans-base-config.xml&r1=556458&p2=james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml&r2=556616
==============================================================================
---
james/server/sandbox/spring-integration/src/main/config/beans-base-config.xml
(original)
+++
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-service-beans-base-config.xml
Mon Jul 16 06:14:57 2007
@@ -76,10 +76,6 @@
<bean id="servicePropagator"
class="org.apache.james.container.spring.lifecycle.ServicePropagator" />
- <bean id="configurationManager"
class="org.apache.james.container.spring.lifecycle.ConfigurationPropagator" />
-
- <bean id="initializationManager"
class="org.apache.james.container.spring.lifecycle.InitializationPropagator" />
-
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
