vhardy 2003/07/08 02:02:48
Modified: samples/tests/spec/interactivity cursor.svg focus.svg
keyEvents.svg
samples/tests/spec/scripting alert.svg bug12933.svg
filterPatternUpdate.svg gradientsUpdate.svg
imageUpdate.svg markerUpdate.svg maskClipUpdate.svg
removeLast.svg security2.jar security3.svg svg.svg
svg2.svg
Log:
Modified interactive test for integration into regard.manual
Revision Changes Path
1.5 +27 -8 xml-batik/samples/tests/spec/interactivity/cursor.svg
Index: cursor.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/interactivity/cursor.svg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cursor.svg 11 Jun 2003 22:07:23 -0000 1.4
+++ cursor.svg 8 Jul 2003 09:02:47 -0000 1.5
@@ -40,7 +40,7 @@
</defs>
- <g transform="translate(120, 120)" class="label" text-anchor="middle">
+ <g transform="translate(120, 120)" class="label" text-anchor="middle"
onmouseover="cursorMoved(evt)">
<use xlink:href="#oddRow" cursor="auto"/>
<text>auto</text>
<g transform="translate(0,20)" cursor="crosshair">
@@ -106,7 +106,7 @@
</g>
- <g transform="translate(330, 120)" class="label" text-anchor="middle">
+ <g transform="translate(330, 120)" class="label" text-anchor="middle"
onmouseover="cursorMoved(evt)">
<g transform="translate(0,0)" cursor="e-resize">
<use xlink:href="#oddRow"/>
<text>e-resize</text>
@@ -176,9 +176,28 @@
</g>
</g>
- <!-- ============================================================= -->
- <!-- Batik sample mark -->
- <!-- ============================================================= -->
- <!-- <use xlink:href="../../../batikLogo.svg#Batik_Tag_Box" /> -->
-
+ <script type="text/ecmascript"><![CDATA[
+function cursorMoved(evt) {
+ if (evt.target.nodeName == "rect") {
+ evt.target.setAttribute("fill", "gold");
+ } else {
+ System.err.println(">>>>>>>> Not a rect : " + evt.target.nodeName);
+ }
+}
+
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+
+ <rect x="25" y="460" width="20" height="20" shape-rendering="crispEdges"
fill="red" onclick="evt.target.setAttribute('fill', 'green')" stroke="black"/>
+ <g id="done" transform="translate(70, 458)" cursor="pointer" onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
+
</svg>
1.2 +61 -15 xml-batik/samples/tests/spec/interactivity/focus.svg
Index: focus.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/interactivity/focus.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- focus.svg 11 Jun 2002 09:54:04 -0000 1.1
+++ focus.svg 8 Jul 2003 09:02:47 -0000 1.2
@@ -14,6 +14,7 @@
<!-- Tests support for the DOMFocusIn, DOMFocusOut, DOMActivate -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
+<!-- @author [EMAIL PROTECTED] -->
<!-- @version $Id$ -->
<!-- ========================================================================= -->
@@ -25,32 +26,77 @@
<text class="title" x="50%" y="50">DOMFocusIn, DOMFocusOut, and DOMActivate
test</text>
- <script type="text/ecmascript"><![CDATA[
-
- var elementWithFocus;
-
- function show(msg) {
- alert(msg);
- }
- ]]></script>
-
<g id="body-content">
-<rect onactivate="show('activate orange')" onfocusin="show('focusin orange')"
onfocusout="show('focusout orange')"
+<rect onactivate="set('orange', 'activate')" onfocusin="set('orange', 'focusin')"
onfocusout="set('orange', 'focusout')"
x="100" y="100" width="100" height="100" style="fill:orange" />
-<rect onactivate="show('activate crimson')" onfocusin="show('focusin crimson')"
onfocusout="show('focusout crimson')"
+<rect onactivate="set('crimson', 'activate')" onfocusin="set('crimson', 'focusin')"
onfocusout="set('crimson', 'focusout')"
x="250" y="100" width="100" height="100" style="fill:crimson" />
-<rect onactivate="show('activate gold')" onfocusin="show('focusin gold')"
onfocusout="show('focusout gold')"
+<rect onactivate="set('gold', 'activate')" onfocusin="set('gold', 'focusin')"
onfocusout="set('gold', 'focusout')"
x="100" y="250" width="100" height="100" style="fill:gold" />
-<rect onactivate="show('activate #aaa')" onfocusin="show('focusin #aaa')"
onfocusout="show('focusout #aaa')"
+<rect onactivate="set('aaa', 'activate')" onfocusin="set('aaa', 'focusin')"
onfocusout="set('aaa', 'focusout')"
x="250" y="250" width="100" height="100" style="fill:#aaa" />
-<circle onactivate="show('activate #eee')" onfocusin="show('focusin #eee')"
onfocusout="show('focusout #eee')"
+<circle onactivate="set('eee', 'activate')" onfocusin="set('eee', 'focusin')"
onfocusout="set('eee', 'focusout')"
cx="225" cy="225" r="75" style="fill:#eee" />
</g>
+
+ <script type="text/ecmascript"><![CDATA[
+function set(color, state) {
+ var elt = document.getElementById(color + "." + state);
+ elt.setAttribute("fill", "green");
+}
+
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+
+ <g fill="red" stroke="black" transform="translate(40, 420)">
+ <g transform="translate(0,0)">
+ <rect id="orange.focusin" width="20" height="20" />
+ <rect id="orange.focusout" x="25" width="20" height="20" />
+ <rect id="orange.activate" x="50" width="20" height="20" />
+ </g>
+
+ <g transform="translate(75,0)">
+ <rect id="crimson.focusin" width="20" height="20" />
+ <rect id="crimson.focusout" x="25" width="20" height="20" />
+ <rect id="crimson.activate" x="50" width="20" height="20" />
+ </g>
+
+ <g transform="translate(150,0)">
+ <rect id="gold.focusin" width="20" height="20" />
+ <rect id="gold.focusout" x="25" width="20" height="20" />
+ <rect id="gold.activate" x="50" width="20" height="20" />
+ </g>
+
+ <g transform="translate(225,0)">
+ <rect id="aaa.focusin" width="20" height="20" />
+ <rect id="aaa.focusout" x="25" width="20" height="20" />
+ <rect id="aaa.activate" x="50" width="20" height="20" />
+ </g>
+
+ <g transform="translate(300,0)">
+ <rect id="eee.focusin" width="20" height="20" />
+ <rect id="eee.focusout" x="25" width="20" height="20" />
+ <rect id="eee.activate" x="50" width="20" height="20" />
+ </g>
+
+
+ </g>
+ <g id="done" transform="translate(195, 458)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
+
</svg>
1.2 +63 -29 xml-batik/samples/tests/spec/interactivity/keyEvents.svg
Index: keyEvents.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/interactivity/keyEvents.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keyEvents.svg 11 Jun 2002 09:54:04 -0000 1.1
+++ keyEvents.svg 8 Jul 2003 09:02:47 -0000 1.2
@@ -15,6 +15,7 @@
<!-- Tests support for the DOMFocusIn, DOMFocusOut, DOMActivate -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
+<!-- @author [EMAIL PROTECTED] -->
<!-- @version $Id$ -->
<!-- ========================================================================= -->
@@ -24,47 +25,80 @@
xmlns:xlink="http://www.w3.org/1999/xlink";
id="body" width="450" height="500" viewBox="0 0 450 500">
- <text class="title" x="50%" y="50">KeyEvents test</text>
+ <text class="title" x="50%" y="50">KeyEvents test<tspan x="50%"
dy="1.3em">(type an upper case 'A' on each color)</tspan></text>
- <script type="text/ecmascript"><![CDATA[
+<g id="body-content">
- var textElt;
- var document;
-
- function init(evt) {
- document = evt.target.ownerDocument;
- textElt = document.getElementById('key');
- }
-
- function show(color, evt) {
- System.out.println(color+":
'"+String.fromCharCode(evt.getCharCode())+"' "+evt.getType());
- //textElt.removeChild(textElt.firstChild);
- //var text = color+": '"+String.fromCharCode(evt.charCode)+"'
"+evt.type;
- //var textNode = document.createTextNode(text);
- //textElt.appendChild(textNode);
- }
- ]]></script>
-
-<g id="body-content" onload="init(evt)">
-
-<rect onkeypress="show('orange', evt)" onkeydown="show('orange', evt)"
onkeyup="show('orange', evt)"
+<rect onkeypress="set('orange', 'keypress')" onkeydown="set('orange', 'keydown')"
onkeyup="set('orange', 'keypress')"
x="100" y="100" width="100" height="100" style="fill:orange" />
-<rect onkeypress="show('crimson', evt)" onkeydown="show('crimson', evt)"
onkeyup="show('crimson', evt)"
+<rect onkeypress="set('crimson', 'keypress')" onkeydown="set('crimson', 'keydown')"
onkeyup="set('crimson', 'keypress')"
x="250" y="100" width="100" height="100" style="fill:crimson" />
-<rect onkeypress="show('gold', evt)" onkeydown="show('gold', evt)"
onkeyup="show('gold', evt)"
+<rect onkeypress="set('gold', 'keypress')" onkeydown="set('gold', 'keydown')"
onkeyup="set('gold', 'keypress')"
x="100" y="250" width="100" height="100" style="fill:gold" />
-<rect onkeypress="show('#aaa', evt)" onkeydown="show('#aaa', evt)"
onkeyup="show('#aaa', evt)"
+<rect onkeypress="set('aaa', 'keypress')" onkeydown="set('aaa', 'keydown')"
onkeyup="set('aaa', 'keypress')"
x="250" y="250" width="100" height="100" style="fill:#aaa" />
-<circle onkeypress="show('#eee', evt)" onkeydown="show('#eee', evt)"
onkeyup="show('#eee', evt)"
+<circle onkeypress="set('eee', 'keypress')" onkeydown="set('eee', 'keydown')"
onkeyup="set('eee', 'keypress')"
cx="225" cy="225" r="75" style="fill:#eee" />
</g>
-<text id="key" x="50%" y="400" style="text-anchor:middle">
- </text>
+ <script type="text/ecmascript"><![CDATA[
+function set(color, state) {
+ var elt = document.getElementById(color + "." + state);
+ elt.setAttribute("fill", "green");
+}
+
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+
+ <g fill="red" stroke="black" transform="translate(40, 420)">
+ <g transform="translate(0,0)">
+ <rect id="orange.keypress" width="20" height="20" />
+ <rect id="orange.keydown" x="25" width="20" height="20" />
+ <rect id="orange.keyup" x="50" width="20" height="20" />
+ </g>
+
+ <g transform="translate(75,0)">
+ <rect id="crimson.keypress" width="20" height="20" />
+ <rect id="crimson.keydown" x="25" width="20" height="20" />
+ <rect id="crimson.keyup" x="50" width="20" height="20" />
+ </g>
+
+ <g transform="translate(150,0)">
+ <rect id="gold.keypress" width="20" height="20" />
+ <rect id="gold.keydown" x="25" width="20" height="20" />
+ <rect id="gold.keyup" x="50" width="20" height="20" />
+ </g>
+
+ <g transform="translate(225,0)">
+ <rect id="aaa.keypress" width="20" height="20" />
+ <rect id="aaa.keydown" x="25" width="20" height="20" />
+ <rect id="aaa.keyup" x="50" width="20" height="20" />
+ </g>
+
+ <g transform="translate(300,0)">
+ <rect id="eee.keypress" width="20" height="20" />
+ <rect id="eee.keydown" x="25" width="20" height="20" />
+ <rect id="eee.keyup" x="50" width="20" height="20" />
+ </g>
+
+
+ </g>
+
+ <g id="done" transform="translate(195, 458)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
+
</svg>
1.3 +4 -3 xml-batik/samples/tests/spec/scripting/alert.svg
Index: alert.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/alert.svg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alert.svg 20 Nov 2001 15:08:26 -0000 1.2
+++ alert.svg 8 Jul 2003 09:02:48 -0000 1.3
@@ -19,7 +19,8 @@
<?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?>
-<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";
width="450" height="500" viewBox="0 0 450 500">
+<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";
+ width="450" height="500" viewBox="0 0 450 500" onmouseover="alert('Hello')">
<title>Alert on mouse events</title>
<defs>
@@ -35,7 +36,7 @@
<!-- ============================================================= -->
<!-- Test content -->
<!-- ============================================================= -->
- <g id="testContent">
+ <g id="testContent" onmouseover="alert('Hello')">
<text x="225" y="30" class="title">Alert on mouse events</text>
</g>
1.2 +16 -1 xml-batik/samples/tests/spec/scripting/bug12933.svg
Index: bug12933.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/bug12933.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bug12933.svg 19 Nov 2002 16:53:14 -0000 1.1
+++ bug12933.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -79,6 +79,21 @@
<text x="50%" y="400" text-anchor="middle" >Click 1 and 2, the bounding box
of <rect> should appear in red</text>
</g>
+
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+ <g id="done" transform="translate(195, 458)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
+
<!-- ============================================================= -->
<!-- Batik sample mark -->
<!-- ============================================================= -->
1.3 +16 -3 xml-batik/samples/tests/spec/scripting/filterPatternUpdate.svg
Index: filterPatternUpdate.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/filterPatternUpdate.svg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filterPatternUpdate.svg 10 Jun 2002 15:12:25 -0000 1.2
+++ filterPatternUpdate.svg 8 Jul 2003 09:02:48 -0000 1.3
@@ -26,7 +26,7 @@
<title>Filter and pattern with geometry updates</title>
- <text x="50%" y="45" class="title">Filter and pattern with geometry updates
+ <text x="50%" y="25" class="title">Filter and pattern with geometry updates
<tspan x="50%" dy="1.1em" style="font-style:italic; font-size:12">(click on all
shapes and see
<a style="fill:blue"
xlink:href="filterPatternUpdateRef.svg">filterPatternUpdateRef.svg</a>)</tspan></text>
@@ -75,7 +75,7 @@
</defs>
-<g id="test-content">
+<g id="test-content" transform="translate(0,-20)">
<g id="board" style="fill:none; stroke:black">
<rect x="40" y="80" width="200" height="20" style="fill:#eee"/>
@@ -105,5 +105,18 @@
</g>
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+ <g id="done" transform="translate(195, 468)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
</svg>
1.2 +17 -3 xml-batik/samples/tests/spec/scripting/gradientsUpdate.svg
Index: gradientsUpdate.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/gradientsUpdate.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gradientsUpdate.svg 10 Jun 2002 14:32:15 -0000 1.1
+++ gradientsUpdate.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -26,7 +26,7 @@
<title>Gradients with geometry updates</title>
- <text x="50%" y="45" class="title">Gradients with geometry updates
+ <text x="50%" y="25" class="title">Gradients with geometry updates
<tspan x="50%" dy="1.1em" style="font-style:italic; font-size:12">(click on all
shapes and see
<a style="fill:blue"
xlink:href="gradientsUpdateRef.svg">gradientsUpdateRef.svg</a>)</tspan></text>
@@ -72,7 +72,7 @@
</defs>
-<g id="test-content">
+<g id="test-content" transform="translate(0,-20)">
<g id="board" style="fill:none; stroke:black">
<rect x="40" y="80" width="200" height="20" style="fill:#eee"/>
@@ -101,6 +101,20 @@
</g>
+
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+ <g id="done" transform="translate(195, 468)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
</svg>
1.2 +18 -1 xml-batik/samples/tests/spec/scripting/imageUpdate.svg
Index: imageUpdate.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/imageUpdate.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imageUpdate.svg 19 Nov 2002 17:03:54 -0000 1.1
+++ imageUpdate.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -98,6 +98,23 @@
</g>
+
+
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+ <g id="done" transform="translate(195, 468)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
+
+
<!-- ============================================================= -->
<!-- Batik sample mark -->
<!-- ============================================================= -->
1.2 +19 -3 xml-batik/samples/tests/spec/scripting/markerUpdate.svg
Index: markerUpdate.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/markerUpdate.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markerUpdate.svg 10 Jun 2002 14:32:15 -0000 1.1
+++ markerUpdate.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -26,7 +26,7 @@
<title>Marker with geometry updates</title>
- <text x="50%" y="45" class="title">Marker with geometry updates
+ <text x="50%" y="25" class="title">Marker with geometry updates
<tspan x="50%" dy="1.1em" style="font-style:italic; font-size:12">(click on all
shapes and see
<a style="fill:blue"
xlink:href="markerUpdateRef.svg">markerUpdateRef.svg</a>)</tspan></text>
@@ -54,7 +54,7 @@
</defs>
-<g id="test-content">
+<g id="test-content" transform="translate(0, -20)">
<g id="board" style="fill:none; stroke:black">
<rect x="40" y="80" width="200" height="20" style="fill:#eee"/>
@@ -82,6 +82,22 @@
style="stroke:black; stroke-width:4; fill:none;
marker:url(#markerUserSpaceOnUse)" />
</g>
+
+
+
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+ <g id="done" transform="translate(195, 468)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
1.2 +19 -3 xml-batik/samples/tests/spec/scripting/maskClipUpdate.svg
Index: maskClipUpdate.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/maskClipUpdate.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maskClipUpdate.svg 10 Jun 2002 14:32:15 -0000 1.1
+++ maskClipUpdate.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -26,7 +26,7 @@
<title>Clip and mask with geometry updates</title>
- <text x="50%" y="45" class="title">Clip and mask with geometry updates
+ <text x="50%" y="25" class="title">Clip and mask with geometry updates
<tspan x="50%" dy="1.1em" style="font-style:italic; font-size:12">(click on all
shapes and see
<a style="fill:blue"
xlink:href="maskClipUpdateRef.svg">maskClipUpdateRef.svg</a>)</tspan></text>
@@ -66,7 +66,7 @@
</defs>
-<g id="test-content">
+<g id="test-content" transform="translate(0, -20)">
<g id="board" style="fill:none; stroke:black">
<rect x="40" y="80" width="200" height="20" style="fill:#eee"/>
@@ -94,6 +94,22 @@
<rect onclick="move(evt)" x="250" y="300" width="90" height="85"
style="fill:crimson; mask:url(#maskUserSpaceOnUse)"/>
</g>
+
+
+
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+ <g id="done" transform="translate(195, 468)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
1.2 +14 -2 xml-batik/samples/tests/spec/scripting/removeLast.svg
Index: removeLast.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/removeLast.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- removeLast.svg 29 May 2002 13:00:35 -0000 1.1
+++ removeLast.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -28,7 +28,19 @@
</script>
- <rect onclick="remove(evt)"
+ <rect onclick="remove(evt); onDone();"
x="100" y="100" width="100" height="100" style="fill:#eee"/>
+
+
+
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
</svg>
1.3 +13 -14 xml-batik/samples/tests/spec/scripting/security2.jar
<<Binary file>>
1.2 +24 -1 xml-batik/samples/tests/spec/scripting/security3.svg
Index: security3.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/security3.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- security3.svg 14 May 2002 08:29:23 -0000 1.1
+++ security3.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -81,6 +81,7 @@
<script type="text/ecmascript" ><![CDATA[
function windowTest() {
+ evalTest();
setIntervalTest();
setTimeoutTest();
getURLTest();
@@ -89,6 +90,21 @@
promptTest();
}
+function evalTest() {
+ var t = document.getElementById("eval");
+ try {
+ eval("dummyGetURL()");
+ t.setAttributeNS(null, "class", "passedTest");
+ } catch (e) {
+ t.setAttributeNS(null, "class", "failedTest");
+ }
+}
+
+function dummyGetURL(){
+ alert('dummyGetURL');
+ getURL('security3Include.svg', dummyFunction);
+}
+
function dummyFunction() {
System.out.println("===>> dummyFunction called");
}
@@ -272,6 +288,13 @@
<rect class="cellStatus" x="200" width="20" height="20" />
<rect id="prompt" class="untested" x="203" y="3" width="14" height="14"
/>
<text x="5" y="15" class="label">prompt</text>
+ </g>
+
+ <g id="evalTest" transform="translate(0, 160)">
+ <rect class="cellLabel" width="200" height="20" />
+ <rect class="cellStatus" x="200" width="20" height="20" />
+ <rect id="eval" class="untested" x="203" y="3" width="14" height="14" />
+ <text x="5" y="15" class="label">eval</text>
</g>
1.2 +19 -1 xml-batik/samples/tests/spec/scripting/svg.svg
Index: svg.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/svg.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svg.svg 18 Jun 2002 12:50:06 -0000 1.1
+++ svg.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -47,4 +47,22 @@
</svg>
</g>
+
+
+
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+ <g id="done" transform="translate(195, 468)" cursor="pointer"
onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
+
+
</svg>
1.2 +19 -1 xml-batik/samples/tests/spec/scripting/svg2.svg
Index: svg2.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/svg2.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svg2.svg 4 Jul 2002 07:19:02 -0000 1.1
+++ svg2.svg 8 Jul 2003 09:02:48 -0000 1.2
@@ -39,4 +39,22 @@
<g id="test-content">
<rect x="25%" y="25%" width="50%" height="50%" fill="crimson" />
</g>
+
+
+
+ <script type="text/ecmascript"><![CDATA[
+function onDone() {
+ if (!(regardTestInstance == null)) {
+ regardTestInstance.scriptDone();
+ } else {
+ alert("This button only works when run in the regard framework");
+ }
+}
+ ]]></script>
+ <g id="done" transform="translate(195, 80)" cursor="pointer" onclick="onDone()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ </g>
+
+
</svg>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
