From bd26508185fc6b7c8b525e4caaacd0f8c3537cac Mon Sep 17 00:00:00 2001 From: rzaitov Date: Tue, 12 Nov 2013 20:04:38 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D1=80=D0=B5=D1=84=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8E=20=D0=B1=D1=8D=D0=BA=D0=B0=D0=BF=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tests/UnitTests/LineParserTestCaseBase.py | 18 ++++++++++++ .../ParserBackup/test_create_backup.py | 18 +++++------- .../ParserBackup/test_deleteBackup.py | 28 ++++++------------- .../ParserBackup/test_restoreBackup.py | 28 ++++++------------- 4 files changed, 43 insertions(+), 49 deletions(-) create mode 100644 scripts/TouchinBuild/Tests/UnitTests/LineParserTestCaseBase.py diff --git a/scripts/TouchinBuild/Tests/UnitTests/LineParserTestCaseBase.py b/scripts/TouchinBuild/Tests/UnitTests/LineParserTestCaseBase.py new file mode 100644 index 0000000..4dc497e --- /dev/null +++ b/scripts/TouchinBuild/Tests/UnitTests/LineParserTestCaseBase.py @@ -0,0 +1,18 @@ +from unittest.case import TestCase + + +class LineParserTestCaseBase(TestCase): + def __init__(self, methodName): + TestCase.__init__(self, methodName) + + self.textParser = None + + def isValidText(self, text): + isValid = self.textParser.isValidLine(text) + + self.assertEqual(True, isValid) + + def isNotValidText(self, text): + isValid = self.textParser.isValidLine(text) + + self.assertEqual(False, isValid) diff --git a/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_create_backup.py b/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_create_backup.py index c415aff..e3fc7e2 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_create_backup.py +++ b/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_create_backup.py @@ -1,19 +1,15 @@ -import unittest +from Tests.UnitTests.LineParserTestCaseBase import LineParserTestCaseBase from parsers.ParserBackup.CreateBackupParser import CreateBackupParser -class TestCreateBackup(unittest.TestCase): +class TestCreateBackup(LineParserTestCaseBase): def setUp(self): - self.parser = CreateBackupParser() + self.textParser = CreateBackupParser() def test_isValid(self): - line = "create backup" - isValid = self.parser.isValidLine(line) - - self.assertEqual(True, isValid) + self.isValidText('create backup') + self.isValidText('create backup') def test_isNotValid(self): - line = "create backup bla bla" - isValid = self.parser.isValidLine(line) - - self.assertEqual(False, isValid) \ No newline at end of file + self.isNotValidText('create backup ') + self.isNotValidText('create backup bla bla') \ No newline at end of file diff --git a/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_deleteBackup.py b/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_deleteBackup.py index c8dfbd5..464427e 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_deleteBackup.py +++ b/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_deleteBackup.py @@ -1,25 +1,15 @@ -import unittest +from Tests.UnitTests.LineParserTestCaseBase import LineParserTestCaseBase from parsers.ParserBackup.DeleteBackupParser import DeleteBackupParser -class TestDeleteBackup(unittest.TestCase): +class TestDeleteBackup(LineParserTestCaseBase): def setUp(self): - self.parser = DeleteBackupParser() + self.textParser = DeleteBackupParser() - def test_parseCurrentDir(self): - line = "delete backup '.'" - folderPath = self.parser.parseLine(line) + def test_isValid(self): + self.isValidText('delete backup') + self.isValidText('delete backup') - self.assertEqual('.', folderPath) - - def test_parseRelativePath(self): - line = "delete backup '../Some/Path'" - folderPath = self.parser.parseLine(line) - - self.assertEqual('../Some/Path', folderPath) - - def test_parseAbsPath(self): - line = "delete backup '/Some/Abs/Path'" - folderPath = self.parser.parseLine(line) - - self.assertEqual('/Some/Abs/Path', folderPath) \ No newline at end of file + def test_isNotValid(self): + self.isNotValidText('delete backup ') + self.isNotValidText('delete backup bla bla') diff --git a/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_restoreBackup.py b/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_restoreBackup.py index 6e9437e..0acce9b 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_restoreBackup.py +++ b/scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_restoreBackup.py @@ -1,25 +1,15 @@ -import unittest +from Tests.UnitTests.LineParserTestCaseBase import LineParserTestCaseBase from parsers.ParserBackup.RestoreBackupParser import RestoreBackupParser -class TestRestoreBackup(unittest.TestCase): +class TestRestoreBackup(LineParserTestCaseBase): def setUp(self): - self.parser = RestoreBackupParser() + self.textParser = RestoreBackupParser() - def test_parseCurrentDir(self): - line = "restore from backup '.'" - folderPath = self.parser.parseLine(line) + def test_isValid(self): + self.isValidText('restore from backup') + self.isValidText('restore from backup') - self.assertEqual('.', folderPath) - - def test_parseRelativePath(self): - line = "restore from backup '../Some/Path'" - folderPath = self.parser.parseLine(line) - - self.assertEqual('../Some/Path', folderPath) - - def test_parseAbsPath(self): - line = "restore from backup '/Some/Abs/Path'" - folderPath = self.parser.parseLine(line) - - self.assertEqual('/Some/Abs/Path', folderPath) \ No newline at end of file + def test_isNotValid(self): + self.isNotValidText('restore from backup ') + self.isNotValidText('restore from backup bla bla') \ No newline at end of file