[polymer] Merge of master into polymer10-migration

telemetry/telemetry/timeline/tracing_category_filter_unittest.py

Index: telemetry/telemetry/timeline/tracing_category_filter_unittest.py
diff --git a/telemetry/telemetry/timeline/tracing_category_filter_unittest.py b/telemetry/telemetry/timeline/tracing_category_filter_unittest.py
deleted file mode 100644
index 5569afa06d8abe344b6632755568bd06a58962ea..0000000000000000000000000000000000000000
--- a/telemetry/telemetry/timeline/tracing_category_filter_unittest.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import unittest
-
-from telemetry.timeline import tracing_category_filter
-
-
-class TracingCategoryFilterTests(unittest.TestCase):
-  def CheckCategoryFilters(self, cf):
-    self.assertEquals(set(['x']), set(cf.included_categories))
-    self.assertEquals(set(['y']), set(cf.excluded_categories))
-    self.assertEquals(set(['disabled-by-default-z']),
-        set(cf.disabled_by_default_categories))
-    self.assertEquals(set(['DELAY(7;foo)']), set(cf.synthetic_delays))
-
-    self.assertTrue('x' in cf.filter_string)
-    self.assertEquals(
-        'x,disabled-by-default-z,-y,DELAY(7;foo)',
-        cf.stable_filter_string)
-
-  def testBasic(self):
-    cf = tracing_category_filter.TracingCategoryFilter(
-        'x,-y,disabled-by-default-z,DELAY(7;foo)')
-    self.CheckCategoryFilters(cf)
-
-  def testBasicWithSpace(self):
-    cf = tracing_category_filter.TracingCategoryFilter(
-        ' x ,\n-y\t,disabled-by-default-z ,DELAY(7;foo)')
-    self.CheckCategoryFilters(cf)
-
-
-class CategoryFilterTest(unittest.TestCase):
-  def testAddIncludedCategory(self):
-    a = tracing_category_filter.TracingCategoryFilter()
-    a.AddIncludedCategory('foo')
-    a.AddIncludedCategory('bar')
-    a.AddIncludedCategory('foo')
-    self.assertEquals(a.stable_filter_string, 'bar,foo')
-
-  def testAddExcludedCategory(self):
-    a = tracing_category_filter.TracingCategoryFilter()
-    a.AddExcludedCategory('foo')
-    a.AddExcludedCategory('bar')
-    a.AddExcludedCategory('foo')
-    self.assertEquals(a.stable_filter_string, '-bar,-foo')
-
-  def testIncludeAndExcludeCategoryRaisesAssertion(self):
-    a = tracing_category_filter.TracingCategoryFilter()
-    a.AddIncludedCategory('foo')
-    self.assertRaises(AssertionError, a.AddExcludedCategory, 'foo')
-
-    a = tracing_category_filter.TracingCategoryFilter()
-    a.AddExcludedCategory('foo')
-    self.assertRaises(AssertionError, a.AddIncludedCategory, 'foo')
-
-    self.assertRaises(AssertionError,
-                      tracing_category_filter.TracingCategoryFilter, 'foo,-foo')
-
-    self.assertRaises(AssertionError,
-                      tracing_category_filter.TracingCategoryFilter, '-foo,foo')
-
-
-  def testIsSubset(self):
-    b = tracing_category_filter.TracingCategoryFilter()
-    a = tracing_category_filter.TracingCategoryFilter()
-    self.assertEquals(a.IsSubset(b), True)
-
-    b = tracing_category_filter.TracingCategoryFilter()
-    a = tracing_category_filter.TracingCategoryFilter("test1,test2")
-    self.assertEquals(a.IsSubset(b), True)
-
-    b = tracing_category_filter.TracingCategoryFilter()
-    a = tracing_category_filter.TracingCategoryFilter("-test1,-test2")
-    self.assertEquals(a.IsSubset(b), True)
-
-    b = tracing_category_filter.TracingCategoryFilter("test1,test2")
-    a = tracing_category_filter.TracingCategoryFilter()
-    self.assertEquals(a.IsSubset(b), None)
-
-    b = tracing_category_filter.TracingCategoryFilter()
-    a = tracing_category_filter.TracingCategoryFilter("test*")
-    self.assertEquals(a.IsSubset(b), None)
-
-    b = tracing_category_filter.TracingCategoryFilter("test?")
-    a = tracing_category_filter.TracingCategoryFilter()
-    self.assertEquals(a.IsSubset(b), None)
-
-    b = tracing_category_filter.TracingCategoryFilter("test1")
-    a = tracing_category_filter.TracingCategoryFilter("test1,test2")
-    self.assertEquals(a.IsSubset(b), False)
-
-    b = tracing_category_filter.TracingCategoryFilter("-test1")
-    a = tracing_category_filter.TracingCategoryFilter("test1")
-    self.assertEquals(a.IsSubset(b), False)
-
-    b = tracing_category_filter.TracingCategoryFilter("test1,test2")
-    a = tracing_category_filter.TracingCategoryFilter("test2,test1")
-    self.assertEquals(a.IsSubset(b), True)
-
-    b = tracing_category_filter.TracingCategoryFilter("-test1,-test2")
-    a = tracing_category_filter.TracingCategoryFilter("-test2")
-    self.assertEquals(a.IsSubset(b), False)
-
-    b = tracing_category_filter.TracingCategoryFilter(
-        "disabled-by-default-test1")
-    a = tracing_category_filter.TracingCategoryFilter(
-        "disabled-by-default-test1,disabled-by-default-test2")
-    self.assertEquals(a.IsSubset(b), False)
-
-    b = tracing_category_filter.TracingCategoryFilter(
-        "disabled-by-default-test1")
-    a = tracing_category_filter.TracingCategoryFilter(
-        "disabled-by-default-test2")
-    self.assertEquals(a.IsSubset(b), False)
-
-  def testIsSubsetWithSyntheticDelays(self):
-    b = tracing_category_filter.TracingCategoryFilter("DELAY(foo;0.016)")
-    a = tracing_category_filter.TracingCategoryFilter("DELAY(foo;0.016)")
-    self.assertEquals(a.IsSubset(b), True)
-
-    b = tracing_category_filter.TracingCategoryFilter("DELAY(foo;0.016)")
-    a = tracing_category_filter.TracingCategoryFilter()
-    self.assertEquals(a.IsSubset(b), True)
-
-    b = tracing_category_filter.TracingCategoryFilter()
-    a = tracing_category_filter.TracingCategoryFilter("DELAY(foo;0.016)")
-    self.assertEquals(a.IsSubset(b), False)
-
-    b = tracing_category_filter.TracingCategoryFilter("DELAY(foo;0.016)")
-    a = tracing_category_filter.TracingCategoryFilter("DELAY(foo;0.032)")
-    self.assertEquals(a.IsSubset(b), False)
-
-    b = tracing_category_filter.TracingCategoryFilter(
-        "DELAY(foo;0.016;static)")
-    a = tracing_category_filter.TracingCategoryFilter(
-        "DELAY(foo;0.016;oneshot)")
-    self.assertEquals(a.IsSubset(b), False)
-
-    b = tracing_category_filter.TracingCategoryFilter(
-        "DELAY(foo;0.016),DELAY(bar;0.1)")
-    a = tracing_category_filter.TracingCategoryFilter(
-        "DELAY(bar;0.1),DELAY(foo;0.016)")
-    self.assertEquals(a.IsSubset(b), True)
-
-    b = tracing_category_filter.TracingCategoryFilter(
-        "DELAY(foo;0.016),DELAY(bar;0.1)")
-    a = tracing_category_filter.TracingCategoryFilter(
-        "DELAY(bar;0.1)")
-    self.assertEquals(a.IsSubset(b), True)
-
-    b = tracing_category_filter.TracingCategoryFilter(
-        "DELAY(foo;0.016),DELAY(bar;0.1)")
-    a = tracing_category_filter.TracingCategoryFilter(
-        "DELAY(foo;0.032),DELAY(bar;0.1)")
-    self.assertEquals(a.IsSubset(b), False)