Changeset 110
- Timestamp:
- 07/24/06 15:33:25 (2 years ago)
- Files:
-
- branches/mk/cheesecake/cheesecake_index.py (modified) (5 diffs)
- branches/mk/cheesecake/codeparser.py (modified) (2 diffs)
- branches/mk/tests/unit/test_index_use_test_framework.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/mk/cheesecake/cheesecake_index.py
r109 r110 965 965 max_value = 30 966 966 967 def compute(self, doctests_count, files_list, classes, methods):967 def compute(self, doctests_count, unittests_count, files_list, classes, methods): 968 968 frameworks_found = False 969 969 970 970 if doctests_count > 0: 971 frameworks_found = True 972 973 if unittests_count > 0: 971 974 frameworks_found = True 972 975 … … 1455 1458 'docstring_cnt', 1456 1459 'docformat_cnt', 1460 'doctests_count', 1461 'unittests_count', 1457 1462 'files_list', 1458 1463 'functions', … … 1473 1478 doctests_count : int 1474 1479 Number of docstrings that include doctests. 1480 unittests_count : int 1481 Number of classes which inherit from unittest.TestCase. 1475 1482 files_list : list 1476 1483 List of files package contains. … … 1497 1504 self.classes = [] 1498 1505 self.methods = [] 1506 self.unittests_count = 0 1499 1507 1500 1508 # Parse all application files and count objects … … 1511 1519 self.methods += code.methods 1512 1520 self.doctests_count += code.doctests_count 1521 self.unittests_count += code.unittests_count 1513 1522 1514 1523 # Log a bit of debugging info. branches/mk/cheesecake/codeparser.py
r98 r110 123 123 self.formatted_docstrings_count = 0 124 124 self.doctests_count = 0 125 self.unittests_count = 0 125 126 126 127 # Initialize lists of format docstrings. … … 143 144 self.modules.append(fullname) 144 145 if isinstance(obj, Class): 146 if 'unittest.TestCase' in obj.bases or 'TestCase' in obj.bases: 147 self.unittests_count += 1 145 148 self.classes.append(fullname) 146 149 if isinstance(obj, Function): branches/mk/tests/unit/test_index_use_test_framework.py
r97 r110 42 42 pass 43 43 def test_that(self): 44 pass 45 """ 46 47 unittest_test_contents = """ 48 class TestThisAndThat(unittest.TestCase): 49 def test_this(self): 44 50 pass 45 51 """ … … 102 108 103 109 def test_special_filenames_1(self): 104 "Test use_test_framework index with package sthat uses test_* filenames."110 "Test use_test_framework index with package that uses test_* filenames." 105 111 def setup(project_dir): 106 112 files = ['some_module.py', 'README', 'test_some_module.py'] … … 110 116 111 117 def test_special_filenames_2(self): 112 "Test use_test_framework index with package sthat uses *_test filenames."118 "Test use_test_framework index with package that uses *_test filenames." 113 119 def setup(project_dir): 114 120 files = ['some_module.py', 'README', 'some_module_test.py'] … … 118 124 119 125 def test_special_methods(self): 120 "Test use_test_framework index with package sthat uses setUp/tearDown methods."126 "Test use_test_framework index with package that uses setUp/tearDown methods." 121 127 def setup(project_dir): 122 128 test_filename = os.path.join(project_dir, 'do_checks.py') … … 124 130 125 131 self._run_it(setup) 132 133 def test_unittest_classes(self): 134 "Test use_test_framework index with package that uses unittest library." 135 def setup(project_dir): 136 test_filename = os.path.join(project_dir, 'do_checks.py') 137 dump_str_to_file(unittest_test_contents, test_filename) 138 139 self._run_it(setup)
