You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by bb...@apache.org on 2006/11/03 00:20:34 UTC
svn commit: r470613 - in /incubator/xap/trunk/testsrc/xap: mco/ session/
taghandling/ util/ xml/ xmodify/
Author: bbuffone
Date: Thu Nov 2 16:20:33 2006
New Revision: 470613
URL: http://svn.apache.org/viewvc?view=rev&rev=470613
Log:
updated junit tests to work with new start up mechanism.
Modified:
incubator/xap/trunk/testsrc/xap/mco/_TestDeclarativeArgumentParser.html
incubator/xap/trunk/testsrc/xap/session/_TestContainer.html
incubator/xap/trunk/testsrc/xap/taghandling/_TestPluginRegistryImpl.html
incubator/xap/trunk/testsrc/xap/util/_TestCharacter.html
incubator/xap/trunk/testsrc/xap/util/_TestEscapeSyntaxParser.html
incubator/xap/trunk/testsrc/xap/util/_TestHashtable.html
incubator/xap/trunk/testsrc/xap/util/_TestHttpUtils.html
incubator/xap/trunk/testsrc/xap/util/_TestLogFactory.html
incubator/xap/trunk/testsrc/xap/util/_TestMessageFormat.html
incubator/xap/trunk/testsrc/xap/util/_TestXmlUtils.html
incubator/xap/trunk/testsrc/xap/xml/_TestDocument.html
incubator/xap/trunk/testsrc/xap/xml/_TestElement.html
incubator/xap/trunk/testsrc/xap/xml/_TestParser.html
incubator/xap/trunk/testsrc/xap/xml/parserTestBed.html
incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html
incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html
incubator/xap/trunk/testsrc/xap/xmodify/xmodify.xal (contents, props changed)
Modified: incubator/xap/trunk/testsrc/xap/mco/_TestDeclarativeArgumentParser.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/mco/_TestDeclarativeArgumentParser.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/mco/_TestDeclarativeArgumentParser.html (original)
+++ incubator/xap/trunk/testsrc/xap/mco/_TestDeclarativeArgumentParser.html Thu Nov 2 16:20:33 2006
@@ -12,10 +12,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
<script language="JavaScript" type="text/javascript" src="_TestDeclarativeArgumentParser.js"></script>
-
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/session/_TestContainer.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/session/_TestContainer.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/session/_TestContainer.html (original)
+++ incubator/xap/trunk/testsrc/xap/session/_TestContainer.html Thu Nov 2 16:20:33 2006
@@ -12,10 +12,7 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
<script language="JavaScript" type="text/javascript" src="_TestContainer.js"></script>
-
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
+
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/taghandling/_TestPluginRegistryImpl.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/taghandling/_TestPluginRegistryImpl.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/taghandling/_TestPluginRegistryImpl.html (original)
+++ incubator/xap/trunk/testsrc/xap/taghandling/_TestPluginRegistryImpl.html Thu Nov 2 16:20:33 2006
@@ -10,9 +10,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/util/_TestCharacter.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/util/_TestCharacter.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/util/_TestCharacter.html (original)
+++ incubator/xap/trunk/testsrc/xap/util/_TestCharacter.html Thu Nov 2 16:20:33 2006
@@ -10,9 +10,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/util/_TestEscapeSyntaxParser.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/util/_TestEscapeSyntaxParser.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/util/_TestEscapeSyntaxParser.html (original)
+++ incubator/xap/trunk/testsrc/xap/util/_TestEscapeSyntaxParser.html Thu Nov 2 16:20:33 2006
@@ -9,13 +9,9 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/jsunit/app/jsUnitCore.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
- <script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
-
+ <script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
<script language="JavaScript" type="text/javascript" src="_TestEscapeSyntaxParser.js"></script>
-
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
+
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/util/_TestHashtable.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/util/_TestHashtable.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/util/_TestHashtable.html (original)
+++ incubator/xap/trunk/testsrc/xap/util/_TestHashtable.html Thu Nov 2 16:20:33 2006
@@ -10,9 +10,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/util/_TestHttpUtils.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/util/_TestHttpUtils.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/util/_TestHttpUtils.html (original)
+++ incubator/xap/trunk/testsrc/xap/util/_TestHttpUtils.html Thu Nov 2 16:20:33 2006
@@ -11,10 +11,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
<script language="JavaScript" type="text/javascript" src="_TestHttpUtils.js"></script>
-
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/util/_TestLogFactory.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/util/_TestLogFactory.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/util/_TestLogFactory.html (original)
+++ incubator/xap/trunk/testsrc/xap/util/_TestLogFactory.html Thu Nov 2 16:20:33 2006
@@ -10,9 +10,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/util/_TestMessageFormat.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/util/_TestMessageFormat.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/util/_TestMessageFormat.html (original)
+++ incubator/xap/trunk/testsrc/xap/util/_TestMessageFormat.html Thu Nov 2 16:20:33 2006
@@ -12,10 +12,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
<script language="JavaScript" type="text/javascript" src="_TestMessageFormat.js"></script>
-
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/util/_TestXmlUtils.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/util/_TestXmlUtils.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/util/_TestXmlUtils.html (original)
+++ incubator/xap/trunk/testsrc/xap/util/_TestXmlUtils.html Thu Nov 2 16:20:33 2006
@@ -10,9 +10,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/xml/_TestDocument.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xml/_TestDocument.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xml/_TestDocument.html (original)
+++ incubator/xap/trunk/testsrc/xap/xml/_TestDocument.html Thu Nov 2 16:20:33 2006
@@ -12,10 +12,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
<script language="JavaScript" type="text/javascript" src="_TestDocument.js"></script>
-
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/xml/_TestElement.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xml/_TestElement.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xml/_TestElement.html (original)
+++ incubator/xap/trunk/testsrc/xap/xml/_TestElement.html Thu Nov 2 16:20:33 2006
@@ -12,10 +12,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
<script language="JavaScript" type="text/javascript" src="_TestElement.js"></script>
-
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap( "/jsunit" );
- </script>
</head>
<body>
Modified: incubator/xap/trunk/testsrc/xap/xml/_TestParser.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xml/_TestParser.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xml/_TestParser.html (original)
+++ incubator/xap/trunk/testsrc/xap/xml/_TestParser.html Thu Nov 2 16:20:33 2006
@@ -10,9 +10,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap("/jsunit");
- </script>
</head>
Modified: incubator/xap/trunk/testsrc/xap/xml/parserTestBed.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xml/parserTestBed.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xml/parserTestBed.html (original)
+++ incubator/xap/trunk/testsrc/xap/xml/parserTestBed.html Thu Nov 2 16:20:33 2006
@@ -8,15 +8,9 @@
<script language="JavaScript" type="text/javascript" src="file://C:/workspace/rave/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="file://C:/workspace/rave/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- //alert("About to bootstrap.") ;
- Xap.bootstrap("file://C:/workspace/rave") ;
- //alert("Bootstrapped.") ;
- </script>
-
-<script language="JavaScript" type="text/javascript" src="file://C:/workspace/rave/testsrc/xap/xml/parserTestStrings.js"></script>
-<script language="JavaScript" type="text/javascript" src="file://C:/workspace/rave/testsrc/xap/xml/parserTester.js"></script>
+ <script language="JavaScript" type="text/javascript" src="file://C:/workspace/rave/testsrc/xap/xml/parserTestStrings.js"></script>
+ <script language="JavaScript" type="text/javascript" src="file://C:/workspace/rave/testsrc/xap/xml/parserTester.js"></script>
Modified: incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html (original)
+++ incubator/xap/trunk/testsrc/xap/xmodify/_TestxModify.html Thu Nov 2 16:20:33 2006
@@ -15,9 +15,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap("/jsunit");
- </script>
</head>
<body>
@@ -35,6 +32,7 @@
function setUp() {
xap.xml.xmodify.Xmodify.DEBUG=true;
try {
+ var session = new xap.session.ClientSession(null,"dojo",null) ;
var requestService = new xap.requestservice.RequestService( null );
// index.xal contains xap.xml.xmodify.Xmodify instructions that need to get executed
@@ -53,16 +51,16 @@
// DOM.
var documentContainer = new xap.xml.DocumentContainer();
- uiDoc = documentContainer.getUiDocument();
-
+ uiDoc = session.getDocumentContainer().getUiDocument();
+ uiDoc.setRootElement(uiDoc.createElement("xal"));
+
/////////////////////////////////////////////////
// Here is what I need from xap.xml.xmodify.Xmodify:
/////////////////////////////////////////////////
- var xmodify = new xap.xml.xmodify.Xmodify( commandsDoc.firstChild.firstChild);
+ var xmodify = new xap.xml.xmodify.Xmodify(commandsDoc.firstChild.firstChild, session);
- xmodify.execute( documentContainer );
-
- } catch (ee) {
+ xmodify.execute();
+ } catch (ee) {
// Need a catch here, even though we mean to do
// nothing interesting:
throw ee ;
@@ -80,12 +78,12 @@
function testAppendElement(){
var rootElement = uiDoc.getRootElement();
- var element = uiDoc.getElementById("x0");
- var element1 = uiDoc.getElementById("x1");
+ var element = uiDoc.getElementById("button");
+ var element1 = uiDoc.getElementById("button1");
- assertTrue( "Check Append Element Exists",
+ assertTrue( "Check Append Element (button) Exists",
element != null );
- assertTrue( "Check Append Element Exists",
+ assertTrue( "Check Append Element (button1) Exists",
element1 != null );
assertTrue( "Check Append Element has correct parent",
@@ -99,26 +97,25 @@
*/
function testInsertElement(){
var rootElement = uiDoc.getRootElement();
-
assertTrue( "Check Insert Before",
- rootElement.childNodes[1].getLocalName() == "button1" );
+ rootElement.childNodes[1].getAttribute("id") == "button1" );
assertTrue( "Check Insert After",
- rootElement.childNodes[2].getLocalName() == "button1a" );
+ rootElement.childNodes[2].getAttribute("id") == "button1a" );
}
function testNestedInsert(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("x1");
+ var element1 = uiDoc.getElementById("button1");
assertTrue( "Check Nested Append Element Exists",
- element1.childNodes[0].getLocalName() == "buttonnested2" );
+ element1.childNodes[0].getAttribute("id") == "buttonnested2" );
assertTrue( "Check Nested Append Element Exists",
- element1.childNodes[1].getLocalName() == "buttonnested3" );
+ element1.childNodes[1].getAttribute("id") == "buttonnested3" );
}
function testNestedRemove(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("y1");
+ var element1 = uiDoc.getElementById("buttonnested");
assertTrue( "Check remove Element worked",
element1 == null );
@@ -127,7 +124,7 @@
function testAttributeSet(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("x1");
+ var element1 = uiDoc.getElementById("button1");
assertTrue( "Check set attribute BB worked = " + element1.toXml(true),
element1.getAttribute("BB") == "B1" );
@@ -135,7 +132,7 @@
function testAttributeRemove(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("x1");
+ var element1 = uiDoc.getElementById("button1");
assertTrue( "Check set attribute AA worked = " + element1.toXml(true),
element1.getAttribute("AA") == null );
@@ -144,7 +141,7 @@
function testRemoveChildren(){
var rootElement = uiDoc.getRootElement();
- var element1 = uiDoc.getElementById("x2");
+ var element1 = uiDoc.getElementById("button2");
assertTrue( "Check remove children worked child array length = " + element1.childNodes.length,
element1.childNodes.length == 0 );
Modified: incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html (original)
+++ incubator/xap/trunk/testsrc/xap/xmodify/_TestxModifyHTML.html Thu Nov 2 16:20:33 2006
@@ -15,9 +15,6 @@
<script language="JavaScript" type="text/javascript" src="/jsunit/src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="/jsunit/src/xap/Xap.js"></script>
- <script language="JavaScript" type="text/javascript">
- Xap.bootstrap("/jsunit");
- </script>
</head>
<body>
@@ -28,6 +25,7 @@
dojo.hostenv.setModulePrefix("xap", "../xap");
dojo.hostenv.setModulePrefix("google", "../google");
Xap.require("xap.xml.xmodify.Xmodify");
+Xap.require("xap.session.ClientSession");
Xap.require("xap.xml.sax.SaxParser");
Xap.require("xap.xml.sax.SaxContentHandler");
Xap.require("xap.requestservice.RequestService");
@@ -38,6 +36,7 @@
if (setupOnce == false) return;
try {
+ var session = new xap.session.ClientSession(null,"dojo",null) ;
var requestService = new xap.requestservice.RequestService( null );
// index.xal contains xap.xml.xmodify.Xmodify instructions that need to get executed
@@ -54,9 +53,8 @@
/////////////////////////////////////////////////
// Here is what I need from xap.xml.xmodify.Xmodify:
/////////////////////////////////////////////////
- var xmodify = new xap.xml.xmodify.Xmodify( commandsDoc.firstChild.firstChild);
+ var xmodify = new xap.xml.xmodify.Xmodify( commandsDoc.firstChild.firstChild, session);
xmodify.execute( document );
-
} catch (ee) {
// Need a catch here, even though we mean to do
// nothing interesting:
Modified: incubator/xap/trunk/testsrc/xap/xmodify/xmodify.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/testsrc/xap/xmodify/xmodify.xal?view=diff&rev=470613&r1=470612&r2=470613
==============================================================================
--- incubator/xap/trunk/testsrc/xap/xmodify/xmodify.xal (original)
+++ incubator/xap/trunk/testsrc/xap/xmodify/xmodify.xal Thu Nov 2 16:20:33 2006
@@ -1,39 +1,54 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xal xmlns="http://www.openxal.org/xal" xmlns:xm="http://www.openxal.org/xmodify">
-<xm:modifications>
-<xm:append select="/xal">
-<button id="x0" text="x" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
-<button2 id="x2" text="x1" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
-</xm:append>
-<xm:insert-after select="/xal/button">
-<button1 id="x1" text="x1" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
-</xm:insert-after><xm:insert-before select="/xal/button2"><button1a id="x3" text="y" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/></xm:insert-before>
-
- <xm:append select="/xal/button1">
- <buttonnested id="y1" text="new child" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
- <buttonnested2 id="y2" text="new child" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
- <buttonnested3 id="y3" text="new child" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
- </xm:append>
- <xm:remove-element select="/xal/button1/buttonnested"/>
- <xm:set-attribute select="/xal/button1">
- <attribute name="AA" value="A1" />
- <attribute name="BB" value="B1" />
- </xm:set-attribute><xm:append select="/xal"><IamRoot id="newroot">Root</IamRoot></xm:append>
- <xm:remove-attribute select="/xal/button1">
- <attribute name="AA"/>
- </xm:remove-attribute><xm:set-attribute select="/xal/button2">
- <attribute name="firstName" value=""Bob"" />
- <attribute name="lastName" value="Dobbs" />
- </xm:set-attribute>
- <!--
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xal xmlns="http://www.openxal.org/xal" xmlns:xm="http://www.openxal.org/xmodify">
+ <xm:modifications>
+ <xm:append select="/xal">
+ <button id="button" bgColor="#FF0000" height="100px" text="x" width="100px" x="100px"
+ y="100px"/>
+ <button id="button2" bgColor="#FF0000" height="100px" text="x1" width="100px" x="100px"
+ y="100px"/>
+ </xm:append>
+ <xm:insert-after select="/xal/button[@id='button']">
+ <button id="button1" bgColor="#FF0000" height="100px" text="x1" width="100px" x="100px"
+ y="100px"/>
+ </xm:insert-after>
+ <xm:insert-before select="/xal/button[@id='button2']">
+ <button id="button1a" bgColor="#FF0000" height="100px" text="y" width="100px" x="100px"
+ y="100px"/>
+ </xm:insert-before>
+ <xm:append select="/xal/button[@id='button1']">
+ <button id="buttonnested" bgColor="#FF0000" height="100px" text="new child" width="100px"
+ x="100px" y="100px"/>
+ <button id="buttonnested2" bgColor="#FF0000" height="100px" text="new child" width="100px"
+ x="100px" y="100px"/>
+ <button id="buttonnested3" bgColor="#FF0000" height="100px" text="new child" width="100px"
+ x="100px" y="100px"/>
+ </xm:append>
+ <xm:remove-element select="/xal/button[@id='button1']/button[@id='buttonnested']"/>
+ <xm:set-attribute select="/xal/button[@id='button1']">
+ <attribute name="AA" value="A1"/>
+ <attribute name="BB" value="B1"/>
+ </xm:set-attribute>
+ <xm:append select="/xal">
+ <IamRoot id="newroot">Root</IamRoot>
+ </xm:append>
+ <xm:remove-attribute select="/xal/button[@id='button1']">
+ <attribute name="AA"/>
+ </xm:remove-attribute>
+ <xm:set-attribute select="/xal/button[@id='button2']">
+ <attribute name="firstName" value=""Bob""/>
+ <attribute name="lastName" value="Dobbs"/>
+ </xm:set-attribute>
+ <!--
Test removing children.
-->
- <xm:append select="/xal/button2">
- <buttonnested text="new child" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
- <buttonnested2 text="new child" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
- <buttonnested3 text="new child" bgColor="#FF0000" x="100px" y="100px" width="100px" height="100px"/>
- </xm:append>
- <xm:remove-children select="/xal/button2"/>
- </xm:modifications>
- </xal>
-
\ No newline at end of file
+ <xm:append select="/xal/button[@id='button2']">
+ <button bgColor="#FF0000" height="100px" text="new child" width="100px" x="100px"
+ y="100px"/>
+ <button bgColor="#FF0000" height="100px" text="new child" width="100px" x="100px"
+ y="100px"/>
+ <button bgColor="#FF0000" height="100px" text="new child" width="100px" x="100px"
+ y="100px"/>
+ </xm:append>
+ <xm:remove-children select="/xal/button[@id='button2']"/>
+ </xm:modifications>
+</xal>
Propchange: incubator/xap/trunk/testsrc/xap/xmodify/xmodify.xal
('svn:eol-style' removed)