[Gnash-commit] gnash ChangeLog testsuite/libamf.all/Makefile.a...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/12/15 17:13:58

Modified files:
        .              : ChangeLog 
        testsuite/libamf.all: Makefile.am test_sol.cpp 

Log message:
                * testsuite/libamf.all/test_sol.cpp: When reading a SOL file,
                test for multiple elements of varying data types.
                * testsuite/libamf.all/Makefile.am: rather than generate the 
.sol
                files, these are now checked in, so we don't havwe to build 
them.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5184&r2=1.5185
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/Makefile.am?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_sol.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5184
retrieving revision 1.5185
diff -u -b -r1.5184 -r1.5185
--- ChangeLog   15 Dec 2007 16:04:39 -0000      1.5184
+++ ChangeLog   15 Dec 2007 17:13:58 -0000      1.5185
@@ -1,3 +1,10 @@
+2007-12-15  Rob Savoye  <address@hidden>
+
+       * testsuite/libamf.all/test_sol.cpp: When reading a SOL file,
+       test for multiple elements of varying data types.
+       * testsuite/libamf.all/Makefile.am: rather than generate the .sol
+       files, these are now checked in, so we don't havwe to build them.
+       
 2007-12-15 Sandro Santilli <address@hidden>
 
        * testsuite/Makefile.am: fix abs_mediadir for gnashrc generation.
@@ -21,9 +28,10 @@
        object.xml, string.xml, undefined.xml: New XML files to generate
        .sol files using s2x.py.
        * testsuite/libamf.all/solfiles/array.sol, date.sol, number.sol,
-       settings.sol, test.sol, sol.sol, boolean.sol, null.sol,
+       settings.sol, test.sol, boolean.sol, null.sol,
        object.sol, string.sol, undefined.sol: New binary SOL files for
        testcases. 
+       * testsuite/libamf.all/test_sol.cpp: Test case for SOL support.
        * configure.ac: Look for python so we can use it for testing.
 
 2007-12-14 Sandro Santilli <address@hidden>

Index: testsuite/libamf.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/libamf.all/Makefile.am    15 Dec 2007 06:58:40 -0000      1.8
+++ testsuite/libamf.all/Makefile.am    15 Dec 2007 17:13:58 -0000      1.9
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.8 2007/12/15 06:58:40 rsavoye Exp $
+# $Id: Makefile.am,v 1.9 2007/12/15 17:13:58 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -82,24 +82,22 @@
        result-success.amf
 
 SOLS = \
-       array.xml \
-       boolean.xml \
-       date.xml \
-       null.xml \
-       number.xml \
-       object.xml \
-       string.xml \
-       settings.xml \
-       test.xml \
-       undefined.xml \
-       xml.xml
+       array.sol \
+       boolean.sol \
+       date.sol \
+       null.sol \
+       number.sol \
+       object.sol \
+       string.sol \
+       settings.sol \
+       test.sol \
+       undefined.sol \
+       xml.sol
 
 EXTRA_DIST = $(AMFS) $(SOLS)
 
 # solfiles := $(patsubst %.xml,%.sol,$(SOLS))
-
-CLEANFILES = $(solfiles)
-
+#CLEANFILES = $(solfiles)
 # solfiles: $(solfiles) 
 
 # this script converts between SOL Shared Objects and XML files. Very useful 
for testing.

Index: testsuite/libamf.all/test_sol.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_sol.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/libamf.all/test_sol.cpp   15 Dec 2007 07:00:27 -0000      1.1
+++ testsuite/libamf.all/test_sol.cpp   15 Dec 2007 17:13:58 -0000      1.2
@@ -104,15 +104,21 @@
         buf = new char[st.st_size + 1];
 
         sol.readFile(filespec);
-        string name = "TestString";
-        char *data = "testing, 1-2-3, testing";
-        AMF::amf_element_t el = sol.getElement(0);        
-        if ((name == el.name) && (memcmp(data, el.data, el.length) == 0)) {
+        vector<AMF::amf_element_t> els = sol.getElements();
+
+        string str = reinterpret_cast<const char *>(els[2].data);
+
+        // Make sure multiple elements of varying datatypes are checked for.
+        if ((els[0].name == "gain") &&
+            (els[2].name == "defaultmicrophone") &&
+            (str == "/dev/input/mic") &&
+            (els[5].name == "defaultalways") &&
+            (els[9].name == "trustedPaths")) {
             runtest.pass("Read SOL File");
         } else {
             runtest.fail("Read SOL file");
         }
-        sol.dump();
+//        sol.dump();
     }
 }