From e9ce303a6cf01835ac22bae51121ca72fe1e0454 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Tue, 12 Nov 2013 20:09:33 +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 --- .../Tests/UnitTests/IncludeText/test_includeText.py | 2 +- .../Tests/UnitTests/LineConveyor/test_commentRemover.py | 4 ++-- .../Tests/UnitTests/LineConveyor/test_macroResolver.py | 2 +- .../Tests/UnitTests/LineConveyor/test_stripper.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/TouchinBuild/Tests/UnitTests/IncludeText/test_includeText.py b/scripts/TouchinBuild/Tests/UnitTests/IncludeText/test_includeText.py index d0c8550..79b5505 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/IncludeText/test_includeText.py +++ b/scripts/TouchinBuild/Tests/UnitTests/IncludeText/test_includeText.py @@ -27,7 +27,7 @@ another bla yet another bla""" - processedText = self.includeText.processText(text) + processedText = self.includeText.processText(text, self.includeText) expected = """ bla bla diff --git a/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_commentRemover.py b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_commentRemover.py index 97c27aa..028d416 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_commentRemover.py +++ b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_commentRemover.py @@ -8,12 +8,12 @@ class TestCommentRemover(unittest.TestCase): def test_startsWithComment(self): line = '# this line is comment' - newLine = self.commentRemover.processText(line) + newLine = self.commentRemover.processText(line, self.commentRemover) self.assertEqual('', newLine) def test_containsComment(self): line = 'this line contains # a comment' - newLine = self.commentRemover.processText(line) + newLine = self.commentRemover.processText(line, self.commentRemover) self.assertEqual('this line contains ', newLine) \ No newline at end of file diff --git a/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_macroResolver.py b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_macroResolver.py index 803a358..5fea29b 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_macroResolver.py +++ b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_macroResolver.py @@ -21,6 +21,6 @@ class TestMacroResolver(unittest.TestCase): def test_resolveLine(self): line = '{@key1} bla {@some_name} version: {@version}' - newLine = self.macroResolver.processText(line) + newLine = self.macroResolver.processText(line, self.macroResolver) self.assertEqual('hello world bla another name version: 1.2.3', newLine) \ No newline at end of file diff --git a/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_stripper.py b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_stripper.py index ecd6b81..256c7b1 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_stripper.py +++ b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_stripper.py @@ -8,6 +8,6 @@ class TestStripper(unittest.TestCase): def test_stripLine(self): line = ' \tSome text \t\r\n' - newLine = self.stripper.processText(line) + newLine = self.stripper.processText(line, self.stripper) self.assertEqual('Some text', newLine) \ No newline at end of file