Пофиксил тесты

scripts/TouchinBuild/Tests/UnitTests/SettingsMerger/__init__.py

@@ -0,0 +1 @@
+__author__ = 'rzaitov'

scripts/TouchinBuild/Tests/UnitTests/SettingsMerger/test_SettingsMerger.py

@@ -0,0 +1,37 @@
+import unittest
+from parsers.SettingsParser.SettingsMerger import SettingsMerger
+
+
+class TestSettingsMerger(unittest.TestCase):
+	def setUp(self):
+		self.merger = SettingsMerger()
+		self.globalSettings = {
+			'top_level_key1': 'value1',
+			'top_level_key2': 'value2',
+
+			'child1': {
+					'sub_key1': 'value3',
+					'sub_key2': 'value4',
+				},
+
+			'child2': {
+					'sub_key3': 'value5',
+					'sub_key4': 'value6',
+				}
+		}
+
+		settingDescr2 = {
+			'segments': ['child1', 'sub_key1'],
+			'value': 'new_value3'
+		}
+
+	def test_mergeTopLevelSettings(self):
+		description = {
+			'segments': ['top_level_key1'],
+			'value': 'new_value1'
+		}
+
+		self.merger.merge(self.globalSettings, description)
+
+		self.assertEqual('new_value1', self.globalSettings['top_level_key1'])
+		self.assertEqual('value2', self.globalSettings['top_level_key2'])

scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsParser.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import unittest
 from Core.LineConveyor.NullPreprocessor import NullPreprocessor
 from parsers.SettingsParser.SettingsParser import SettingsParser
@@ -48,7 +49,6 @@ class TestSettingsParser(unittest.TestCase):
 
 			def processLine(self, line):
 				self.processLineCall += 1
-				print '{0} {1}'.format(self.processLineCall, line)
 
 		self.parser = PartialSettingsParser(self.preprocessor)
 		content = """
@@ -62,7 +62,7 @@ valid.line.with.setting = 'some value'
 
 		# всего 6 строк, 2 из которых пустые
 		# NullPreprocessor не уберет комментарии, поэтому будет 4 вызова processLine
-		self.assertEqual(2, self.parser.processLineCall)
+		self.assertEqual(4, self.parser.processLineCall)