[telemetry] Make single-benchmark measurements protected and undiscoverable.

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 9fa0c1187d15a0ec148275ec21e90432821abc78..34bc8914006da6e90ce77c222ef441499066a68c 100644
--- a/tools/telemetry/telemetry/core/discover_unittest.py
+++ b/tools/telemetry/telemetry/core/discover_unittest.py
@@ -8,16 +8,45 @@ from telemetry.core import discover
 from telemetry.core import util
 
 class DiscoverTest(unittest.TestCase):
-  def testDiscoverClasses(self):
-    base_dir = util.GetUnittestDataDir()
-    start_dir = os.path.join(base_dir, 'discoverable_classes')
-    base_class = Exception
-    classes = discover.DiscoverClasses(start_dir, base_dir, base_class)
-    self.assertTrue(len(classes) > 0)
-    for c in classes.values():
-      self.assertTrue(issubclass(c, Exception))
-
-    # discover_dummyclass is a base class and should not show up.
-    self.assertFalse('discover_dummyclass' in classes)
-    self.assertEqual(classes['another_discover_dummyclass'].__name__,
-                     'AnotherDummyException')
+  def setUp(self):
+    self._base_dir = util.GetUnittestDataDir()
+    self._start_dir = os.path.join(self._base_dir, 'discoverable_classes')
+    self._base_class = Exception
+
+  def testDiscoverClassesBasic(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 = {
+        'discover_dummyclass': 'DummyException',
+        'another_discover_dummyclass': 'DummyExceptionImpl2',
+    }
+    self.assertEqual(actual_classes, expected_classes)
+
+  def testDiscoverClassesWithPattern(self):
+    classes = discover.DiscoverClasses(
+        self._start_dir, self._base_dir, self._base_class,
+        pattern='another*')
+
+    actual_classes = dict(
+        (name, cls.__name__) for name, cls in classes.iteritems())
+    expected_classes = {
+        'another_discover_dummyclass': 'DummyExceptionImpl2',
+    }
+    self.assertEqual(actual_classes, expected_classes)
+
+  def testDiscoverClassesByClassName(self):
+    classes = discover.DiscoverClasses(
+        self._start_dir, self._base_dir, self._base_class,
+        index_by_class_name=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)