From a27b3ff8b7155c8769067805b1171f72f8e9a19d Mon Sep 17 00:00:00 2001
From: rzaitov <r-zaitov@yandex.ru>
Date: Thu, 14 Nov 2013 12:40:49 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=B5=D0=B4=D1=83=D0=BF=D1=80=D0=B5=D0=B6?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20code=20inspect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/TouchinBuild/Tests/Common/SettingsProviderStub.py  | 5 ++++-
 .../TouchinBuild/Tests/ManualTests/macros_include_test.py  | 7 ++++++-
 scripts/TouchinBuild/Tests/ManualTests/resolve_settings.py | 4 +++-
 scripts/TouchinBuild/Tests/ManualTests/run_sh_command.py   | 2 +-
 .../UnitTests/InsideParsers/test_insideSetArrayParser.py   | 1 -
 .../TouchinBuild/parsers/InsideParser/InsideParserBase.py  | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/scripts/TouchinBuild/Tests/Common/SettingsProviderStub.py b/scripts/TouchinBuild/Tests/Common/SettingsProviderStub.py
index 3b0cc32..f7346f2 100644
--- a/scripts/TouchinBuild/Tests/Common/SettingsProviderStub.py
+++ b/scripts/TouchinBuild/Tests/Common/SettingsProviderStub.py
@@ -1,3 +1,4 @@
+from Core.LineConveyor.NullPreprocessor import NullPreprocessor
 from Core.SettingsProviderBase import SettingsProviderBase
 from parsers.SettingsParser.SettingsParser import SettingsParser
 
@@ -10,7 +11,9 @@ class SettingsProviderStub(SettingsProviderBase):
 		self.settingsText = settingsText
 
 	def fetchSettings(self):
-		parser = SettingsParser()
+		preprocessor = NullPreprocessor()
+
+		parser = SettingsParser(preprocessor, None)
 		parser.parse(self.settingsText)
 
 		return parser.settings
\ No newline at end of file
diff --git a/scripts/TouchinBuild/Tests/ManualTests/macros_include_test.py b/scripts/TouchinBuild/Tests/ManualTests/macros_include_test.py
index ca8a6b3..a3c03d9 100644
--- a/scripts/TouchinBuild/Tests/ManualTests/macros_include_test.py
+++ b/scripts/TouchinBuild/Tests/ManualTests/macros_include_test.py
@@ -1,6 +1,8 @@
 from Core.ContentProviderBase import ContentProviderBase
+from Core.LineConveyor.NullPreprocessor import NullPreprocessor
 from Tests.Common.SettingsProviderStub import SettingsProviderStub
 from taskRunner import TaskRunner
+from utils.BuildConfigProvider.BuildConfigProvider import BuildConfigProvider
 
 settingsText = """
 build_tool = '/Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool'
@@ -42,6 +44,9 @@ class ContentProviderMock(ContentProviderBase):
 settingsProvider = SettingsProviderStub(settingsText)
 contentProvider = ContentProviderMock()
 
-taskRunner = TaskRunner(settingsProvider, contentProvider)
+buildConfigProvider = BuildConfigProvider()
+preprocessor = NullPreprocessor()
+
+taskRunner = TaskRunner(settingsProvider, contentProvider, buildConfigProvider, preprocessor)
 
 taskRunner.run()
diff --git a/scripts/TouchinBuild/Tests/ManualTests/resolve_settings.py b/scripts/TouchinBuild/Tests/ManualTests/resolve_settings.py
index 9bf097a..b60aa96 100644
--- a/scripts/TouchinBuild/Tests/ManualTests/resolve_settings.py
+++ b/scripts/TouchinBuild/Tests/ManualTests/resolve_settings.py
@@ -1,4 +1,5 @@
 from Core.ContentProviderBase import ContentProviderBase
+from Core.LineConveyor.NullPreprocessor import NullPreprocessor
 from Tests.Common.SettingsProviderStub import SettingsProviderStub
 from taskRunner import TaskRunner
 from utils.BuildConfigProvider.BuildConfigProvider import BuildConfigProvider
@@ -37,8 +38,9 @@ buildConfigProvider = BuildConfigProvider()
 resolvedBuildConfigProvider = ResolvedBuildConfigProvider(buildConfigProvider)
 
 contentProvider = ContentProviderMock()
+preprocessor = NullPreprocessor()
 
-taskRunner = TaskRunner(settingsProvider, contentProvider, resolvedBuildConfigProvider)
+taskRunner = TaskRunner(settingsProvider, contentProvider, resolvedBuildConfigProvider, preprocessor)
 
 taskRunner.run()
 
diff --git a/scripts/TouchinBuild/Tests/ManualTests/run_sh_command.py b/scripts/TouchinBuild/Tests/ManualTests/run_sh_command.py
index d32bc5a..de85742 100644
--- a/scripts/TouchinBuild/Tests/ManualTests/run_sh_command.py
+++ b/scripts/TouchinBuild/Tests/ManualTests/run_sh_command.py
@@ -1,4 +1,4 @@
-from commands.ShCommand import ShTextCommand
+from commands.ShTextCommand import ShTextCommand
 
 calendarCommand = ShTextCommand('cal 12 2013')
 calendarCommand.execute()
diff --git a/scripts/TouchinBuild/Tests/UnitTests/InsideParsers/test_insideSetArrayParser.py b/scripts/TouchinBuild/Tests/UnitTests/InsideParsers/test_insideSetArrayParser.py
index 224d8e2..1f19716 100644
--- a/scripts/TouchinBuild/Tests/UnitTests/InsideParsers/test_insideSetArrayParser.py
+++ b/scripts/TouchinBuild/Tests/UnitTests/InsideParsers/test_insideSetArrayParser.py
@@ -1,4 +1,3 @@
-import unittest
 from Tests.UnitTests.LineParserTestCaseBase import LineParserTestCaseBase
 from parsers.InsideParser.InsideSetArrayParser import InsideSetArrayParser
 
diff --git a/scripts/TouchinBuild/parsers/InsideParser/InsideParserBase.py b/scripts/TouchinBuild/parsers/InsideParser/InsideParserBase.py
index c824749..9515110 100644
--- a/scripts/TouchinBuild/parsers/InsideParser/InsideParserBase.py
+++ b/scripts/TouchinBuild/parsers/InsideParser/InsideParserBase.py
@@ -14,7 +14,7 @@ class InsideParserBase(object, LineParser):
 
 	@abc.abstractmethod
 	def getMatchInfo(self, line):
-		"Not implemented"
+		# "Not implemented"
 		return None, None
 
 	def fetchMatchFor(self, text):