You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/12/16 02:17:33 UTC

[18/50] git commit: Fix broken test

Fix broken test


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/ce83b162
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/ce83b162
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/ce83b162

Branch: refs/heads/master
Commit: ce83b162e4ac83605958e8af9d87bf43defb999c
Parents: e672d29
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Dec 7 17:03:06 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Dec 7 17:03:06 2012 -0800

----------------------------------------------------------------------
 .../src/test/app1/ClientNumericValidationDemo.tml  |    9 ++++-----
 .../tapestry5/integration/app1/FormTests.java      |    8 +++++---
 .../app1/pages/ClientNumericValidationDemo.java    |    4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ce83b162/tapestry-core/src/test/app1/ClientNumericValidationDemo.tml
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/app1/ClientNumericValidationDemo.tml b/tapestry-core/src/test/app1/ClientNumericValidationDemo.tml
index 1880d00..1bae4c1 100644
--- a/tapestry-core/src/test/app1/ClientNumericValidationDemo.tml
+++ b/tapestry-core/src/test/app1/ClientNumericValidationDemo.tml
@@ -14,10 +14,9 @@
         <dd id="outputDoubleValue">${doubleValue}</dd>
     </dl>
 
-    <p>
-        <t:actionlink t:id="reset">reset</t:actionlink>
-        |
-        <t:actionlink t:id="german">switch to German</t:actionlink>
-    </p>
+    <div class="btn-toolbar btn-group">
+        <t:actionlink class="btn" t:id="setup">Setup Values</t:actionlink>
+        <t:actionlink class="btn" t:id="german">Switch to German</t:actionlink>
+    </div>
 
 </t:border>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ce83b162/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
index 3bb2e19..deae5be 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
@@ -699,7 +699,7 @@ public class FormTests extends TapestryCoreTestCase
     @Test
     public void client_side_numeric_validation()
     {
-        openLinks("Client-Side Numeric Validation", "Reset Page State");
+        openLinks("Client-Side Numeric Validation", "Reset Page State", "Setup Values");
 
         waitForPageInitialized();
 
@@ -720,7 +720,7 @@ public class FormTests extends TapestryCoreTestCase
         assertFieldValue("longValue", "2000");
         assertFieldValue("doubleValue", "-456,789.12");
 
-        clickAndWait("link=switch to German");
+        clickAndWait("link=Switch to German");
 
         assertText("outputLongValue", "2000");
         assertText("outputDoubleValue", "-456789.12");
@@ -739,7 +739,9 @@ public class FormTests extends TapestryCoreTestCase
         assertText("outputLongValue", "3000");
         assertText("outputDoubleValue", "5444333.22");
 
-        clickAndWait("link=Reset Page State");
+        clickAndWait("link=Setup Values");
+
+        waitForPageInitialized();
 
         type("longValue", "4000.");
         click(SUBMIT);

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ce83b162/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientNumericValidationDemo.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientNumericValidationDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientNumericValidationDemo.java
index 78683fb..f287cf7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientNumericValidationDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientNumericValidationDemo.java
@@ -1,4 +1,4 @@
-// Copyright 2009 The Apache Software Foundation
+// Copyright 2009, 2012 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public class ClientNumericValidationDemo
     @Inject
     private PersistentLocale persistentLocale;
 
-    void onActionFromReset()
+    void onActionFromSetup()
     {
         longValue = 1000;
         doubleValue = 1234.67;