[Gnash-commit] gnash ChangeLog testsuite/server/StreamTest.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/05 16:06:47

Modified files:
        .              : ChangeLog 
        testsuite/server: StreamTest.cpp 

Log message:
        don't assume we have a non-caching stream, accidentally test 
set_position too..

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5092&r2=1.5093
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/StreamTest.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5092
retrieving revision 1.5093
diff -u -b -r1.5092 -r1.5093
--- ChangeLog   5 Dec 2007 11:31:52 -0000       1.5092
+++ ChangeLog   5 Dec 2007 16:06:46 -0000       1.5093
@@ -1,5 +1,11 @@
 2007-12-05 Sandro Santilli <address@hidden>
 
+       * testsuite/server/StreamTest.cpp: don't assume
+         we have a non-caching stream, accidentally test
+         set_position too..
+
+2007-12-05 Sandro Santilli <address@hidden>
+
        * server/stream.h: document align reads and bitwise
          reads, add a couple of WARNING for possible bugs.
 

Index: testsuite/server/StreamTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/StreamTest.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/server/StreamTest.cpp     5 Dec 2007 10:13:44 -0000       1.6
+++ testsuite/server/StreamTest.cpp     5 Dec 2007 16:06:46 -0000       1.7
@@ -29,6 +29,7 @@
 
 #include "tu_file.h"
 #include "stream.h"
+#include "log.h"
 
 #include <cstdio>
 #include <iostream>
@@ -95,6 +96,9 @@
 int
 main(int /*argc*/, char** /*argv*/)
 {
+       gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+       dbglogfile.setVerbosity(1);
+
        ByteReader br(0xAA);
 
        tu_file fakeIn(
@@ -110,11 +114,13 @@
                0 // close_func cf
        );
 
-       stream s(&fakeIn);
-
        int ret;
 
+       {
        /// bits: 10101010 (0xAA)
+       br.setByte(0xAA);
+       stream s(&fakeIn);
+
 
        check_equals(s.get_position(), 0);
        s.align();
@@ -338,9 +344,14 @@
        ret = s.read_bit(); check_equals(ret, 0);
        check_equals(s.get_position(), 27);
 
-       /// bits: 10011001 (0x99)
+       }
 
+       {
+       /// bits: 10011001 (0x99)
        br.setByte(0x99);
+       stream s(&fakeIn);
+       s.set_position(27);
+
        s.align();
        check_equals(s.get_position(), 27);
        ret = s.read_bit(); check_equals(ret, 1);
@@ -416,6 +427,8 @@
        u16 = s.read_uint(3); check_equals(u16, 1);
        check_equals(s.get_position(), 52);
 
+       }
+
        return 0;
 }