You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2020/10/25 22:37:20 UTC
[tapestry-5] branch java9modules updated: TAP5-2644: fixing
tapestry-spring test failures
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch java9modules
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/java9modules by this push:
new da50b7e TAP5-2644: fixing tapestry-spring test failures
da50b7e is described below
commit da50b7e21d252caac6c9344fa3fb8e5d9d4ca1d4
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Sun Oct 25 19:37:07 2020 -0300
TAP5-2644: fixing tapestry-spring test failures
---
.../main/java/org/apache/tapestry5/spring/modules/SpringModule.java | 4 ++++
.../external/TapestryExternalSpringContextIntegrationTest.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java b/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java
index 80c126b..e288344 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/spring/modules/SpringModule.java
@@ -21,12 +21,14 @@ import org.apache.tapestry5.http.services.ApplicationInitializerFilter;
import org.apache.tapestry5.http.services.Context;
import org.apache.tapestry5.internal.spring.SymbolBeanFactoryPostProcessor;
import org.apache.tapestry5.ioc.annotations.Contribute;
+import org.apache.tapestry5.ioc.annotations.ImportModule;
import org.apache.tapestry5.ioc.annotations.Marker;
import org.apache.tapestry5.ioc.annotations.Primary;
import org.apache.tapestry5.ioc.services.ChainBuilder;
import org.apache.tapestry5.ioc.services.FactoryDefaults;
import org.apache.tapestry5.ioc.services.SymbolProvider;
import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.modules.TapestryModule;
import org.apache.tapestry5.spring.ApplicationContextCustomizer;
import org.apache.tapestry5.spring.SpringConstants;
import org.slf4j.Logger;
@@ -43,6 +45,7 @@ import java.util.List;
*
* @since 5.1.0.0
*/
+@ImportModule(TapestryModule.class)
public class SpringModule
{
private final Logger logger;
@@ -53,6 +56,7 @@ public class SpringModule
}
@Contribute(ApplicationInitializer.class)
+ @Primary
public void reportSpringContextDetailsAtStartup(
OrderedConfiguration<ApplicationInitializerFilter> configuration, final ApplicationContext springContext)
{
diff --git a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/integration/external/TapestryExternalSpringContextIntegrationTest.java b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/integration/external/TapestryExternalSpringContextIntegrationTest.java
index b2f5056..8fca277 100644
--- a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/integration/external/TapestryExternalSpringContextIntegrationTest.java
+++ b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/integration/external/TapestryExternalSpringContextIntegrationTest.java
@@ -25,7 +25,7 @@ public class TapestryExternalSpringContextIntegrationTest extends SeleniumTestCa
public void external_context_integration_test() throws Exception
{
openBaseURL();
-
+ Thread.sleep(4000);
assertTextPresent("Demonstrates Spring Context Configured Externally", "Instantiated via a factory bean.");
}
}