From a1b111f8a216c3fd2a2ac0568d98d6e0945a52c1 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Tue, 5 Nov 2013 17:47:11 +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=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py | 5 ++++- scripts/Tests/UnitTests/Macro/test_macro.py | 6 +++--- scripts/Tests/UnitTests/ProjectParser/test_projectParser.py | 2 +- scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py b/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py index 019b5a1..3ac7f63 100644 --- a/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py +++ b/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py @@ -13,7 +13,10 @@ class TestMacroResolver(unittest.TestCase): } macroProcessor = MacroProcessor() - valueProvider = ValueProvider(config) + + valueProvider = ValueProvider() + valueProvider.setConfig(config) + self.macroResolver = MacroResolver(macroProcessor, valueProvider) def test_resolveLine(self): diff --git a/scripts/Tests/UnitTests/Macro/test_macro.py b/scripts/Tests/UnitTests/Macro/test_macro.py index dc89ac4..dd5c378 100644 --- a/scripts/Tests/UnitTests/Macro/test_macro.py +++ b/scripts/Tests/UnitTests/Macro/test_macro.py @@ -11,9 +11,9 @@ class TestMacro(unittest.TestCase): symbols = self.macroParser.getSymbols(line) self.assertEqual(3, len(symbols)) - self.assertTrue('this' in symbols) - self.assertTrue('my_macro' in symbols) - self.assertTrue('macro_with_numbers123' in symbols) + self.assertTrue('@this' in symbols) + self.assertTrue('@my_macro' in symbols) + self.assertTrue('@macro_with_numbers123' in symbols) def test_getName(self): line = '{@macro_name}' diff --git a/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py b/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py index 33c6307..b1a6afe 100644 --- a/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py +++ b/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py @@ -7,7 +7,7 @@ from parser.InsideParser.InsideSetParser import InsideSetParser class TestCsprojParser(unittest.TestCase): def setUp(self): - value_provider = ValueProvider({}) + value_provider = ValueProvider() self.parser = InsideSetParser(value_provider, 'csproj') diff --git a/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py b/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py index 6d0e2ae..0d13c69 100644 --- a/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py +++ b/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py @@ -8,7 +8,8 @@ class TestCase(unittest.TestCase): 'key1': 'value1', 'key2': 'value2' } - self.__provider = ValueProvider(self.__config) + self.__provider = ValueProvider() + self.__provider.setConfig(self.__config) def test_provideByLink(self): value1 = self.__provider.getValueFor('@key1')