From b3f7ff1f7b1032fca59cdf7782e0daf6e392e146 Mon Sep 17 00:00:00 2001 From: Rustam Zaitov Date: Tue, 5 Nov 2013 00:44:54 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D1=8B=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D0=B5=D1=80=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B5=D0=B9=20=D0=B5?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D1=80=D1=81=D0=B5=D1=80=D1=83.=20=D0=A1?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BC=D0=BE=D1=89=D1=8C=D1=8E=20=D1=8D=D1=82?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D1=83=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D1=8F=D1=82=D1=8C=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B8=D0=B8,=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D1=8F=D1=82=D1=8C=20=D0=B2=D0=B5=D0=B4=D1=83=D1=89=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D1=8B=20=D0=B8=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B7=D0=BE=D0=BB=D0=B2=D0=B8=D1=82=D1=8C=20=D0=B7=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F(=D0=BC=D0=B0=D0=BA=D1=80?= =?UTF-8?q?=D0=BE=D1=81=D1=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/Core/LineConveyor/CommentRemover.py | 6 ++++++ scripts/Core/LineConveyor/Stripper.py | 5 +++++ .../{StepRunner => Core/LineConveyor}/__init__.py | 0 scripts/{StepRunner => Core}/StepsRunner.py | 0 scripts/Core/__init__.py | 1 + scripts/Tests/UnitTests/LineConveyor/__init__.py | 1 + .../Tests/UnitTests/LineConveyor/test_stripper.py | 13 +++++++++++++ scripts/taskRunner.py | 2 +- 8 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 scripts/Core/LineConveyor/CommentRemover.py create mode 100644 scripts/Core/LineConveyor/Stripper.py rename scripts/{StepRunner => Core/LineConveyor}/__init__.py (100%) rename scripts/{StepRunner => Core}/StepsRunner.py (100%) create mode 100644 scripts/Core/__init__.py create mode 100644 scripts/Tests/UnitTests/LineConveyor/__init__.py create mode 100644 scripts/Tests/UnitTests/LineConveyor/test_stripper.py diff --git a/scripts/Core/LineConveyor/CommentRemover.py b/scripts/Core/LineConveyor/CommentRemover.py new file mode 100644 index 0000000..6624671 --- /dev/null +++ b/scripts/Core/LineConveyor/CommentRemover.py @@ -0,0 +1,6 @@ +class CommentRemover: + def processLine(self, line): + assert line is not None + + + diff --git a/scripts/Core/LineConveyor/Stripper.py b/scripts/Core/LineConveyor/Stripper.py new file mode 100644 index 0000000..9b57bee --- /dev/null +++ b/scripts/Core/LineConveyor/Stripper.py @@ -0,0 +1,5 @@ +class Stripper: + def processLine(self, line): + assert line is not None + + return line.strip(' \t\n\r') diff --git a/scripts/StepRunner/__init__.py b/scripts/Core/LineConveyor/__init__.py similarity index 100% rename from scripts/StepRunner/__init__.py rename to scripts/Core/LineConveyor/__init__.py diff --git a/scripts/StepRunner/StepsRunner.py b/scripts/Core/StepsRunner.py similarity index 100% rename from scripts/StepRunner/StepsRunner.py rename to scripts/Core/StepsRunner.py diff --git a/scripts/Core/__init__.py b/scripts/Core/__init__.py new file mode 100644 index 0000000..cc31abc --- /dev/null +++ b/scripts/Core/__init__.py @@ -0,0 +1 @@ +__author__ = 'rzaitov' diff --git a/scripts/Tests/UnitTests/LineConveyor/__init__.py b/scripts/Tests/UnitTests/LineConveyor/__init__.py new file mode 100644 index 0000000..cc31abc --- /dev/null +++ b/scripts/Tests/UnitTests/LineConveyor/__init__.py @@ -0,0 +1 @@ +__author__ = 'rzaitov' diff --git a/scripts/Tests/UnitTests/LineConveyor/test_stripper.py b/scripts/Tests/UnitTests/LineConveyor/test_stripper.py new file mode 100644 index 0000000..75057be --- /dev/null +++ b/scripts/Tests/UnitTests/LineConveyor/test_stripper.py @@ -0,0 +1,13 @@ +import unittest +from Core.LineConveyor.Stripper import Stripper + + +class TestStripper(unittest.TestCase): + def setUp(self): + self.stripper = Stripper() + + def test_stripLine(self): + line = ' \tSome text \t\r\n' + newLine = self.stripper.processLine(line) + + self.assertEqual('Some text', newLine) \ No newline at end of file diff --git a/scripts/taskRunner.py b/scripts/taskRunner.py index f9f73a3..7485576 100644 --- a/scripts/taskRunner.py +++ b/scripts/taskRunner.py @@ -9,7 +9,7 @@ baseDir = os.path.join(scriptDir, os.pardir) os.chdir(baseDir) -from StepRunner.StepsRunner import StepsRunner +from Core.StepsRunner import StepsRunner class TaskRunner: