Skip to content

Commit

Permalink
Реалищована простая макроканда, которая выполняет последовательность …
Browse files Browse the repository at this point in the history
…команд
  • Loading branch information
etyumemntcev committed Jan 5, 2024
1 parent 395192b commit 2cbb0ae
Show file tree
Hide file tree
Showing 9 changed files with 425 additions and 58 deletions.
128 changes: 70 additions & 58 deletions appserver/appserver.sln
Original file line number Diff line number Diff line change
@@ -1,58 +1,70 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33815.320
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core", "core\core.csproj", "{4739B155-C072-4237-BE4A-6E255D41872A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core.tests", "core.tests\core.tests.csproj", "{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "scopes", "scopes\scopes.csproj", "{1244BC72-77C3-4516-97AD-37F216183D02}"
ProjectSection(ProjectDependencies) = postProject
{4739B155-C072-4237-BE4A-6E255D41872A} = {4739B155-C072-4237-BE4A-6E255D41872A}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "scopes.tests", "scopes.tests\scopes.tests.csproj", "{F9B44F38-D16C-4960-A000-D84215EB5EB4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "server\server.csproj", "{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server.tests", "server.tests\server.tests.csproj", "{9F40262D-C220-4780-8F63-46663C9948D6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4739B155-C072-4237-BE4A-6E255D41872A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4739B155-C072-4237-BE4A-6E255D41872A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4739B155-C072-4237-BE4A-6E255D41872A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4739B155-C072-4237-BE4A-6E255D41872A}.Release|Any CPU.Build.0 = Release|Any CPU
{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}.Release|Any CPU.Build.0 = Release|Any CPU
{1244BC72-77C3-4516-97AD-37F216183D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1244BC72-77C3-4516-97AD-37F216183D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1244BC72-77C3-4516-97AD-37F216183D02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1244BC72-77C3-4516-97AD-37F216183D02}.Release|Any CPU.Build.0 = Release|Any CPU
{F9B44F38-D16C-4960-A000-D84215EB5EB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9B44F38-D16C-4960-A000-D84215EB5EB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9B44F38-D16C-4960-A000-D84215EB5EB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9B44F38-D16C-4960-A000-D84215EB5EB4}.Release|Any CPU.Build.0 = Release|Any CPU
{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}.Release|Any CPU.Build.0 = Release|Any CPU
{9F40262D-C220-4780-8F63-46663C9948D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F40262D-C220-4780-8F63-46663C9948D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F40262D-C220-4780-8F63-46663C9948D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F40262D-C220-4780-8F63-46663C9948D6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {40A1B7CA-E55F-4FAD-921D-9627F9BE21FA}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33815.320
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core", "core\core.csproj", "{4739B155-C072-4237-BE4A-6E255D41872A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core.tests", "core.tests\core.tests.csproj", "{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "scopes", "scopes\scopes.csproj", "{1244BC72-77C3-4516-97AD-37F216183D02}"
ProjectSection(ProjectDependencies) = postProject
{4739B155-C072-4237-BE4A-6E255D41872A} = {4739B155-C072-4237-BE4A-6E255D41872A}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "scopes.tests", "scopes.tests\scopes.tests.csproj", "{F9B44F38-D16C-4960-A000-D84215EB5EB4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server", "server\server.csproj", "{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server.tests", "server.tests\server.tests.csproj", "{9F40262D-C220-4780-8F63-46663C9948D6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "commands", "Commands\commands.csproj", "{CF4DC523-1CD8-4C4A-AD03-C6442F13A7E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "commands.tests", "commands.tests\commands.tests.csproj", "{6D2ED295-41BC-4B1C-A70D-D7199BD11B3B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4739B155-C072-4237-BE4A-6E255D41872A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4739B155-C072-4237-BE4A-6E255D41872A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4739B155-C072-4237-BE4A-6E255D41872A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4739B155-C072-4237-BE4A-6E255D41872A}.Release|Any CPU.Build.0 = Release|Any CPU
{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CBB6D4B-77CE-4B9F-83AA-80B8107145BF}.Release|Any CPU.Build.0 = Release|Any CPU
{1244BC72-77C3-4516-97AD-37F216183D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1244BC72-77C3-4516-97AD-37F216183D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1244BC72-77C3-4516-97AD-37F216183D02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1244BC72-77C3-4516-97AD-37F216183D02}.Release|Any CPU.Build.0 = Release|Any CPU
{F9B44F38-D16C-4960-A000-D84215EB5EB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9B44F38-D16C-4960-A000-D84215EB5EB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9B44F38-D16C-4960-A000-D84215EB5EB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9B44F38-D16C-4960-A000-D84215EB5EB4}.Release|Any CPU.Build.0 = Release|Any CPU
{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73269DC0-248E-4CF9-AED9-ABB5B9DC2980}.Release|Any CPU.Build.0 = Release|Any CPU
{9F40262D-C220-4780-8F63-46663C9948D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F40262D-C220-4780-8F63-46663C9948D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F40262D-C220-4780-8F63-46663C9948D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F40262D-C220-4780-8F63-46663C9948D6}.Release|Any CPU.Build.0 = Release|Any CPU
{CF4DC523-1CD8-4C4A-AD03-C6442F13A7E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF4DC523-1CD8-4C4A-AD03-C6442F13A7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF4DC523-1CD8-4C4A-AD03-C6442F13A7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CF4DC523-1CD8-4C4A-AD03-C6442F13A7E6}.Release|Any CPU.Build.0 = Release|Any CPU
{6D2ED295-41BC-4B1C-A70D-D7199BD11B3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D2ED295-41BC-4B1C-A70D-D7199BD11B3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D2ED295-41BC-4B1C-A70D-D7199BD11B3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D2ED295-41BC-4B1C-A70D-D7199BD11B3B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {40A1B7CA-E55F-4FAD-921D-9627F9BE21FA}
EndGlobalSection
EndGlobal
19 changes: 19 additions & 0 deletions appserver/commands.tests/SimpleMacroCommand.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Функция: Простая составная каоманда.

Простая составная команда позволяет выполнить последовательность команд
как одну команду. В случае выброса исклчения из любой команды последовательности
выполнение последовательности останавливается, а макрокоманда пробрасывает
исключение дальше.

@Позитивный
Сценарий: Макрокоманда выполняет все команды последовательности
Дано макрокоманда, собранная из последовательности команд
Когда макрокоманда выполняется
Тогда выполняются все команды последовательности.

Сценарий: Выполнение макрокоманды прерывается на команде, которая вбрасывает исключение
Дано макрокоманда, собранная из последовательности команд, одна из которых выбрасвает исключение
Когда макрокоманда выполняется
Тогда макрокоманда прервывается выброшенным исключением.


169 changes: 169 additions & 0 deletions appserver/commands.tests/SimpleMacroCommand.feature.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions appserver/commands.tests/Usings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
global using Xunit;
37 changes: 37 additions & 0 deletions appserver/commands.tests/commands.tests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Gherkin" Version="27.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.9.74" />
<PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Commands\commands.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit 2cbb0ae

Please sign in to comment.