[Gnash-commit] gnash ChangeLog testsuite/misc-swfmill.all/Make...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/14 17:24:40

Modified files:
        .              : ChangeLog 
        testsuite/misc-swfmill.all: Makefile.am 
Added files:
        testsuite/misc-swfmill.all: initaction_in_definesprite.xml 

Log message:
        Test that DOINITACTION tags in sprite definitions are valid, and that
        whether or not an INITACTION tag was executed should be registered
        in the definition being referenced.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5175&r2=1.5176
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfmill.all/Makefile.am?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfmill.all/initaction_in_definesprite.xml?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5175
retrieving revision 1.5176
diff -u -b -r1.5175 -r1.5176
--- ChangeLog   14 Dec 2007 16:00:26 -0000      1.5175
+++ ChangeLog   14 Dec 2007 17:24:40 -0000      1.5176
@@ -1,5 +1,13 @@
 2007-12-14 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-swfmill.all/: Makefile.am,
+         initaction_in_definesprite.xml: test that DOINITACTION
+         tags in sprite definitions are valid, and that whether or
+         not an INITACTION tag was executed should be registered
+         in the definition being referenced.
+
+2007-12-14 Sandro Santilli <address@hidden>
+
        * server/stream.cpp (read): don't allow block reads to cross
          tag boundaries.
 

Index: testsuite/misc-swfmill.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfmill.all/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-swfmill.all/Makefile.am      10 Oct 2007 07:01:01 -0000      
1.8
+++ testsuite/misc-swfmill.all/Makefile.am      14 Dec 2007 17:24:40 -0000      
1.9
@@ -27,6 +27,7 @@
        hello.xml               \
        jump_after_end.xml      \
        dict_override.xml       \
+       initaction_in_definesprite.xml \
        $(NULL)
 
 ## Path to Dejagnu.swf file
@@ -43,6 +44,7 @@
 check_SCRIPTS = \
        jump_after_end-runner   \
        dict_override-runner    \
+       initaction_in_definesprite-runner       \
        $(NULL)
 
 jump_after_end-runner: $(srcdir)/../generic-testrunner.sh jump_after_end.swf 
Makefile
@@ -53,6 +55,10 @@
        sh $< -r 50 -c "END OF TEST" $(top_builddir) dict_override.swf > $@
        chmod 755 $@
 
+initaction_in_definesprite-runner: $(srcdir)/../generic-testrunner.sh 
initaction_in_definesprite.swf Makefile
+       sh $< -r 50 -C "END OF TEST" $(top_builddir) 
initaction_in_definesprite.swf > $@
+       chmod 755 $@
+
 .xml.swf: 
        $(SWFMILL) -v simple $(@:%.swf=$(srcdir)/%.xml) $@
 

Index: testsuite/misc-swfmill.all/initaction_in_definesprite.xml
===================================================================
RCS file: testsuite/misc-swfmill.all/initaction_in_definesprite.xml
diff -N testsuite/misc-swfmill.all/initaction_in_definesprite.xml
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfmill.all/initaction_in_definesprite.xml   14 Dec 2007 
17:24:40 -0000      1.1
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<swf version="6" compressed="1">
+
+<!--
+  |
+  |  This file test that DOINITACTION tag inside a DEFINESPRITE is allowed
+  |  and results in the action to be executed only once and only if the 
+  |  defined sprite is placed.
+  |
+  |  Also, this file tests that of multiple DOINITACTION tags referring to
+  |  the *same* character only the first executed gets trough, no matter in
+  |  which timeline the DOINITACTION tag is.
+  |
+  |  Expected output is just an 'END OF TEST' trace.
+  |
+  |  The test could be improved a lot but it ain't easy to do AS coding
+  |  in swfmill....
+  |
+-->
+  <Header framerate="12" frames="1">
+    <size>
+      <Rectangle left="0" right="12800" top="0" bottom="9600"/>
+    </size>
+    <tags>
+
+      <DefineSprite objectID="1" frames="1">
+        <tags>
+          <ShowFrame/>
+          <End/>
+        </tags>
+      </DefineSprite>
+
+      <DefineSprite objectID="3" frames="1">
+        <tags>
+          <DoInitAction sprite="1">
+            <actions>
+              <PushData>
+                <items>
+                  <StackString value="init action from sprite3 for sprite 1"/>
+                </items>
+              </PushData>
+              <Trace/>
+              <EndAction/>
+            </actions>
+          </DoInitAction>
+          <ShowFrame/>
+          <End/>
+        </tags>
+      </DefineSprite>
+
+      <DefineSprite objectID="2" frames="1">
+        <tags>
+          <DoInitAction sprite="1">
+            <actions>
+              <PushData>
+                <items>
+                  <StackString value="END OF TEST"/>
+                </items>
+              </PushData>
+              <Trace/>
+              <EndAction/>
+            </actions>
+          </DoInitAction>
+          <ShowFrame/>
+          <End/>
+        </tags>
+      </DefineSprite>
+
+      <!--
+        |  Place the sprite2 containing DOINITACTION block
+        |  referring to object2
+       -->
+      <PlaceObject2 replace="0" depth="1" objectID="2">
+      </PlaceObject2>
+
+      <!--
+        |  Place the sprite2 containing DOINITACTION block
+        |  referring to object2 *again* at a different depth.
+        | Init actions won't be executed again
+       -->
+      <PlaceObject2 replace="0" depth="2" objectID="2">
+      </PlaceObject2>
+
+      <!--
+        |  Place the sprite3 containing DOINITACTION block
+        |  referring to object2, for which init actions where
+        |  already executed !
+       -->
+      <PlaceObject2 replace="0" depth="3" objectID="3">
+      </PlaceObject2>
+
+      <ShowFrame/>
+      <End/>
+
+    </tags>
+  </Header>
+</swf>