diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/chromium/scripts/generate_gn_unittest.py')
| -rwxr-xr-x | chromium/third_party/ffmpeg/chromium/scripts/generate_gn_unittest.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/chromium/third_party/ffmpeg/chromium/scripts/generate_gn_unittest.py b/chromium/third_party/ffmpeg/chromium/scripts/generate_gn_unittest.py index 209e8593f23..9f3cf17e087 100755 --- a/chromium/third_party/ffmpeg/chromium/scripts/generate_gn_unittest.py +++ b/chromium/third_party/ffmpeg/chromium/scripts/generate_gn_unittest.py @@ -218,9 +218,11 @@ class SourceSetUnittest(unittest.TestCase): stanza = disjoint_sets[0].GenerateGnStanza() self.assertEqual(string.find(stanza, bad_condition), -1) - def assertEqualSets(self, expected, actual): + def assertEqualSourceSets(self, expected, actual): + assert all(isinstance(a, SourceSet) for a in expected) + assert all(isinstance(a, SourceSet) for a in actual) - def SetToString(source_set): + def SourceSetToString(source_set): sources = [str(e) for e in source_set.sources] conditions = [str(e) for e in source_set.conditions] sources_str = ','.join(sources) @@ -233,11 +235,11 @@ class SourceSetUnittest(unittest.TestCase): if len(missing_elements): msg += 'Missing expected elements:\n' for e in missing_elements: - msg += SetToString(e) + '\n' + msg += SourceSetToString(e) + '\n' if len(extra_elements): msg += 'Found extra elements:\n' for e in extra_elements: - msg += SetToString(e) + '\n' + msg += SourceSetToString(e) + '\n' self.assertTrue(expected == actual, msg=msg) @@ -263,7 +265,7 @@ class SourceSetUnittest(unittest.TestCase): 'win')]))) source_sets = gg.CreatePairwiseDisjointSets([a, b]) - self.assertEqualSets(expected, set(source_sets)) + self.assertEqualSourceSets(expected, set(source_sets)) def testCreatePairwiseDisjointSets_Triplet(self): a = SourceSet( @@ -301,7 +303,7 @@ class SourceSetUnittest(unittest.TestCase): set(['arm']), set([SourceListCondition('arm', 'Chromium', 'win')]))) source_sets = gg.CreatePairwiseDisjointSets([a, b, c]) - self.assertEqualSets(expected, set(source_sets)) + self.assertEqualSourceSets(expected, set(source_sets)) def testCreatePairwiseDisjointSets_Multiple(self): a = SourceSet( @@ -362,7 +364,7 @@ class SourceSetUnittest(unittest.TestCase): set([SourceListCondition('arm-neon', 'ChromeOS', 'linux')]))) source_sets = gg.CreatePairwiseDisjointSets([a, b, c, d, e, f]) - self.assertEqualSets(expected, set(source_sets)) + self.assertEqualSourceSets(expected, set(source_sets)) def testReduceConditions(self): # Set conditions span all of the supported architectures for linux. @@ -381,7 +383,7 @@ class SourceSetUnittest(unittest.TestCase): # Conditions should reduce to a single condition with wild-card for arch. expected = set([SourceListCondition('*', 'Chromium', 'linux')]) - self.assertEqualSets(expected, a.conditions) + self.assertEqual(expected, a.conditions) # Set conditions span all of the supported architectures for windows. b = SourceSet( @@ -395,7 +397,7 @@ class SourceSetUnittest(unittest.TestCase): # Conditions should reduce to a single condition with wild-card for expected = set([SourceListCondition('*', 'Chromium', 'win')]) - self.assertEqualSets(expected, b.conditions) + self.assertEqual(expected, b.conditions) # Set conditions span all supported architectures and brandings for windows. b = SourceSet( @@ -410,7 +412,7 @@ class SourceSetUnittest(unittest.TestCase): ])) gg.ReduceConditionalLogic(b) expected = set([SourceListCondition('*', '*', 'win')]) - self.assertEqualSets(expected, b.conditions) + self.assertEqual(expected, b.conditions) # Set conditions span all supported platforms. c = SourceSet( @@ -423,7 +425,7 @@ class SourceSetUnittest(unittest.TestCase): ])) gg.ReduceConditionalLogic(c) expected = set([SourceListCondition('x64', 'Chromium', '*')]) - self.assertEqualSets(expected, c.conditions) + self.assertEqual(expected, c.conditions) # Spans all architectures for Chromium, but also all targets for ia32 & win. d = SourceSet( @@ -439,7 +441,7 @@ class SourceSetUnittest(unittest.TestCase): SourceListCondition('*', 'Chromium', 'win'), SourceListCondition('ia32', '*', 'win'), ]) - self.assertEqualSets(expected, d.conditions) + self.assertEqual(expected, d.conditions) def testReduceConditions_fullSpan(self): # Build SourceSet with conditions spanning every combination of attributes. @@ -451,7 +453,7 @@ class SourceSetUnittest(unittest.TestCase): gg.ReduceConditionalLogic(ss) expected = set([SourceListCondition('*', '*', '*')]) - self.assertEqualSets(expected, ss.conditions) + self.assertEqual(expected, ss.conditions) def testGenerateStanzaWildCard(self): a = SourceSet( |