[pygccxml-commit] SF.net SVN: pygccxml: [279] pygccxml_dev/unittests

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

Revision: 279
Author:   roman_yakovenko
Date:     2006-07-08 11:27:50 -0700 (Sat, 08 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=279&view=rev

Log Message:
-----------
updating unittests to new interface of enumeration_t

Modified Paths:
--------------
    pygccxml_dev/unittests/declarations_tester.py
    pygccxml_dev/unittests/type_traits_tester.py
    pygccxml_dev/unittests/unnamed_enums_bug_tester.py
Modified: pygccxml_dev/unittests/declarations_tester.py
===================================================================
--- pygccxml_dev/unittests/declarations_tester.py	2006-07-08 18:26:29 UTC (rev 278)
+++ pygccxml_dev/unittests/declarations_tester.py	2006-07-08 18:27:50 UTC (rev 279)
@@ -32,8 +32,8 @@
 
     def test_enumeration_t(self):
         enum = self.global_ns.enum( 'ENumbers' )
-        expected_values = dict( zip( [ 'e%d' % index for index in range(10) ]
-                                     , [ '%d' % index for index in range(10) ] ) )
+        expected_values = zip( [ 'e%d' % index for index in range(10) ]
+                                     , [ index for index in range(10) ] )
         self.failUnless( expected_values == enum.values
                          , "expected enum values ( '%s' ) and existings ( '%s' ) are different" % \
                             ( pprint.pformat( expected_values ), pprint.pformat( enum.values ) ) )

Modified: pygccxml_dev/unittests/type_traits_tester.py
===================================================================
--- pygccxml_dev/unittests/type_traits_tester.py	2006-07-08 18:26:29 UTC (rev 278)
+++ pygccxml_dev/unittests/type_traits_tester.py	2006-07-08 18:27:50 UTC (rev 279)
@@ -210,7 +210,7 @@
         expected_type = declarations.find_declaration( defs
                                                        , name='expected'
                                                        , type=declarations.enumeration_t )
-        expected_value = bool( int( expected_type.values['value'] ) )
+        expected_value = bool( expected_type.get_name2value_dict()['value'] )
         if expected_value != declarations.is_convertible( source_type, target_type ):
             print decl.name
         

Modified: pygccxml_dev/unittests/unnamed_enums_bug_tester.py
===================================================================
--- pygccxml_dev/unittests/unnamed_enums_bug_tester.py	2006-07-08 18:26:29 UTC (rev 278)
+++ pygccxml_dev/unittests/unnamed_enums_bug_tester.py	2006-07-08 18:27:50 UTC (rev 279)
@@ -26,8 +26,8 @@
             
     def test( self ):                
         names = []
-        enums = self.global_ns.enums()        
-        map( lambda enum: names.extend( enum.values.keys() ), enums )
+        enums = self.global_ns.enums()        
+        map( lambda enum: names.extend( enum.get_name2value_dict().keys() ), enums )
         self.failUnless( len( names ) == 4 )
         self.failUnless( 'x1' in names )
         self.failUnless( 'x2' in names )
@@ -49,7 +49,7 @@
     def test( self ):                
         names = []
         enums = self.global_ns.enums()        
-        map( lambda enum: names.extend( enum.values.keys() ), enums )
+        map( lambda enum: names.extend( enum.get_name2value_dict().keys() ), enums )
         self.failUnless( len( names ) == 4 )
         self.failUnless( 'x1' in names )
         self.failUnless( 'x2' in names )
@@ -71,7 +71,7 @@
     def test( self ):                
         names = []
         enums = self.global_ns.enums()        
-        map( lambda enum: names.extend( enum.values.keys() ), enums )
+        map( lambda enum: names.extend( enum.get_name2value_dict().keys() ), enums )
         self.failUnless( len( names ) == 6 )
         self.failUnless( 'x1' in names )
         self.failUnless( 'x2' in names )


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