[pygccxml-commit] SF.net SVN: pygccxml:[1379] pyplusplus_dev/unittests

[<rom...@us...>]

Revision: 1379
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1379&view=rev
Author:   roman_yakovenko
Date:     2008-07-27 18:43:00 +0000 (Sun, 27 Jul 2008)

Log Message:
-----------
updating from_address FT

Modified Paths:
--------------
    pyplusplus_dev/unittests/data/ft_from_address_to_be_exported.hpp
    pyplusplus_dev/unittests/ft_from_address_tester.py

Modified: pyplusplus_dev/unittests/data/ft_from_address_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/ft_from_address_to_be_exported.hpp	2008-07-23 20:40:56 UTC (rev 1378)
+++ pyplusplus_dev/unittests/data/ft_from_address_to_be_exported.hpp	2008-07-27 18:43:00 UTC (rev 1379)
@@ -9,14 +9,15 @@
 #include <stdexcept>
 
 inline unsigned long
-sum_matrix( unsigned int** matrix, unsigned int rows, unsigned int columns ){
+sum_matrix( unsigned int* matrix, unsigned int rows, unsigned int columns ){
     if( !matrix ){
         throw std::runtime_error( "matrix is null" );
     }
     unsigned long result = 0;
     for( unsigned int r = 0; r < rows; ++r ){
         for( unsigned int c = 0; c < columns; ++c ){
-            result += matrix[r][c];
+            result += *matrix;
+            ++matrix;
         }
     }
     return result;

Modified: pyplusplus_dev/unittests/ft_from_address_tester.py
===================================================================
--- pyplusplus_dev/unittests/ft_from_address_tester.py	2008-07-23 20:40:56 UTC (rev 1378)
+++ pyplusplus_dev/unittests/ft_from_address_tester.py	2008-07-27 18:43:00 UTC (rev 1379)
@@ -29,10 +29,9 @@
         mb.calldef( 'sum_matrix' ).add_transformation( ft.from_address(0) )
 
     def run_tests(self, module):
-        rows = 1
-        columns = 1
+        rows = 10
+        columns = 7
         matrix_type = ctypes.c_uint * columns * rows
-        print matrix_type
         sum = 0
         counter = 0
         matrix = matrix_type()
@@ -41,10 +40,8 @@
                 matrix[r][c] = counter
                 sum += counter
                 counter += 1
-        print 'matrix filled'
         result = module.sum_matrix( ctypes.addressof( matrix ), rows, columns )
-        print 'result: ', result
-        print 'sum   : ', sum
+        self.failUnless( result == sum )
 
 def create_suite():
     suite = unittest.TestSuite()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.