[pygccxml-commit] SF.net SVN: pygccxml: [1130] pygccxml_dev/unittests
Brought to you by:
mbaas,
roman_yakovenko
Menu
▾
▴
[pygccxml-commit] SF.net SVN: pygccxml: [1130] pygccxml_dev/unittests
|
From: <rom...@us...> - 2007-11-08 23:26:21
|
Revision: 1130
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1130&view=rev
Author: roman_yakovenko
Date: 2007-11-08 15:24:24 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
updating unittests
Modified Paths:
--------------
pygccxml_dev/unittests/autoconfig.py
pygccxml_dev/unittests/data/core_cache.hpp
pygccxml_dev/unittests/declarations_cache_tester.py
pygccxml_dev/unittests/dependencies_tester.py
pygccxml_dev/unittests/filters_tester.py
pygccxml_dev/unittests/test_all.py
Modified: pygccxml_dev/unittests/autoconfig.py
===================================================================
--- pygccxml_dev/unittests/autoconfig.py 2007-11-07 21:24:58 UTC (rev 1129)
+++ pygccxml_dev/unittests/autoconfig.py 2007-11-08 23:24:24 UTC (rev 1130)
@@ -10,12 +10,14 @@
#__pychecker__ = 'limit=1000'
#import pychecker.checker
+this_module_dir_path = os.path.abspath ( os.path.dirname( sys.modules[__name__].__file__) )
+
compiler = None
-data_directory = os.path.abspath( os.path.join( os.curdir, 'data' ) )
-build_dir = os.path.abspath( os.path.join( os.curdir, 'temp' ) )
+data_directory = os.path.join( this_module_dir_path, 'data' )
+build_directory = os.path.join( this_module_dir_path, 'temp' )
-gccxml_07_path = os.path.abspath( os.path.join( '..', '..', 'gccxml_bin', 'v07', sys.platform, 'bin' ) )
-gccxml_09_path = os.path.abspath( os.path.join( '..', '..', 'gccxml_bin', 'v09', sys.platform, 'bin' ) )
+gccxml_07_path = os.path.join( this_module_dir_path, '..', '..', 'gccxml_bin', 'v07', sys.platform, 'bin' )
+gccxml_09_path = os.path.join( this_module_dir_path, '..', '..', 'gccxml_bin', 'v09', sys.platform, 'bin' )
gccxml_path = gccxml_09_path
gccxml_version = '__GCCXML_09__'
Modified: pygccxml_dev/unittests/data/core_cache.hpp
===================================================================
--- pygccxml_dev/unittests/data/core_cache.hpp 2007-11-07 21:24:58 UTC (rev 1129)
+++ pygccxml_dev/unittests/data/core_cache.hpp 2007-11-08 23:24:24 UTC (rev 1130)
@@ -22,4 +22,4 @@
#endif//__core_cache_hpp__
-//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch
\ No newline at end of file
+//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch//touch
\ No newline at end of file
Modified: pygccxml_dev/unittests/declarations_cache_tester.py
===================================================================
--- pygccxml_dev/unittests/declarations_cache_tester.py 2007-11-07 21:24:58 UTC (rev 1129)
+++ pygccxml_dev/unittests/declarations_cache_tester.py 2007-11-08 23:24:24 UTC (rev 1130)
@@ -12,8 +12,8 @@
class decl_cache_tester(unittest.TestCase):
def __init__(self, *args ):
unittest.TestCase.__init__(self, *args)
- if not os.path.exists( autoconfig.build_dir ):
- os.makedirs( autoconfig.build_dir )
+ if not os.path.exists( autoconfig.build_directory ):
+ os.makedirs( autoconfig.build_directory )
def test_file_signature(self):
file1 = os.path.join(autoconfig.data_directory, 'decl_cache_file1.txt')
@@ -47,7 +47,7 @@
self.assert_(configuration_signature(ignore_changed) == def_sig)
def test_cache_interface(self):
- cache_file = os.path.join(autoconfig.build_dir, 'decl_cache_test.test_cache_read.cache')
+ cache_file = os.path.join(autoconfig.build_directory, 'decl_cache_test.test_cache_read.cache')
file1 = os.path.join(autoconfig.data_directory, 'decl_cache_file1.txt')
file1_dup = os.path.join(autoconfig.data_directory, 'decl_cache_file1_duplicate.txt')
file2 = os.path.join(autoconfig.data_directory, 'decl_cache_file2.txt')
@@ -146,4 +146,4 @@
unittest.TextTestRunner(verbosity=2).run( create_suite() )
if __name__ == "__main__":
- run_suite()
\ No newline at end of file
+ run_suite()
Modified: pygccxml_dev/unittests/dependencies_tester.py
===================================================================
--- pygccxml_dev/unittests/dependencies_tester.py 2007-11-07 21:24:58 UTC (rev 1129)
+++ pygccxml_dev/unittests/dependencies_tester.py 2007-11-08 23:24:24 UTC (rev 1130)
@@ -42,7 +42,10 @@
cls = ns_vars.class_( 'struct_variables_t' )
dependencies = cls.i_depend_on_them()
- self.failUnless( len(dependencies) == 2 ) #compiler generated copy constructor
+ if '0.9' in cls.compiler:
+ self.failUnless( len(dependencies) == 1 )
+ else:
+ self.failUnless( len(dependencies) == 2 ) #compiler generated copy constructor
m_mutable = ns_vars.variable( 'm_mutable' )
dependencies = filter( lambda dependency: dependency.declaration is m_mutable
Modified: pygccxml_dev/unittests/filters_tester.py
===================================================================
--- pygccxml_dev/unittests/filters_tester.py 2007-11-07 21:24:58 UTC (rev 1129)
+++ pygccxml_dev/unittests/filters_tester.py 2007-11-08 23:24:24 UTC (rev 1130)
@@ -32,15 +32,24 @@
def test_access_type( self ):
criteria = declarations.access_type_matcher_t( declarations.ACCESS_TYPES.PUBLIC )
public_members = declarations.matcher.find( criteria, self.declarations )
- self.failUnless( 19 == len( public_members ) )
+ if '0.9' in public_members[0].compiler:
+ #2 empty classes, this compiler doesn't generate constructor and copy constructor
+ self.failUnless( 15 == len( public_members ) )
+ else:
+ self.failUnless( 19 == len( public_members ) )
def test_or_matcher( self ):
criteria1 = declarations.regex_matcher_t( 'oper.*'
, lambda decl: decl.name )
criteria2 = declarations.access_type_matcher_t( declarations.ACCESS_TYPES.PUBLIC )
found = declarations.matcher.find( criteria1 | criteria2, self.declarations )
- self.failUnless( 19 <= len( found ) <= 25 )
+ if '0.9' in found[0].compiler:
+ #2 empty classes, this compiler doesn't generate constructor and copy constructor
+ self.failUnless( 15 <= len( found ) <= 21)
+ else:
+ self.failUnless( 19 <= len( found ) <= 25)
+
def test_and_matcher( self ):
criteria1 = declarations.regex_matcher_t( 'oper.*'
, lambda decl: decl.name )
@@ -63,4 +72,4 @@
unittest.TextTestRunner(verbosity=2).run( create_suite() )
if __name__ == "__main__":
- run_suite()
\ No newline at end of file
+ run_suite()
Modified: pygccxml_dev/unittests/test_all.py
===================================================================
--- pygccxml_dev/unittests/test_all.py 2007-11-07 21:24:58 UTC (rev 1129)
+++ pygccxml_dev/unittests/test_all.py 2007-11-08 23:24:24 UTC (rev 1130)
@@ -3,7 +3,9 @@
# accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
+import sys
import unittest
+
import decl_string_tester
import declaration_files_tester
import declarations_comparison_tester
@@ -46,55 +48,54 @@
import attributes_tester
import type_as_exception_bug_tester
+testers = [
+ decl_string_tester
+ , declaration_files_tester
+ , declarations_comparison_tester
+ , declarations_tester
+ , file_cache_tester
+ , gccxml_runner_tester
+ , project_reader_correctness_tester
+ , source_reader_tester
+ , start_with_declarations_tester
+ , templates_tester
+ , type_traits_tester
+ , core_tester
+ , xmlfile_reader_tester
+ , filtering_tester
+ , text_reader_tester
+ , hierarchy_traveling
+ , patcher_tester
+ , call_invocation_tester
+ , bit_fields_tester
+ , complex_types_tester
+ , cached_source_file_tester
+ , variable_matcher_tester
+ , namespace_matcher_tester
+ , calldef_matcher_tester
+ , filters_tester
+ , cache_enums_tester
+ , decl_printer_tester
+ , typedefs_tester
+ , demangled_tester
+ , unnamed_enums_bug_tester
+ , vector_traits_tester
+ , string_traits_tester
+ , declarations_cache_tester
+ , has_binary_operator_traits_tester
+ , algorithms_cache_tester
+ , dependencies_tester
+ , free_operators_tester
+ , remove_template_defaults_tester
+ , find_container_traits_tester
+ , attributes_tester
+ , type_as_exception_bug_tester
+]
+
def create_suite():
- testers = [
- decl_string_tester
- , declaration_files_tester
- , declarations_comparison_tester
- , declarations_tester
- , file_cache_tester
- , gccxml_runner_tester
- , project_reader_correctness_tester
- , source_reader_tester
- , start_with_declarations_tester
- , templates_tester
- , type_traits_tester
- , core_tester
- , xmlfile_reader_tester
- , filtering_tester
- , text_reader_tester
- , hierarchy_traveling
- , patcher_tester
- , call_invocation_tester
- , bit_fields_tester
- , complex_types_tester
- , cached_source_file_tester
- , variable_matcher_tester
- , namespace_matcher_tester
- , calldef_matcher_tester
- , filters_tester
- , cache_enums_tester
- , decl_printer_tester
- , typedefs_tester
- , demangled_tester
- , unnamed_enums_bug_tester
- , vector_traits_tester
- , string_traits_tester
- , declarations_cache_tester
- , has_binary_operator_traits_tester
- , algorithms_cache_tester
- , dependencies_tester
- , free_operators_tester
- , remove_template_defaults_tester
- , find_container_traits_tester
- , attributes_tester
- , type_as_exception_bug_tester
- ]
-
main_suite = unittest.TestSuite()
for tester in testers:
main_suite.addTest( tester.create_suite() )
-
return main_suite
def run_suite():
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
