Update of /cvsroot/pygccxml/source/pyplusplus/unittests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24990/pyplusplus/unittests Modified Files: call_policies_tester.py class_order_tester.py classes_tester.py enums_tester.py free_functions_tester.py fundamental_tester_base.py global_variables_tester.py member_functions_tester.py member_variables_tester.py operators_bug_tester.py operators_tester.py optional_tester.py recursive_tester.py regression1_tester.py regression2_tester.py temprorary_variable_tester.py Log Message: adding select interface to decl_wrapper class hierarchy Documentation strings will come later Index: free_functions_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/free_functions_tester.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** free_functions_tester.py 28 Feb 2006 07:31:33 -0000 1.6 --- free_functions_tester.py 15 Mar 2006 09:27:07 -0000 1.7 *************** *** 21,30 **** def customize(self, mb ): ! matcher = declarations.match_declaration_t( name='one' ) ! function_one = code_creators.creator_finder.find_by_declaration( matcher ! , mb.module_creator.creators ) ! self.failUnless( len(function_one) == 1) ! function_one = function_one[0] ! function_one.alias = "ONE" def run_tests(self, module): --- 21,25 ---- def customize(self, mb ): ! mb.calldef( 'one' ).alias = 'ONE' def run_tests(self, module): Index: member_variables_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/member_variables_tester.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** member_variables_tester.py 28 Feb 2006 07:31:33 -0000 1.13 --- member_variables_tester.py 15 Mar 2006 09:27:07 -0000 1.14 *************** *** 21,30 **** def customize(self, mb ): ! matcher = declarations.match_declaration_t( name='prefered_color' ) ! color = code_creators.creator_finder.find_by_declaration( matcher ! , mb.module_creator.creators ) ! self.failUnless( len(color) == 1) ! color = color[0] ! color.alias = 'PreferedColor' def change_default_color( self, module ): --- 21,25 ---- def customize(self, mb ): ! mb.variable( 'prefered_color' ).alias = 'PreferedColor' def change_default_color( self, module ): Index: recursive_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/recursive_tester.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** recursive_tester.py 28 Feb 2006 07:31:33 -0000 1.2 --- recursive_tester.py 15 Mar 2006 09:27:07 -0000 1.3 *************** *** 21,28 **** def customize( self, mb ): ! for decl in declarations.make_flatten( mb.declarations ): ! if isinstance( decl, declarations.namespace_t ): ! continue ! decl.ignore = 'skip' not in decl.name matcher = declarations.match_declaration_t( name='skip_a' ) --- 21,27 ---- def customize( self, mb ): ! decls = mb.decls( lambda decl: not isinstance(decl, declarations.namespace_t) ! and 'skip' in decl.name ) ! decls.ignore = True matcher = declarations.match_declaration_t( name='skip_a' ) *************** *** 30,33 **** --- 29,33 ---- , mb.module_creator.creators ) self.failUnless( not found, "'skip_a' declaration should not be exported" ) + matcher = declarations.match_declaration_t( name='skip_b' ) found = code_creators.creator_finder.find_by_declaration( matcher Index: class_order_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/class_order_tester.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** class_order_tester.py 28 Feb 2006 07:31:33 -0000 1.4 --- class_order_tester.py 15 Mar 2006 09:27:07 -0000 1.5 *************** *** 27,35 **** #This will add item creator to be last exported class extmodule.body.adopt_creator(item_creator) ! relevant_classes = (code_creators.function_t, code_creators.constructor_t ) ! calldefs = filter( lambda creator: isinstance( creator, relevant_classes ) ! , code_creators.make_flatten( extmodule.creators ) ) ! for calldef in calldefs: ! calldef.use_keywords = False def run_tests(self, module): --- 27,32 ---- #This will add item creator to be last exported class extmodule.body.adopt_creator(item_creator) ! ! mb.calldefs().use_keywords = False def run_tests(self, module): Index: classes_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/classes_tester.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** classes_tester.py 28 Feb 2006 07:31:33 -0000 1.13 --- classes_tester.py 15 Mar 2006 09:27:07 -0000 1.14 *************** *** 21,32 **** def customize(self, mb ): ! extmodule = mb.module_creator ! matcher = declarations.match_declaration_t( name='fundamental2' ! , type=declarations.class_t) ! found = code_creators.creator_finder.find_by_declaration( matcher ! , extmodule.creators ) ! self.failUnless( len(found) == 1) ! found = found[0] ! found.alias = 'FUNDAMENTAL2' def run_tests(self, module): --- 21,25 ---- def customize(self, mb ): ! mb.class_( 'fundamental2' ).alias = 'FUNDAMENTAL2' def run_tests(self, module): Index: temprorary_variable_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/temprorary_variable_tester.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** temprorary_variable_tester.py 28 Feb 2006 07:31:33 -0000 1.3 --- temprorary_variable_tester.py 15 Mar 2006 09:27:07 -0000 1.4 *************** *** 22,32 **** def customize(self, mb): ! for creator in code_creators.make_flatten( mb.module_creator.body.creators ): ! if not isinstance( creator, code_creators.function_t ): ! continue ! if not creator.call_policies and 'name' in creator.alias: ! creator.call_policies \ ! = decl_wrappers.return_value_policy( decl_wrappers.copy_non_const_reference ) ! def _create_derived_from_named_item(self, extmodule): --- 22,29 ---- def customize(self, mb): ! functions = mb.calldefs( lambda decl: not decl.call_policies ! and 'name' in decl.alias ) ! functions.call_policies \ ! = decl_wrappers.return_value_policy( decl_wrappers.copy_non_const_reference ) def _create_derived_from_named_item(self, extmodule): Index: regression2_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/regression2_tester.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** regression2_tester.py 28 Feb 2006 07:31:33 -0000 1.2 --- regression2_tester.py 15 Mar 2006 09:27:07 -0000 1.3 *************** *** 21,28 **** def customize( self, mb ): ! for decl in declarations.make_flatten( mb.declarations ): ! if isinstance( decl, declarations.namespace_t ): ! continue ! decl.ignore = decl.name == 'get_a' def run_tests(self, module): --- 21,27 ---- def customize( self, mb ): ! decls = mb.decls( lambda decl: not isinstance( decl, declarations.namespace_t ) ! and decl.name == 'get_a' ) ! decls.ignore = True def run_tests(self, module): Index: enums_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/enums_tester.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** enums_tester.py 28 Feb 2006 07:31:33 -0000 1.8 --- enums_tester.py 15 Mar 2006 09:27:07 -0000 1.9 *************** *** 21,34 **** def customize(self, mb ): ! color_matcher = declarations.match_declaration_t( name='color' ) ! color = code_creators.creator_finder.find_by_declaration( color_matcher ! , mb.module_creator.creators ) ! self.failUnless( len(color) == 1) ! color = color[0] ! assert isinstance( color, code_creators.enum_t ) color.alias = 'Color' color.value_aliases['red'] = 'RED' color.value_aliases['blue']= 'BLUE' ! color.export_values.extend( ['red', 'blue'] ) def run_tests(self, module): --- 21,33 ---- def customize(self, mb ): ! color = mb.enumeration( 'color' ) ! self.failUnless(color) color.alias = 'Color' color.value_aliases['red'] = 'RED' color.value_aliases['blue']= 'BLUE' ! color.export_values = ['red', 'blue'] ! ! def get_green( self, module): ! module.green def run_tests(self, module): *************** *** 38,41 **** --- 37,41 ---- self.failUnless( module.RED ) self.failUnless( module.BLUE ) + self.failIfNotRaisesAny( lambda: self.get_green( module ) ) def create_suite(): Index: global_variables_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/global_variables_tester.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** global_variables_tester.py 28 Feb 2006 07:31:33 -0000 1.9 --- global_variables_tester.py 15 Mar 2006 09:27:07 -0000 1.10 *************** *** 21,30 **** def customize(self, mb ): ! var_matcher = declarations.match_declaration_t( name='non_const_var' ) ! var = code_creators.creator_finder.find_by_declaration( var_matcher ! , mb.module_creator.creators ) ! self.failUnless( len(var) == 1) ! var = var[0] ! var.alias = 'NonConstVar' def run_tests(self, module): --- 21,25 ---- def customize(self, mb ): ! mb.variable('non_const_var').alias = 'NonConstVar' def run_tests(self, module): Index: operators_bug_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/operators_bug_tester.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** operators_bug_tester.py 28 Feb 2006 07:31:33 -0000 1.6 --- operators_bug_tester.py 15 Mar 2006 09:27:07 -0000 1.7 *************** *** 21,28 **** def customize(self, mb ): ! class_creators = filter( lambda creator: isinstance( creator, code_creators.class_t ) ! , code_creators.make_flatten( mb.module_creator.creators ) ) ! for class_creator in class_creators: ! class_creator.redefine_operators = True def run_tests(self, module): --- 21,25 ---- def customize(self, mb ): ! mb.classes().redefine_operators = True def run_tests(self, module): Index: member_functions_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/member_functions_tester.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** member_functions_tester.py 28 Feb 2006 07:31:33 -0000 1.12 --- member_functions_tester.py 15 Mar 2006 09:27:07 -0000 1.13 *************** *** 21,25 **** def customize(self, mb ): - find = code_creators.creator_finder.find_by_declaration_single names = [ 'protected_protected_derived_t' --- 21,24 ---- *************** *** 31,41 **** , 'private_base_t' ] - classes = [] - for name in names: - matcher = declarations.match_declaration_t( name=name, type=declarations.class_t) - classes.append( find( matcher, mb.module_creator.body.creators ) ) - for class_ in classes: - class_.always_expose_using_scope = True def create_test_class_inst(self, class_ ): class tester_impl_t( class_ ): --- 30,36 ---- , 'private_base_t' ] + mb.classes( lambda decl: decl.name in names ).always_expose_using_scope = True + def create_test_class_inst(self, class_ ): class tester_impl_t( class_ ): Index: regression1_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/regression1_tester.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** regression1_tester.py 28 Feb 2006 07:31:33 -0000 1.5 --- regression1_tester.py 15 Mar 2006 09:27:07 -0000 1.6 *************** *** 22,30 **** def customize( self, mb ): ! set_updater = filter( lambda creator: isinstance( creator, code_creators.function_t ) ! and creator.declaration.name == 'set_updater' ! , code_creators.make_flatten( mb.module_creator ) ) ! assert len(set_updater) == 1 ! set_updater = set_updater[0] set_updater.call_policies = decl_wrappers.with_custodian_and_ward( 1, 2 ) --- 22,26 ---- def customize( self, mb ): ! set_updater = mb.calldef( 'set_updater' ) set_updater.call_policies = decl_wrappers.with_custodian_and_ward( 1, 2 ) Index: operators_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/operators_tester.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** operators_tester.py 28 Feb 2006 07:31:33 -0000 1.8 --- operators_tester.py 15 Mar 2006 09:27:07 -0000 1.9 *************** *** 22,47 **** def customize( self, mb ): ! gns = mb.namespace( name='::' ) ! gns.exclude() #I don't want to export base classes of 'rational<long int>' ! rational = declarations.find_declaration( gns ! , type=declarations.class_t ! , name='rational<long int>' ) rational.include() rational.alias = "pyrational" ! for decl in declarations.make_flatten( gns ): ! if isinstance( decl, declarations.free_operator_t ) \ ! and 'rational<long int>' in decl.decl_string: ! decl.include() ! r_assign = declarations.find_declaration( rational.declarations ! , type=declarations.calldef_t ! , name='assign' ! , recursive=False) r_assign.call_policies = decl_wrappers.return_self() ! bad_rational = declarations.find_declaration( gns, type=declarations.class_t, name='bad_rational' ) bad_rational.include() --- 22,40 ---- def customize( self, mb ): ! mb.global_ns.exclude() #I don't want to export base classes of 'rational<long int>' ! ! rational = mb.class_('rational<long int>') rational.include() rational.alias = "pyrational" ! foperators = mb.free_operators( lambda decl: 'rational<long int>' in decl.decl_string ) ! foperators.include() ! r_assign = rational.calldef( 'assign', recursive=False ) r_assign.call_policies = decl_wrappers.return_self() ! bad_rational = mb.class_('bad_rational' ) bad_rational.include() Index: call_policies_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/call_policies_tester.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** call_policies_tester.py 28 Feb 2006 07:31:33 -0000 1.8 --- call_policies_tester.py 15 Mar 2006 09:27:07 -0000 1.9 *************** *** 22,34 **** def customize(self, mb ): ! extmodule = mb.module_creator ! matcher = declarations.match_declaration_t( name='return_second_arg' ) ! rsa = code_creators.creator_finder.find_by_declaration_single( matcher, extmodule.creators ) self.failUnless( rsa ) rsa.call_policies = decl_wrappers.return_arg( 2 ) ! ! matcher = declarations.match_declaration_t( name='return_self' ) ! rs = code_creators.creator_finder.find_by_declaration_single( matcher, extmodule.creators ) ! self.failUnless( rs ) rs.call_policies = decl_wrappers.return_self() --- 22,29 ---- def customize(self, mb ): ! rsa = mb.calldef( 'return_second_arg' ) self.failUnless( rsa ) rsa.call_policies = decl_wrappers.return_arg( 2 ) ! rs = mb.calldef( 'return_self' ) rs.call_policies = decl_wrappers.return_self() Index: fundamental_tester_base.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/fundamental_tester_base.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** fundamental_tester_base.py 28 Feb 2006 07:31:33 -0000 1.29 --- fundamental_tester_base.py 15 Mar 2006 09:27:07 -0000 1.30 *************** *** 44,53 **** def failIfNotRaisesAny(self, callableObj, *args, **kwargs): try: callableObj(*args, **kwargs) - self.fail( 'exception has not been raised during execution.') except: ! pass ! def customize(self, generator): pass --- 44,53 ---- def failIfNotRaisesAny(self, callableObj, *args, **kwargs): + was_exception = False try: callableObj(*args, **kwargs) except: ! was_exception = True ! self.failUnless(was_exception, 'exception has not been raised during execution.') def customize(self, generator): pass Index: optional_tester.py =================================================================== RCS file: /cvsroot/pygccxml/source/pyplusplus/unittests/optional_tester.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** optional_tester.py 2 Mar 2006 13:30:37 -0000 1.1 --- optional_tester.py 15 Mar 2006 09:27:07 -0000 1.2 *************** *** 21,27 **** def customize( self, mb ): ! for decl in declarations.make_flatten( mb.declarations ): ! if isinstance( decl, declarations.calldef_t ): ! decl.use_default_arguments = False def run_tests(self, module): --- 21,25 ---- def customize( self, mb ): ! mb.calldefs().use_default_arguments = False def run_tests(self, module): |
