| Index: components/variations/service/generate_ui_string_overrider_unittest.py
|
| diff --git a/chrome/browser/metrics/variations/generate_resources_map_unittest.py b/components/variations/service/generate_ui_string_overrider_unittest.py
|
| similarity index 56%
|
| rename from chrome/browser/metrics/variations/generate_resources_map_unittest.py
|
| rename to components/variations/service/generate_ui_string_overrider_unittest.py
|
| index a7b1a2ba2916f16af3ff7840ea347ebe3c41debe..55d55f33ca0b13a6d8073160e15d2cc0221e1e36 100755
|
| --- a/chrome/browser/metrics/variations/generate_resources_map_unittest.py
|
| +++ b/components/variations/service/generate_ui_string_overrider_unittest.py
|
| @@ -3,14 +3,16 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -"""Unittests for generate_resources_map.py"""
|
| +"""Unittests for generate_ui_string_overrider.py"""
|
|
|
| import unittest
|
|
|
| -import generate_resources_map
|
| +import generate_ui_string_overrider
|
|
|
|
|
| class GenerateResourcesMapUnittest(unittest.TestCase):
|
| + NAMESPACE = "chrome_variations"
|
| + OUT_HEADER = "components/variations/service/ui_string_overrider_factory.h"
|
| TEST_INPUT = """
|
| // This file is automatically generated by GRIT. Do not edit.
|
|
|
| @@ -27,9 +29,10 @@ class GenerateResourcesMapUnittest(unittest.TestCase):
|
| (2654138887, "IDS_BOOKMARK_BAR_IMPORT_LINK", "12501"),
|
| (2894469061, "IDS_BOOKMARK_GROUP_FROM_IE", "12502"),
|
| (3847176170, "IDS_BOOKMARK_GROUP_FROM_FIREFOX", "12503")]
|
| - expected = [generate_resources_map.Resource(*t) for t in expected_tuples]
|
| + expected = [
|
| + generate_ui_string_overrider.Resource(*t) for t in expected_tuples]
|
|
|
| - actual_tuples = generate_resources_map._GetResourceListFromString(
|
| + actual_tuples = generate_ui_string_overrider._GetResourceListFromString(
|
| self.TEST_INPUT)
|
|
|
| self.assertEqual(expected_tuples, actual_tuples)
|
| @@ -42,31 +45,34 @@ class GenerateResourcesMapUnittest(unittest.TestCase):
|
| (890, "IDS_QUX", "12503"),
|
| (899, "IDS_NO", "12504"),
|
| (899, "IDS_YES", "12505")]
|
| - list_with_collisions = [generate_resources_map.Resource(*t)
|
| + list_with_collisions = [generate_ui_string_overrider.Resource(*t)
|
| for t in collisions_tuples]
|
|
|
| expected_collision_tuples = [(456, "IDS_BAR", "12501"),
|
| (456, "IDS_BAZ", "12502"),
|
| (899, "IDS_NO", "12504"),
|
| (899, "IDS_YES", "12505")]
|
| - expected_collisions = [generate_resources_map.Resource(*t)
|
| + expected_collisions = [generate_ui_string_overrider.Resource(*t)
|
| for t in expected_collision_tuples]
|
|
|
| actual_collisions = sorted(
|
| - generate_resources_map._CheckForHashCollisions(list_with_collisions))
|
| + generate_ui_string_overrider._CheckForHashCollisions(
|
| + list_with_collisions))
|
| actual_collisions
|
|
|
| self.assertEqual(expected_collisions, actual_collisions)
|
|
|
| - def testGenerateFileContent(self):
|
| + def testGenerateSourceFileContent(self):
|
| expected = (
|
| - """// This file was generated by generate_resources_map.py. Do not edit.
|
| + """\
|
| +// This file was generated by generate_ui_string_overrider.py. Do not edit.
|
|
|
| -
|
| -#include "chrome/browser/metrics/variations/generated_resources_map.h"
|
| +#include "components/variations/service/ui_string_overrider_factory.h"
|
|
|
| namespace chrome_variations {
|
|
|
| +namespace {
|
| +
|
| const size_t kNumResources = 4;
|
|
|
| const uint32_t kResourceHashes[] = {
|
| @@ -83,9 +89,42 @@ const int kResourceIndices[] = {
|
| 12503, // IDS_BOOKMARK_GROUP_FROM_FIREFOX
|
| };
|
|
|
| +} // namespace
|
| +
|
| +variations::UIStringOverrider CreateUIStringOverrider() {
|
| + return variations::UIStringOverrider(
|
| + kResourceHashes, kResourceIndices, kNumResources);
|
| +}
|
| +
|
| +} // namespace chrome_variations
|
| +""")
|
| + actual = generate_ui_string_overrider._GenerateSourceFileContent(
|
| + self.TEST_INPUT, self.NAMESPACE, self.OUT_HEADER)
|
| +
|
| + self.assertEqual(expected, actual)
|
| +
|
| +
|
| + def testGenerateHeaderFileContent(self):
|
| + expected = (
|
| + """\
|
| +// This file was generated by generate_ui_string_overrider.py. Do not edit.
|
| +
|
| +#ifndef COMPONENTS_VARIATIONS_SERVICE_UI_STRING_OVERRIDER_FACTORY_H_
|
| +#define COMPONENTS_VARIATIONS_SERVICE_UI_STRING_OVERRIDER_FACTORY_H_
|
| +
|
| +#include "components/variations/service/ui_string_overrider.h"
|
| +
|
| +namespace chrome_variations {
|
| +
|
| +// Returns an initialized UIStringOverrider.
|
| +variations::UIStringOverrider CreateUIStringOverrider();
|
| +
|
| } // namespace chrome_variations
|
| +
|
| +#endif // COMPONENTS_VARIATIONS_SERVICE_UI_STRING_OVERRIDER_FACTORY_H_
|
| """)
|
| - actual = generate_resources_map._GenerateFileContent(self.TEST_INPUT)
|
| + actual = generate_ui_string_overrider._GenerateHeaderFileContent(
|
| + self.NAMESPACE, self.OUT_HEADER)
|
|
|
| self.assertEqual(expected, actual)
|
|
|
|
|