You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by ml...@apache.org on 2013/04/23 10:39:44 UTC
[2/3] git commit: fix compilation errors due to previous merge from
master
fix compilation errors due to previous merge from master
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/86279525
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/86279525
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/86279525
Branch: refs/heads/5.3
Commit: 8627952568fc058db50d7f20f0f2892289db2642
Parents: 7b573c7
Author: Massimo Lusetti <ml...@apache.org>
Authored: Tue Apr 23 10:37:42 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Tue Apr 23 10:37:42 2013 +0200
----------------------------------------------------------------------
...pestryExternalSpringContextIntegrationTest.java | 13 +++-----
.../spring/TapestrySpringIntegrationTest.java | 25 ++++++--------
2 files changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/86279525/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestryExternalSpringContextIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestryExternalSpringContextIntegrationTest.java b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestryExternalSpringContextIntegrationTest.java
index 14d3943..3dfd8d5 100644
--- a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestryExternalSpringContextIntegrationTest.java
+++ b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestryExternalSpringContextIntegrationTest.java
@@ -14,20 +14,17 @@
package org.apache.tapestry5.spring;
-import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.testng.annotations.Test;
-public class TapestryExternalSpringContextIntegrationTest extends AbstractIntegrationTestSuite
+@TapestryTestConfiguration(webAppFolder = "src/test/webapp1")
+public class TapestryExternalSpringContextIntegrationTest extends SeleniumTestCase
{
- public TapestryExternalSpringContextIntegrationTest()
- {
- super("src/test/webapp1");
- }
-
@Test
public void external_context_integration_test() throws Exception
{
- open(BASE_URL);
+ openBaseURL();
assertTextPresent("Demonstrates Spring Context Configured Externally", "Instantiated via a factory bean.");
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/86279525/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
index 5ae3db6..05c94c2 100644
--- a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
+++ b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
@@ -14,20 +14,17 @@
package org.apache.tapestry5.spring;
-import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.testng.annotations.Test;
-public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
+@TapestryTestConfiguration(webAppFolder = "src/test/webapp")
+public class TapestrySpringIntegrationTest extends SeleniumTestCase
{
- public TapestrySpringIntegrationTest()
- {
- super("src/test/webapp");
- }
-
@Test
public void integration_test() throws Exception
{
- open(BASE_URL);
+ openBaseURL();
type("input", "paris in the springtime");
clickAndWait("//input[@value='Convert']");
@@ -38,7 +35,7 @@ public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
@Test
public void access_to_spring_context() throws Exception
{
- open(BASE_URL);
+ openBaseURL();
String text = getText("beans");
assertTrue(text.contains("upcase"));
@@ -47,7 +44,7 @@ public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
@Test
public void customize_pipeline_is_invoked() throws Exception
{
- open(BASE_URL);
+ openBaseURL();
assertText("message", "SPRING VERSION 3.1.0.RELEASE: PIPELINE WAS INVOKED");
}
@@ -55,7 +52,7 @@ public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
@Test
public void too_many_spring_beans_are_assignable()
{
- open(BASE_URL + "bedrock");
+ open(getBaseURL() + "bedrock");
assertTextPresent(
"Spring context contains 2 beans assignable to type org.example.testapp.services.Flintstone: barney, fred.");
@@ -64,7 +61,7 @@ public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
@Test
public void factory_provided_beans_accessible() throws Exception
{
- open(BASE_URL);
+ openBaseURL();
assertEquals(getText("viaFactory"), "Instantiated via a factory bean.");
}
@@ -72,7 +69,7 @@ public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
@Test
public void symbol_bean_factory_post_processor() throws Exception
{
- open(BASE_URL);
+ openBaseURL();
assertEquals(getText("symbolValueHolder"), "Start page is 'start', Value from Spring is 'Hello'");
}
@@ -80,7 +77,7 @@ public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
@Test
public void no_conflict_on_injected_locale() throws Exception
{
- open(BASE_URL);
+ openBaseURL();
assertEquals(getText("locale"), "en");
assertEquals(getText("selector"), "en");