Index: tools/telemetry/telemetry/core/discover_unittest.py |
diff --git a/tools/telemetry/telemetry/core/discover_unittest.py b/tools/telemetry/telemetry/core/discover_unittest.py |
index c124d4507851d3ba6200cd6c15dcbc6ced59b119..c39dd2d92d0516b5dd7f7ca378343c2851cbec64 100644 |
--- a/tools/telemetry/telemetry/core/discover_unittest.py |
+++ b/tools/telemetry/telemetry/core/discover_unittest.py |
@@ -14,90 +14,82 @@ class DiscoverTest(unittest.TestCase): |
self._start_dir = os.path.join(self._base_dir, 'discoverable_classes') |
self._base_class = Exception |
+ def testDiscoverClassesWithDefaults(self): |
+ classes = discover.DiscoverClasses( |
+ self._start_dir, self._base_dir, self._base_class) |
+ |
+ actual_classes = list(cls.__name__ for cls in classes) |
+ expected_classes = [ |
+ 'DummyException', 'DummyExceptionImpl1', 'DummyExceptionImpl2', |
+ 'DummyExceptionWithParameterImpl1', 'DummyExceptionWithParameterImpl2' |
+ ] |
+ self.assertItemsEqual(actual_classes, expected_classes) |
+ |
- def testDiscoverClassesWithIndexByModuleName(self): |
+ def testDiscoverClassesOneClassPerModule(self): |
classes = discover.DiscoverClasses( |
self._start_dir, self._base_dir, self._base_class, |
- index_by_class_name=False) |
- |
- actual_classes = dict( |
- (name, cls.__name__) for name, cls in classes.iteritems()) |
- expected_classes = { |
- 'another_discover_dummyclass': 'DummyExceptionWithParameterImpl1', |
- 'discover_dummyclass': 'DummyException', |
- 'parameter_discover_dummyclass': 'DummyExceptionWithParameterImpl2' |
- } |
- self.assertEqual(actual_classes, expected_classes) |
- |
- def testDiscoverDirectlyConstructableClassesWithIndexByClassName(self): |
+ one_class_per_module=True) |
+ |
+ actual_classes = list(cls.__name__ for cls in classes) |
+ expected_classes = ['DummyExceptionImpl1', 'DummyException', |
+ 'DummyExceptionWithParameterImpl2'] |
+ self.assertItemsEqual(actual_classes, expected_classes) |
+ |
+ def testDiscoverDirectlyConstructableClasses(self): |
classes = discover.DiscoverClasses( |
self._start_dir, self._base_dir, self._base_class, |
directly_constructable=True) |
- actual_classes = dict( |
- (name, cls.__name__) for name, cls in classes.iteritems()) |
- expected_classes = { |
- 'dummy_exception': 'DummyException', |
- 'dummy_exception_impl1': 'DummyExceptionImpl1', |
- 'dummy_exception_impl2': 'DummyExceptionImpl2', |
- } |
- self.assertEqual(actual_classes, expected_classes) |
+ actual_classes = list(cls.__name__ for cls in classes) |
+ expected_classes = [ |
+ 'DummyException', 'DummyExceptionImpl1', 'DummyExceptionImpl2' |
+ ] |
+ self.assertItemsEqual(actual_classes, expected_classes) |
- def testDiscoverClassesWithIndexByClassName(self): |
+ def testDiscoverOneDirectlyConstructableClassPerModule(self): |
classes = discover.DiscoverClasses( |
- self._start_dir, self._base_dir, self._base_class) |
+ self._start_dir, self._base_dir, self._base_class, |
+ directly_constructable=True, one_class_per_module=True) |
- actual_classes = dict( |
- (name, cls.__name__) for name, cls in classes.iteritems()) |
- expected_classes = { |
- 'dummy_exception': 'DummyException', |
- 'dummy_exception_impl1': 'DummyExceptionImpl1', |
- 'dummy_exception_impl2': 'DummyExceptionImpl2', |
- 'dummy_exception_with_parameter_impl1': |
- 'DummyExceptionWithParameterImpl1', |
- 'dummy_exception_with_parameter_impl2': |
- 'DummyExceptionWithParameterImpl2' |
- } |
- self.assertEqual(actual_classes, expected_classes) |
- |
- |
- def testDiscoverClassesWithPatternAndIndexByModule(self): |
+ actual_classes = list(cls.__name__ for cls in classes) |
+ expected_classes = ['DummyException', 'DummyExceptionImpl1'] |
+ self.assertItemsEqual(actual_classes, expected_classes) |
+ |
+ def testDiscoverClassesWithPattern(self): |
classes = discover.DiscoverClasses( |
self._start_dir, self._base_dir, self._base_class, |
- pattern='another*', index_by_class_name=False) |
+ pattern='another*') |
- actual_classes = dict( |
- (name, cls.__name__) for name, cls in classes.iteritems()) |
- expected_classes = { |
- 'another_discover_dummyclass': 'DummyExceptionWithParameterImpl1' |
- } |
- self.assertEqual(actual_classes, expected_classes) |
+ actual_classes = list(cls.__name__ for cls in classes) |
+ expected_classes = ['DummyExceptionImpl1', 'DummyExceptionImpl2', |
+ 'DummyExceptionWithParameterImpl1'] |
+ self.assertItemsEqual(actual_classes, expected_classes) |
- def testDiscoverDirectlyConstructableClassesWithPatternAndIndexByClassName( |
- self): |
+ def testDiscoverOneClassPerModuleWithPattern(self): |
+ classes = discover.DiscoverClasses( |
+ self._start_dir, self._base_dir, self._base_class, |
+ pattern='another*', one_class_per_module=True) |
+ |
+ actual_classes = list(cls.__name__ for cls in classes) |
+ expected_classes = ['DummyExceptionImpl1'] |
+ self.assertItemsEqual(actual_classes, expected_classes) |
+ |
+ def testDiscoverDirectlyConstructableClassesWithPattern(self): |
classes = discover.DiscoverClasses( |
self._start_dir, self._base_dir, self._base_class, |
pattern='another*', directly_constructable=True) |
- actual_classes = dict( |
- (name, cls.__name__) for name, cls in classes.iteritems()) |
- expected_classes = { |
- 'dummy_exception_impl1': 'DummyExceptionImpl1', |
- 'dummy_exception_impl2': 'DummyExceptionImpl2', |
- } |
- self.assertEqual(actual_classes, expected_classes) |
+ actual_classes = list(cls.__name__ for cls in classes) |
+ expected_classes = ['DummyExceptionImpl1', 'DummyExceptionImpl2'] |
+ self.assertItemsEqual(actual_classes, expected_classes) |
- def testDiscoverClassesWithPatternAndIndexByClassName(self): |
+ def testDiscoverOneDirectlyConstructableClassPerModuleWithPattern(self): |
classes = discover.DiscoverClasses( |
self._start_dir, self._base_dir, self._base_class, |
- pattern='another*') |
+ pattern='another*', directly_constructable=True, |
+ one_class_per_module=True) |
- actual_classes = dict( |
- (name, cls.__name__) for name, cls in classes.iteritems()) |
- expected_classes = { |
- 'dummy_exception_impl1': 'DummyExceptionImpl1', |
- 'dummy_exception_impl2': 'DummyExceptionImpl2', |
- 'dummy_exception_with_parameter_impl1': |
- 'DummyExceptionWithParameterImpl1', |
- } |
- self.assertEqual(actual_classes, expected_classes) |
+ actual_classes = list(cls.__name__ for cls in classes) |
+ expected_classes = ['DummyExceptionImpl1'] |
+ self.assertItemsEqual(actual_classes, expected_classes) |