From 890a51af8abc3cb92a502c5b9e4a36980bdf9032 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Wed, 13 Nov 2013 17:31:48 +0400 Subject: [PATCH] =?UTF-8?q?=D0=95=D1=89=D0=B5=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BC=D0=B5=D1=80=D0=B4=D0=B6=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettingsMerger/test_SettingsMerger.py | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/scripts/TouchinBuild/Tests/UnitTests/SettingsMerger/test_SettingsMerger.py b/scripts/TouchinBuild/Tests/UnitTests/SettingsMerger/test_SettingsMerger.py index 326a6dd..6936e13 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/SettingsMerger/test_SettingsMerger.py +++ b/scripts/TouchinBuild/Tests/UnitTests/SettingsMerger/test_SettingsMerger.py @@ -20,11 +20,6 @@ class TestSettingsMerger(unittest.TestCase): } } - settingDescr2 = { - 'segments': ['child1', 'sub_key1'], - 'value': 'new_value3' - } - def test_mergeTopLevelSettings(self): description = { 'segments': ['top_level_key1'], @@ -34,4 +29,19 @@ class TestSettingsMerger(unittest.TestCase): self.merger.merge(self.globalSettings, description) self.assertEqual('new_value1', self.globalSettings['top_level_key1']) - self.assertEqual('value2', self.globalSettings['top_level_key2']) \ No newline at end of file + self.assertEqual('value2', self.globalSettings['top_level_key2']) + + def test_mergeSubElement(self): + description = { + 'segments': ['child1', 'sub_key1'], + 'value': 'new_value3' + } + + self.merger.merge(self.globalSettings, description) + + self.assertEqual('value1', self.globalSettings['top_level_key1']) + self.assertEqual('value2', self.globalSettings['top_level_key2']) + + self.assertEqual('new_value3', self.globalSettings['child1']['sub_key1']) + self.assertEqual('value4', self.globalSettings['child1']['sub_key2']) +