Revert of Create classes_util API, change discover to return a list instead of a dict.

tools/telemetry/telemetry/core/discover_unittest.py

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 c39dd2d92d0516b5dd7f7ca378343c2851cbec64..c124d4507851d3ba6200cd6c15dcbc6ced59b119 100644
--- a/tools/telemetry/telemetry/core/discover_unittest.py
+++ b/tools/telemetry/telemetry/core/discover_unittest.py
@@ -14,82 +14,90 @@
     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 testDiscoverClassesOneClassPerModule(self):
+  def testDiscoverClassesWithIndexByModuleName(self):
     classes = discover.DiscoverClasses(
         self._start_dir, self._base_dir, self._base_class,
-        one_class_per_module=True)
+        index_by_class_name=False)
 
-    actual_classes = list(cls.__name__ for cls in classes)
-    expected_classes = ['DummyExceptionImpl1', 'DummyException',
-                        'DummyExceptionWithParameterImpl2']
-    self.assertItemsEqual(actual_classes, expected_classes)
+    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 testDiscoverDirectlyConstructableClasses(self):
+  def testDiscoverDirectlyConstructableClassesWithIndexByClassName(self):
     classes = discover.DiscoverClasses(
         self._start_dir, self._base_dir, self._base_class,
         directly_constructable=True)
 
-    actual_classes = list(cls.__name__ for cls in classes)
-    expected_classes = [
-        'DummyException', 'DummyExceptionImpl1', 'DummyExceptionImpl2'
-    ]
-    self.assertItemsEqual(actual_classes, expected_classes)
+    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)
 
-  def testDiscoverOneDirectlyConstructableClassPerModule(self):
+  def testDiscoverClassesWithIndexByClassName(self):
+    classes = discover.DiscoverClasses(
+        self._start_dir, self._base_dir, self._base_class)
+
+    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):
     classes = discover.DiscoverClasses(
         self._start_dir, self._base_dir, self._base_class,
-        directly_constructable=True, one_class_per_module=True)
+        pattern='another*', index_by_class_name=False)
 
-    actual_classes = list(cls.__name__ for cls in classes)
-    expected_classes = ['DummyException', 'DummyExceptionImpl1']
-    self.assertItemsEqual(actual_classes, expected_classes)
+    actual_classes = dict(
+        (name, cls.__name__) for name, cls in classes.iteritems())
+    expected_classes = {
+        'another_discover_dummyclass': 'DummyExceptionWithParameterImpl1'
+    }
+    self.assertEqual(actual_classes, expected_classes)
 
-  def testDiscoverClassesWithPattern(self):
+  def testDiscoverDirectlyConstructableClassesWithPatternAndIndexByClassName(
+      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)
+
+  def testDiscoverClassesWithPatternAndIndexByClassName(self):
     classes = discover.DiscoverClasses(
         self._start_dir, self._base_dir, self._base_class,
         pattern='another*')
 
-    actual_classes = list(cls.__name__ for cls in classes)
-    expected_classes = ['DummyExceptionImpl1', 'DummyExceptionImpl2',
-                        'DummyExceptionWithParameterImpl1']
-    self.assertItemsEqual(actual_classes, expected_classes)
-
-  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 = list(cls.__name__ for cls in classes)
-    expected_classes = ['DummyExceptionImpl1', 'DummyExceptionImpl2']
-    self.assertItemsEqual(actual_classes, expected_classes)
-
-  def testDiscoverOneDirectlyConstructableClassPerModuleWithPattern(self):
-    classes = discover.DiscoverClasses(
-        self._start_dir, self._base_dir, self._base_class,
-        pattern='another*', directly_constructable=True,
-        one_class_per_module=True)
-
-    actual_classes = list(cls.__name__ for cls in classes)
-    expected_classes = ['DummyExceptionImpl1']
-    self.assertItemsEqual(actual_classes, expected_classes)
+    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)