From 131c8abe7b95f2aa96e2b284b39d83160d095fd0 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Fri, 1 Nov 2013 18:24:12 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/{ => Tests}/ManualTests/__init__.py | 0 scripts/{ => Tests}/ManualTests/build_test.py | 0 scripts/{ => Tests}/ManualTests/clean_test.py | 0 scripts/{ => Tests}/ManualTests/copy_test.py | 2 +- .../ManualTests/create_backup_test.py | 2 +- .../{ => Tests}/ManualTests/csproj_test.py | 2 +- .../ManualTests/delete_backup_test.py | 2 +- .../{ => Tests}/ManualTests/infoplist_test.py | 0 scripts/{ => Tests}/ManualTests/make_dirs.py | 0 .../{ => Tests}/ManualTests/path_provider.py | 0 .../{ => Tests}/ManualTests/remove_project.py | 0 .../ManualTests/restore_backup_test.py | 2 +- .../{ => Tests}/ManualTests/run_sh_command.py | 0 .../BuildConfigProvider}/__init__.py | 0 .../test_BuildConfigProvider.py | 3 ++- .../UnitTests/CleanBuildParser}/__init__.py | 0 .../CleanBuildParser/test_cleanBuildParser.py | 0 .../UnitTests/CopyParser}/__init__.py | 0 .../CopyParser/test_copyArguments.py | 0 .../UnitTests/CopyParser/test_copyParser.py | 0 .../UnitTests/MakeDirsParser}/__init__.py | 0 .../MakeDirsParser/test_makeDirsParser.py | 0 .../UnitTests/ProjectParser}/__init__.py | 0 .../ProjectParser/test_projectParser.py | 4 ++-- .../UnitTests/SettingsParser}/__init__.py | 0 .../SettingsParser/test_PathParser.py | 0 .../SettingsParser/test_SettingsLineParser.py | 0 .../SettingsParser/test_SettingsParser.py | 0 .../UnitTests/ShParser}/__init__.py | 0 .../UnitTests/ShParser/test_shPareser.py | 0 .../UnitTests/ValueProvider}/__init__.py | 0 .../ValueProvider/test_valueProvider.py | 0 .../ShParser => Tests/UnitTests}/__init__.py | 0 scripts/Tests/UnitTests/readme.txt | 5 ++++ .../ValueProvider => Tests}/__init__.py | 0 .../BackupParser/test_createBackupParser.py | 13 ----------- .../BackupParser/test_deleteBackupParser.py | 23 ------------------- .../BackupParser/test_restoreBackupParser.py | 11 --------- .../UnitTests/ProjectParser/ValueProvider.py | 3 --- scripts/UnitTests/__init__.py | 1 - scripts/UnitTests/readme.txt | 5 ---- scripts/commands/PatchCsprojCommand.py | 4 ++-- scripts/commands/PatchInfoPlistCommand.py | 4 ++-- scripts/commands/RemoveProjectCommand.py | 4 ++-- scripts/commands/TestflightCommand.py | 2 +- scripts/taskRunner.py | 5 ++-- .../{configs => }/BuildConfigProvider.py | 0 .../{csproj/patcher.py => CsprojPatcher.py} | 2 +- .../FromFileSettingsProvider.py | 0 .../patcher.py => InfoPlistPatcher.py} | 2 +- .../utils/{sln/patcher.py => SlnPatcher.py} | 2 +- .../{testflight => }/TestflightPublisher.py | 0 scripts/utils/configs/__init__.py | 1 - scripts/utils/csproj/__init__.py | 1 - scripts/utils/infoplist/__init__.py | 1 - scripts/utils/sln/__init__.py | 1 - scripts/utils/testflight/__init__.py | 1 - 57 files changed, 27 insertions(+), 81 deletions(-) rename scripts/{ => Tests}/ManualTests/__init__.py (100%) rename scripts/{ => Tests}/ManualTests/build_test.py (100%) rename scripts/{ => Tests}/ManualTests/clean_test.py (100%) rename scripts/{ => Tests}/ManualTests/copy_test.py (91%) rename scripts/{ => Tests}/ManualTests/create_backup_test.py (78%) rename scripts/{ => Tests}/ManualTests/csproj_test.py (86%) rename scripts/{ => Tests}/ManualTests/delete_backup_test.py (77%) rename scripts/{ => Tests}/ManualTests/infoplist_test.py (100%) rename scripts/{ => Tests}/ManualTests/make_dirs.py (100%) rename scripts/{ => Tests}/ManualTests/path_provider.py (100%) rename scripts/{ => Tests}/ManualTests/remove_project.py (100%) rename scripts/{ => Tests}/ManualTests/restore_backup_test.py (83%) rename scripts/{ => Tests}/ManualTests/run_sh_command.py (100%) rename scripts/{SettingsProvider => Tests/UnitTests/BuildConfigProvider}/__init__.py (100%) rename scripts/{ => Tests}/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py (91%) rename scripts/{UnitTests/BackupParser => Tests/UnitTests/CleanBuildParser}/__init__.py (100%) rename scripts/{ => Tests}/UnitTests/CleanBuildParser/test_cleanBuildParser.py (100%) rename scripts/{UnitTests/BuildConfigProvider => Tests/UnitTests/CopyParser}/__init__.py (100%) rename scripts/{ => Tests}/UnitTests/CopyParser/test_copyArguments.py (100%) rename scripts/{ => Tests}/UnitTests/CopyParser/test_copyParser.py (100%) rename scripts/{UnitTests/CleanBuildParser => Tests/UnitTests/MakeDirsParser}/__init__.py (100%) rename scripts/{ => Tests}/UnitTests/MakeDirsParser/test_makeDirsParser.py (100%) rename scripts/{UnitTests/CopyParser => Tests/UnitTests/ProjectParser}/__init__.py (100%) rename scripts/{ => Tests}/UnitTests/ProjectParser/test_projectParser.py (85%) rename scripts/{UnitTests/MakeDirsParser => Tests/UnitTests/SettingsParser}/__init__.py (100%) rename scripts/{ => Tests}/UnitTests/SettingsParser/test_PathParser.py (100%) rename scripts/{ => Tests}/UnitTests/SettingsParser/test_SettingsLineParser.py (100%) rename scripts/{ => Tests}/UnitTests/SettingsParser/test_SettingsParser.py (100%) rename scripts/{UnitTests/ProjectParser => Tests/UnitTests/ShParser}/__init__.py (100%) rename scripts/{ => Tests}/UnitTests/ShParser/test_shPareser.py (100%) rename scripts/{UnitTests/SettingsParser => Tests/UnitTests/ValueProvider}/__init__.py (100%) rename scripts/{ => Tests}/UnitTests/ValueProvider/test_valueProvider.py (100%) rename scripts/{UnitTests/ShParser => Tests/UnitTests}/__init__.py (100%) create mode 100644 scripts/Tests/UnitTests/readme.txt rename scripts/{UnitTests/ValueProvider => Tests}/__init__.py (100%) delete mode 100644 scripts/UnitTests/BackupParser/test_createBackupParser.py delete mode 100644 scripts/UnitTests/BackupParser/test_deleteBackupParser.py delete mode 100644 scripts/UnitTests/BackupParser/test_restoreBackupParser.py delete mode 100644 scripts/UnitTests/ProjectParser/ValueProvider.py delete mode 100644 scripts/UnitTests/__init__.py delete mode 100644 scripts/UnitTests/readme.txt rename scripts/utils/{configs => }/BuildConfigProvider.py (100%) rename scripts/utils/{csproj/patcher.py => CsprojPatcher.py} (98%) rename scripts/{SettingsProvider => utils}/FromFileSettingsProvider.py (100%) rename scripts/utils/{infoplist/patcher.py => InfoPlistPatcher.py} (98%) rename scripts/utils/{sln/patcher.py => SlnPatcher.py} (98%) rename scripts/utils/{testflight => }/TestflightPublisher.py (100%) delete mode 100644 scripts/utils/configs/__init__.py delete mode 100644 scripts/utils/csproj/__init__.py delete mode 100644 scripts/utils/infoplist/__init__.py delete mode 100644 scripts/utils/sln/__init__.py delete mode 100644 scripts/utils/testflight/__init__.py diff --git a/scripts/ManualTests/__init__.py b/scripts/Tests/ManualTests/__init__.py similarity index 100% rename from scripts/ManualTests/__init__.py rename to scripts/Tests/ManualTests/__init__.py diff --git a/scripts/ManualTests/build_test.py b/scripts/Tests/ManualTests/build_test.py similarity index 100% rename from scripts/ManualTests/build_test.py rename to scripts/Tests/ManualTests/build_test.py diff --git a/scripts/ManualTests/clean_test.py b/scripts/Tests/ManualTests/clean_test.py similarity index 100% rename from scripts/ManualTests/clean_test.py rename to scripts/Tests/ManualTests/clean_test.py diff --git a/scripts/ManualTests/copy_test.py b/scripts/Tests/ManualTests/copy_test.py similarity index 91% rename from scripts/ManualTests/copy_test.py rename to scripts/Tests/ManualTests/copy_test.py index 91a8085..dd547eb 100644 --- a/scripts/ManualTests/copy_test.py +++ b/scripts/Tests/ManualTests/copy_test.py @@ -1,5 +1,5 @@ from CommandBuilders.CopyCommandBuilder import CopyCommandBuilder -from ManualTests.path_provider import PathProvider +from Tests.ManualTests.path_provider import PathProvider line1 = "copy 'BuildSample/BuildSample.sln' to 'BuildSample/BuildSample.txt'" line2 = "copy 'BuildSample/BuildSample/Profiles/8F606DAE-F9C9-4A19-8EFF-34B990D76C28.mobileprovision' to '~/Library/MobileDevice/Provisioning Profiles/BuildScript.mobileprovision'" diff --git a/scripts/ManualTests/create_backup_test.py b/scripts/Tests/ManualTests/create_backup_test.py similarity index 78% rename from scripts/ManualTests/create_backup_test.py rename to scripts/Tests/ManualTests/create_backup_test.py index 8362787..4761f7c 100644 --- a/scripts/ManualTests/create_backup_test.py +++ b/scripts/Tests/ManualTests/create_backup_test.py @@ -1,5 +1,5 @@ from CommandBuilders.CreateBackupCommandBuilder import CreateBackupCommandBuilder -from ManualTests.path_provider import PathProvider +from Tests.ManualTests.path_provider import PathProvider line = "create backup for 'BuildSample'" diff --git a/scripts/ManualTests/csproj_test.py b/scripts/Tests/ManualTests/csproj_test.py similarity index 86% rename from scripts/ManualTests/csproj_test.py rename to scripts/Tests/ManualTests/csproj_test.py index ec8d68d..30bdfbe 100644 --- a/scripts/ManualTests/csproj_test.py +++ b/scripts/Tests/ManualTests/csproj_test.py @@ -1,5 +1,5 @@ from CommandBuilders.PatchCsprojCommandBuilder import PatchCsprojCommandBuilder -from ManualTests.path_provider import PathProvider +from Tests.ManualTests.path_provider import PathProvider from commands.ValueProvider import ValueProvider config = {'sln_config' : 'Release|iPhone'} diff --git a/scripts/ManualTests/delete_backup_test.py b/scripts/Tests/ManualTests/delete_backup_test.py similarity index 77% rename from scripts/ManualTests/delete_backup_test.py rename to scripts/Tests/ManualTests/delete_backup_test.py index 7ac8044..e922c55 100644 --- a/scripts/ManualTests/delete_backup_test.py +++ b/scripts/Tests/ManualTests/delete_backup_test.py @@ -1,5 +1,5 @@ from CommandBuilders.DeleteBackupCommandBuilder import DeleteBackupCommandBuilder -from ManualTests.path_provider import PathProvider +from Tests.ManualTests.path_provider import PathProvider line = "delete backup" diff --git a/scripts/ManualTests/infoplist_test.py b/scripts/Tests/ManualTests/infoplist_test.py similarity index 100% rename from scripts/ManualTests/infoplist_test.py rename to scripts/Tests/ManualTests/infoplist_test.py diff --git a/scripts/ManualTests/make_dirs.py b/scripts/Tests/ManualTests/make_dirs.py similarity index 100% rename from scripts/ManualTests/make_dirs.py rename to scripts/Tests/ManualTests/make_dirs.py diff --git a/scripts/ManualTests/path_provider.py b/scripts/Tests/ManualTests/path_provider.py similarity index 100% rename from scripts/ManualTests/path_provider.py rename to scripts/Tests/ManualTests/path_provider.py diff --git a/scripts/ManualTests/remove_project.py b/scripts/Tests/ManualTests/remove_project.py similarity index 100% rename from scripts/ManualTests/remove_project.py rename to scripts/Tests/ManualTests/remove_project.py diff --git a/scripts/ManualTests/restore_backup_test.py b/scripts/Tests/ManualTests/restore_backup_test.py similarity index 83% rename from scripts/ManualTests/restore_backup_test.py rename to scripts/Tests/ManualTests/restore_backup_test.py index 8bbd378..7ad5520 100644 --- a/scripts/ManualTests/restore_backup_test.py +++ b/scripts/Tests/ManualTests/restore_backup_test.py @@ -1,5 +1,5 @@ from CommandBuilders.RestoreBackupCommandBuilder import RestoreBackupCommandBuilder -from ManualTests.path_provider import PathProvider +from Tests.ManualTests.path_provider import PathProvider line = "restore from backup" diff --git a/scripts/ManualTests/run_sh_command.py b/scripts/Tests/ManualTests/run_sh_command.py similarity index 100% rename from scripts/ManualTests/run_sh_command.py rename to scripts/Tests/ManualTests/run_sh_command.py diff --git a/scripts/SettingsProvider/__init__.py b/scripts/Tests/UnitTests/BuildConfigProvider/__init__.py similarity index 100% rename from scripts/SettingsProvider/__init__.py rename to scripts/Tests/UnitTests/BuildConfigProvider/__init__.py diff --git a/scripts/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py b/scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py similarity index 91% rename from scripts/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py rename to scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py index 7508361..5c0556e 100644 --- a/scripts/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py +++ b/scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py @@ -1,5 +1,6 @@ import unittest -from utils.configs.BuildConfigProvider import BuildConfigProvider +from utils import BuildConfigProvider +from utils.BuildConfigProvider import BuildConfigProvider class TestBuildConfigProvider(unittest.TestCase): diff --git a/scripts/UnitTests/BackupParser/__init__.py b/scripts/Tests/UnitTests/CleanBuildParser/__init__.py similarity index 100% rename from scripts/UnitTests/BackupParser/__init__.py rename to scripts/Tests/UnitTests/CleanBuildParser/__init__.py diff --git a/scripts/UnitTests/CleanBuildParser/test_cleanBuildParser.py b/scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py similarity index 100% rename from scripts/UnitTests/CleanBuildParser/test_cleanBuildParser.py rename to scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py diff --git a/scripts/UnitTests/BuildConfigProvider/__init__.py b/scripts/Tests/UnitTests/CopyParser/__init__.py similarity index 100% rename from scripts/UnitTests/BuildConfigProvider/__init__.py rename to scripts/Tests/UnitTests/CopyParser/__init__.py diff --git a/scripts/UnitTests/CopyParser/test_copyArguments.py b/scripts/Tests/UnitTests/CopyParser/test_copyArguments.py similarity index 100% rename from scripts/UnitTests/CopyParser/test_copyArguments.py rename to scripts/Tests/UnitTests/CopyParser/test_copyArguments.py diff --git a/scripts/UnitTests/CopyParser/test_copyParser.py b/scripts/Tests/UnitTests/CopyParser/test_copyParser.py similarity index 100% rename from scripts/UnitTests/CopyParser/test_copyParser.py rename to scripts/Tests/UnitTests/CopyParser/test_copyParser.py diff --git a/scripts/UnitTests/CleanBuildParser/__init__.py b/scripts/Tests/UnitTests/MakeDirsParser/__init__.py similarity index 100% rename from scripts/UnitTests/CleanBuildParser/__init__.py rename to scripts/Tests/UnitTests/MakeDirsParser/__init__.py diff --git a/scripts/UnitTests/MakeDirsParser/test_makeDirsParser.py b/scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py similarity index 100% rename from scripts/UnitTests/MakeDirsParser/test_makeDirsParser.py rename to scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py diff --git a/scripts/UnitTests/CopyParser/__init__.py b/scripts/Tests/UnitTests/ProjectParser/__init__.py similarity index 100% rename from scripts/UnitTests/CopyParser/__init__.py rename to scripts/Tests/UnitTests/ProjectParser/__init__.py diff --git a/scripts/UnitTests/ProjectParser/test_projectParser.py b/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py similarity index 85% rename from scripts/UnitTests/ProjectParser/test_projectParser.py rename to scripts/Tests/UnitTests/ProjectParser/test_projectParser.py index d3dc1f2..33c6307 100644 --- a/scripts/UnitTests/ProjectParser/test_projectParser.py +++ b/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- import unittest -from UnitTests.ProjectParser.ValueProvider import ValueProvider +from commands.ValueProvider import ValueProvider 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/UnitTests/MakeDirsParser/__init__.py b/scripts/Tests/UnitTests/SettingsParser/__init__.py similarity index 100% rename from scripts/UnitTests/MakeDirsParser/__init__.py rename to scripts/Tests/UnitTests/SettingsParser/__init__.py diff --git a/scripts/UnitTests/SettingsParser/test_PathParser.py b/scripts/Tests/UnitTests/SettingsParser/test_PathParser.py similarity index 100% rename from scripts/UnitTests/SettingsParser/test_PathParser.py rename to scripts/Tests/UnitTests/SettingsParser/test_PathParser.py diff --git a/scripts/UnitTests/SettingsParser/test_SettingsLineParser.py b/scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py similarity index 100% rename from scripts/UnitTests/SettingsParser/test_SettingsLineParser.py rename to scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py diff --git a/scripts/UnitTests/SettingsParser/test_SettingsParser.py b/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py similarity index 100% rename from scripts/UnitTests/SettingsParser/test_SettingsParser.py rename to scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py diff --git a/scripts/UnitTests/ProjectParser/__init__.py b/scripts/Tests/UnitTests/ShParser/__init__.py similarity index 100% rename from scripts/UnitTests/ProjectParser/__init__.py rename to scripts/Tests/UnitTests/ShParser/__init__.py diff --git a/scripts/UnitTests/ShParser/test_shPareser.py b/scripts/Tests/UnitTests/ShParser/test_shPareser.py similarity index 100% rename from scripts/UnitTests/ShParser/test_shPareser.py rename to scripts/Tests/UnitTests/ShParser/test_shPareser.py diff --git a/scripts/UnitTests/SettingsParser/__init__.py b/scripts/Tests/UnitTests/ValueProvider/__init__.py similarity index 100% rename from scripts/UnitTests/SettingsParser/__init__.py rename to scripts/Tests/UnitTests/ValueProvider/__init__.py diff --git a/scripts/UnitTests/ValueProvider/test_valueProvider.py b/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py similarity index 100% rename from scripts/UnitTests/ValueProvider/test_valueProvider.py rename to scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py diff --git a/scripts/UnitTests/ShParser/__init__.py b/scripts/Tests/UnitTests/__init__.py similarity index 100% rename from scripts/UnitTests/ShParser/__init__.py rename to scripts/Tests/UnitTests/__init__.py diff --git a/scripts/Tests/UnitTests/readme.txt b/scripts/Tests/UnitTests/readme.txt new file mode 100644 index 0000000..8ee3a1e --- /dev/null +++ b/scripts/Tests/UnitTests/readme.txt @@ -0,0 +1,5 @@ +Запуск всех тестов +python -m unittest discover -s Tests/UnitTests/ + +Запуск части тестов +python -m unittest discover -s Tests/UnitTests/CopyParser/ \ No newline at end of file diff --git a/scripts/UnitTests/ValueProvider/__init__.py b/scripts/Tests/__init__.py similarity index 100% rename from scripts/UnitTests/ValueProvider/__init__.py rename to scripts/Tests/__init__.py diff --git a/scripts/UnitTests/BackupParser/test_createBackupParser.py b/scripts/UnitTests/BackupParser/test_createBackupParser.py deleted file mode 100644 index 8b5b199..0000000 --- a/scripts/UnitTests/BackupParser/test_createBackupParser.py +++ /dev/null @@ -1,13 +0,0 @@ -import unittest -from parser.BackupParser.CreateBackupParser import CreateBackupParser - - -class TestCreateBackupParser(unittest.TestCase): - def setUp(self): - self.__parser = CreateBackupParser() - - def test_validInput(self): - line = "create backup for 'SomeFolder'" - createBackupArgs = self.__parser.parseLine(line) - - self.assertEqual('SomeFolder', createBackupArgs.folderName) \ No newline at end of file diff --git a/scripts/UnitTests/BackupParser/test_deleteBackupParser.py b/scripts/UnitTests/BackupParser/test_deleteBackupParser.py deleted file mode 100644 index fbe91a7..0000000 --- a/scripts/UnitTests/BackupParser/test_deleteBackupParser.py +++ /dev/null @@ -1,23 +0,0 @@ -import unittest -from parser.BackupParser.DeleteBackupParser import DeleteBackupParser - - -class TestDeleteBackupParser(unittest.TestCase): - def setUp(self): - self.__parser = DeleteBackupParser() - - def test_isValid(self): - line = 'delete backup' - isValid = self.__parser.isValidLine(line) - - self.assertEqual(True, isValid) - - def test_isNotValid(self): - line = 'bla backup' - isValid = self.__parser.isValidLine(line) - - self.assertEqual(False, isValid) - - def test_validInput(self): - line = 'delete backup' - self.__parser.parseLine(line) \ No newline at end of file diff --git a/scripts/UnitTests/BackupParser/test_restoreBackupParser.py b/scripts/UnitTests/BackupParser/test_restoreBackupParser.py deleted file mode 100644 index 2168d78..0000000 --- a/scripts/UnitTests/BackupParser/test_restoreBackupParser.py +++ /dev/null @@ -1,11 +0,0 @@ -import unittest -from parser.BackupParser.RestoreBackupParser import RestoreBackupParser - - -class TestRestoreBackupParser(unittest.TestCase): - def setUp(self): - self.__parser = RestoreBackupParser() - - def test_ValidInput(self): - line = 'restore from backup' - self.__parser.parseLine(line) \ No newline at end of file diff --git a/scripts/UnitTests/ProjectParser/ValueProvider.py b/scripts/UnitTests/ProjectParser/ValueProvider.py deleted file mode 100644 index 646266d..0000000 --- a/scripts/UnitTests/ProjectParser/ValueProvider.py +++ /dev/null @@ -1,3 +0,0 @@ -class ValueProvider: - def getValueFor(self, link): - return link diff --git a/scripts/UnitTests/__init__.py b/scripts/UnitTests/__init__.py deleted file mode 100644 index cc31abc..0000000 --- a/scripts/UnitTests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'rzaitov' diff --git a/scripts/UnitTests/readme.txt b/scripts/UnitTests/readme.txt deleted file mode 100644 index 44b8579..0000000 --- a/scripts/UnitTests/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -Запуск всех тестов -python -m unittest discover -s UnitTests/ - -Запуск части тестов -python -m unittest discover -s UnitTests/CopyParser/ \ No newline at end of file diff --git a/scripts/commands/PatchCsprojCommand.py b/scripts/commands/PatchCsprojCommand.py index b801d11..68007eb 100644 --- a/scripts/commands/PatchCsprojCommand.py +++ b/scripts/commands/PatchCsprojCommand.py @@ -1,4 +1,4 @@ -import utils.csproj.Patcher as csproj +import utils.CsprojPatcher as csproj class PatchCsprojCommand(): def __init__(self, csprojAbsPath, key, value, slnConfig): @@ -13,7 +13,7 @@ class PatchCsprojCommand(): self.__slnConfig = slnConfig def execute(self): - patcher = csproj.Patcher(self.__csprojAbsPath) + patcher = csproj.CsprojPatcher(self.__csprojAbsPath) dictionary = { self.__key : self.__value } patcher.AddOrReplace(dictionary, self.__slnConfig) \ No newline at end of file diff --git a/scripts/commands/PatchInfoPlistCommand.py b/scripts/commands/PatchInfoPlistCommand.py index d85cb00..f75a4e2 100644 --- a/scripts/commands/PatchInfoPlistCommand.py +++ b/scripts/commands/PatchInfoPlistCommand.py @@ -1,4 +1,4 @@ -from utils.infoplist.Patcher import Patcher +from utils import InfoPlistPatcher class PatchInfoPlistCommand(): @@ -12,7 +12,7 @@ class PatchInfoPlistCommand(): self.__value = value def execute(self): - patcher = Patcher(self.__pathToPlist) + patcher = InfoPlistPatcher(self.__pathToPlist) dictionary = { self.__key : self.__value } patcher.AddOrReplace(dictionary) diff --git a/scripts/commands/RemoveProjectCommand.py b/scripts/commands/RemoveProjectCommand.py index 3bdb943..7177673 100644 --- a/scripts/commands/RemoveProjectCommand.py +++ b/scripts/commands/RemoveProjectCommand.py @@ -1,4 +1,4 @@ -from utils.sln.Patcher import Patcher +from utils import SlnPatcher class RemoveProjectCommand: @@ -10,5 +10,5 @@ class RemoveProjectCommand: self.__projectName = projectName def execute(self): - patcher = Patcher(self.__slnPath) + patcher = SlnPatcher(self.__slnPath) patcher.removeProjects([self.__projectName]) diff --git a/scripts/commands/TestflightCommand.py b/scripts/commands/TestflightCommand.py index 6f2e4e2..6f1e86f 100644 --- a/scripts/commands/TestflightCommand.py +++ b/scripts/commands/TestflightCommand.py @@ -1,4 +1,4 @@ -from utils.testflight.TestflightPublisher import TestFlightPublisher +from utils.TestflightPublisher import TestFlightPublisher class PublishToTestFlightCommand: diff --git a/scripts/taskRunner.py b/scripts/taskRunner.py index 1da1d76..7c148f5 100644 --- a/scripts/taskRunner.py +++ b/scripts/taskRunner.py @@ -1,4 +1,6 @@ import os +from utils import BuildConfigProvider, FromFileSettingsProvider + scriptFilePath = os.path.abspath(__file__) scriptDir = os.path.dirname(scriptFilePath) @@ -6,9 +8,8 @@ baseDir = os.path.join(scriptDir, os.pardir) os.chdir(baseDir) -from SettingsProvider.FromFileSettingsProvider import FromFileSettingsProvider from StepRunner.StepsRunner import StepsRunner -from utils.configs.BuildConfigProvider import BuildConfigProvider + class TaskRunner: def run(self): diff --git a/scripts/utils/configs/BuildConfigProvider.py b/scripts/utils/BuildConfigProvider.py similarity index 100% rename from scripts/utils/configs/BuildConfigProvider.py rename to scripts/utils/BuildConfigProvider.py diff --git a/scripts/utils/csproj/patcher.py b/scripts/utils/CsprojPatcher.py similarity index 98% rename from scripts/utils/csproj/patcher.py rename to scripts/utils/CsprojPatcher.py index d41d1e5..4f25b9d 100644 --- a/scripts/utils/csproj/patcher.py +++ b/scripts/utils/CsprojPatcher.py @@ -1,7 +1,7 @@ import xml.etree.ElementTree as eT eT.register_namespace('', "http://schemas.microsoft.com/developer/msbuild/2003") -class Patcher: +class CsprojPatcher: def __init__(self, csproj_abs_path): self._csproj_abs_path = csproj_abs_path self._tree = None diff --git a/scripts/SettingsProvider/FromFileSettingsProvider.py b/scripts/utils/FromFileSettingsProvider.py similarity index 100% rename from scripts/SettingsProvider/FromFileSettingsProvider.py rename to scripts/utils/FromFileSettingsProvider.py diff --git a/scripts/utils/infoplist/patcher.py b/scripts/utils/InfoPlistPatcher.py similarity index 98% rename from scripts/utils/infoplist/patcher.py rename to scripts/utils/InfoPlistPatcher.py index 3d349d0..3dc15f6 100644 --- a/scripts/utils/infoplist/patcher.py +++ b/scripts/utils/InfoPlistPatcher.py @@ -1,7 +1,7 @@ import xml.etree.ElementTree as eT -class Patcher(): +class InfoPlistPatcher(): def __init__(self, infoPlistPath): self.__infoPlistPath = infoPlistPath diff --git a/scripts/utils/sln/patcher.py b/scripts/utils/SlnPatcher.py similarity index 98% rename from scripts/utils/sln/patcher.py rename to scripts/utils/SlnPatcher.py index 1d01eaa..9442eb6 100644 --- a/scripts/utils/sln/patcher.py +++ b/scripts/utils/SlnPatcher.py @@ -1,7 +1,7 @@ import re -class Patcher: +class SlnPatcher: def __init__(self, pathToSlnFile): self._sln_path = pathToSlnFile self._sln_file = None diff --git a/scripts/utils/testflight/TestflightPublisher.py b/scripts/utils/TestflightPublisher.py similarity index 100% rename from scripts/utils/testflight/TestflightPublisher.py rename to scripts/utils/TestflightPublisher.py diff --git a/scripts/utils/configs/__init__.py b/scripts/utils/configs/__init__.py deleted file mode 100644 index cc31abc..0000000 --- a/scripts/utils/configs/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'rzaitov' diff --git a/scripts/utils/csproj/__init__.py b/scripts/utils/csproj/__init__.py deleted file mode 100644 index cc31abc..0000000 --- a/scripts/utils/csproj/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'rzaitov' diff --git a/scripts/utils/infoplist/__init__.py b/scripts/utils/infoplist/__init__.py deleted file mode 100644 index cc31abc..0000000 --- a/scripts/utils/infoplist/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'rzaitov' diff --git a/scripts/utils/sln/__init__.py b/scripts/utils/sln/__init__.py deleted file mode 100644 index cc31abc..0000000 --- a/scripts/utils/sln/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'rzaitov' diff --git a/scripts/utils/testflight/__init__.py b/scripts/utils/testflight/__init__.py deleted file mode 100644 index cc31abc..0000000 --- a/scripts/utils/testflight/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'rzaitov'