myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1521079 - in /myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp: test/box/box-box-auto.xhtml test/in/in-tx.xhtml tx/in/in.xhtml
Date Mon, 09 Sep 2013 12:50:56 GMT
Author: lofwyr
Date: Mon Sep  9 12:50:55 2013
New Revision: 1521079

URL: http://svn.apache.org/r1521079
Log:
clean up tests

Added:
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/in-tx.xhtml
      - copied, changed from r1519596, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tx/in/in.xhtml
Removed:
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tx/in/in.xhtml
Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/box/box-box-auto.xhtml

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/box/box-box-auto.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/box/box-box-auto.xhtml?rev=1521079&r1=1521078&r2=1521079&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/box/box-box-auto.xhtml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/box/box-box-auto.xhtml
Mon Sep  9 12:50:55 2013
@@ -28,16 +28,28 @@
     </f:facet>
 
     <tc:box id="outerbox" label="outer box">
+      <tc:dataAttribute name="assert-left" value="0"/>
+      <tc:dataAttribute name="assert-top" value="0"/>
+      <tc:dataAttribute name="assert-width" value="226"/>
+      <tc:dataAttribute name="assert-height" value="116"/>
       <f:facet name="layout">
         <tc:gridLayout columns="auto" rows="auto"/>
       </f:facet>
 
       <tc:box id="innerbox" label="inner box">
+        <tc:dataAttribute name="assert-left" value="6"/>
+        <tc:dataAttribute name="assert-top" value="26"/>
+        <tc:dataAttribute name="assert-width" value="213"/>
+        <tc:dataAttribute name="assert-height" value="83"/>
         <f:facet name="layout">
           <tc:gridLayout columns="auto" rows="auto"/>
         </f:facet>
 
         <tc:textarea id="textarea" value="Some text.">
+          <tc:dataAttribute name="assert-left" value="12"/>
+          <tc:dataAttribute name="assert-top" value="52"/>
+          <tc:dataAttribute name="assert-width" value="200"/>
+          <tc:dataAttribute name="assert-height" value="50"/>
           <tc:gridLayoutConstraint preferredWidth="200px" preferredHeight="50px"/>
         </tc:textarea>
 
@@ -47,9 +59,5 @@
 
     <tc:script file="script/tobago-assert.js"/>
 
-    <tc:script onload="TobagoAssert.assertLayout('page:outerbox', 0, 0, 226, 116);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:innerbox', 6, 26, 213, 83);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:textarea', 12, 52, 200, 50);"/>
-
   </tc:page>
 </f:view>

Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/in-tx.xhtml
(from r1519596, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tx/in/in.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/in-tx.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/in-tx.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tx/in/in.xhtml&r1=1519596&r2=1521079&rev=1521079&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tx/in/in.xhtml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/in/in-tx.xhtml
Mon Sep  9 12:50:55 2013
@@ -15,11 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-  
+
 <f:view
     xmlns:tc="http://myfaces.apache.org/tobago/component"
     xmlns:tx="http://myfaces.apache.org/tobago/extension"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:f="http://java.sun.com/jsf/core">
 
   <tc:page id="page">
@@ -28,22 +27,32 @@
     </f:facet>
     <tc:gridLayoutConstraint width="600px" height="600px"/>
 
-    <tx:in label="Label 1" value="Some Value 1" fieldId="in1" id="panel1"/>
-    <tx:in label="Label 2" value="Some Value 2" fieldId="in2" id="panel2"/>
-    <tx:in label="Label 3" value="Some Value 3" fieldId="in3" id="panel3"/>
-    <tx:in label="Label 4" value="Some Value 4" fieldId="in4" id="panel4" />
+    <tx:in label="Label 1" value="Some Value 1" fieldId="in1" id="panel1">
+      <tc:dataAttribute name="assert-left" value="125"/>
+      <tc:dataAttribute name="assert-top" value="0"/>
+      <tc:dataAttribute name="assert-width" value="475"/>
+      <tc:dataAttribute name="assert-height" value="20"/>
+    </tx:in>
+    <tx:in label="Label 2" value="Some Value 2" fieldId="in2" id="panel2">
+      <tc:dataAttribute name="assert-left" value="125"/>
+      <tc:dataAttribute name="assert-top" value="25"/>
+      <tc:dataAttribute name="assert-width" value="475"/>
+      <tc:dataAttribute name="assert-height" value="20"/>
+    </tx:in>
+    <tx:in label="Label 3" value="Some Value 3" fieldId="in3" id="panel3">
+      <tc:dataAttribute name="assert-left" value="125"/>
+      <tc:dataAttribute name="assert-top" value="50"/>
+      <tc:dataAttribute name="assert-width" value="475"/>
+      <tc:dataAttribute name="assert-height" value="20"/>
+    </tx:in>
+    <tx:in label="Label 4" value="Some Value 4" fieldId="in4" id="panel4">
+      <tc:dataAttribute name="assert-left" value="125"/>
+      <tc:dataAttribute name="assert-top" value="75"/>
+      <tc:dataAttribute name="assert-width" value="475"/>
+      <tc:dataAttribute name="assert-height" value="20"/>
+    </tx:in>
 
     <tc:script file="script/tobago-assert.js"/>
 
-    <tc:script onload="TobagoAssert.assertLayout('page:in1', 125, 0, 475, 20);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:in2', 125, 25, 475, 20);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:in3', 125, 50, 475, 20);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:in4', 125, 75, 475, 20);"/>
-
-    <tc:script onload="TobagoAssert.assertLayout('page:panel1', 0, 0, 600, 20);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:panel2', 0, 25, 600, 20);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:panel3', 0, 50, 600, 20);"/>
-    <tc:script onload="TobagoAssert.assertLayout('page:panel4', 0, 75, 600, 20);"/>
-
   </tc:page>
 </f:view>



Mime
View raw message