You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by fr...@apache.org on 2006/12/12 05:59:19 UTC
svn commit: r486023 - in /tapestry/tapestry5/tapestry-core/trunk: ./
.settings/ src/test/java/org/apache/tapestry/integration/
src/test/java/org/apache/tapestry/internal/services/
src/test/resources/org/apache/tapestry/integration/app1/pages/
Author: freemant
Date: Mon Dec 11 20:59:18 2006
New Revision: 486023
URL: http://svn.apache.org/viewvc?view=rev&rev=486023
Log:
1) fixed a bug in ActionPage.html.
2) fixed a compile error in OnEventWorkerTest in which String.format() was shadowed by Assert.format().
3) Added a main program to run app1.
Modified:
tapestry/tapestry5/tapestry-core/trunk/ (props changed)
tapestry/tapestry5/tapestry-core/trunk/.settings/org.eclipse.jdt.ui.prefs
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ActionPage.html
Propchange: tapestry/tapestry5/tapestry-core/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 11 20:59:18 2006
@@ -5,3 +5,5 @@
TestNG context suite.launch
cobertura.ser
temp-testng-customsuite.xml
+test-output
+testng.xml
Modified: tapestry/tapestry5/tapestry-core/trunk/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/.settings/org.eclipse.jdt.ui.prefs?view=diff&rev=486023&r1=486022&r2=486023
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/.settings/org.eclipse.jdt.ui.prefs (original)
+++ tapestry/tapestry5/tapestry-core/trunk/.settings/org.eclipse.jdt.ui.prefs Mon Dec 11 20:59:18 2006
@@ -1,7 +1,7 @@
-#Tue Sep 19 11:09:26 PDT 2006
+#Tue Dec 12 12:50:55 CST 2006
eclipse.preferences.version=1
formatter_profile=_Tapestry Project
-formatter_settings_version=10
+formatter_settings_version=8
internal.default.compliance=default
org.eclipse.jdt.ui.exception.name=ex
org.eclipse.jdt.ui.gettersetter.use.is=true
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?view=diff&rev=486023&r1=486022&r2=486023
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java Mon Dec 11 20:59:18 2006
@@ -52,7 +52,7 @@
private SeleniumServer _server;
private JettyRunner _jettyRunner;
-
+
@BeforeClass
public void startupBackground() throws Exception
{
@@ -232,15 +232,19 @@
@Test
public void app1_simple_component_event()
{
+ final String YOU_CHOSE = "You chose: ";
+
_selenium.open(BASE_URL);
clickAndWait("link=Action Page");
+ assertFalse(_selenium.isTextPresent(YOU_CHOSE));
+
for (int i = 2; i < 5; i++)
{
clickAndWait("link=" + i);
- assertTextPresent("You chose: " + i);
+ assertTextPresent(YOU_CHOSE + i);
}
}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java?view=diff&rev=486023&r1=486022&r2=486023
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/OnEventWorkerTest.java Mon Dec 11 20:59:18 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.internal.services;
-import static java.lang.String.format;
-
import java.lang.reflect.Modifier;
import java.util.Collections;
import java.util.List;
@@ -421,7 +419,7 @@
"{",
BOILERPLATE_1,
BOILERPLATE_2,
- format("$1.setSource(this, \"foo.Bar.%s\");", signature.getMediumDescription()),
+ String.format("$1.setSource(this, \"foo.Bar.%s\");", signature.getMediumDescription()),
"foo((java.lang.String)$1.coerceContext(0, \"java.lang.String\"), ",
"$1.getContext(), ",
"(java.lang.Integer)$1.coerceContext(1, \"java.lang.Integer\"));",
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ActionPage.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ActionPage.html?view=diff&rev=486023&r1=486022&r2=486023
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ActionPage.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ActionPage.html Mon Dec 11 20:59:18 2006
@@ -8,7 +8,7 @@
</t:comp>
</p>
- <t:comp type="If" test="index">
+ <t:comp type="If" test="value">
<p> <strong>You chose: ${value}</strong>.</p>
</t:comp>