Skip to content

Commit

Permalink
Миграция на .NET 6 (#25)
Browse files Browse the repository at this point in the history
* Обновлена целевая платформа и пакеты NuGet

* Модифицирована первоначальная настройка приложения

* Поверхностный рефакторинг всех классов

* Модели данных переделаны с классов на записи

* Добавлен FocusOnNavigate

* Добавление инфраструктуры для классов-обёрток вызова функций JavaScript

* Использование классов-обёрток вызова функций JavaScript в проекте локализации

* Использование классов-обёрток вызова функций JavaScript в основном приложении

* Замена Microsoft.Toolkit.Diagnostics на CommunityToolkit.Diagnostics

* Переработка файлов стилей и сценариев под новые возможности .NET 6

* Добавление файлов настроек для модульных тестов

* Обновление данных резюме

* Обновление сценария сборки и публикации

Co-authored-by: Валерий Гуров <ValeriyGourov@live.ru>
  • Loading branch information
ValeriyGourov and Валерий Гуров authored Oct 30, 2022
1 parent 69013d4 commit 5946f1d
Show file tree
Hide file tree
Showing 71 changed files with 2,655 additions and 2,299 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/master_valeriygourovresume.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
AZURE_WEBAPP_PACKAGE_PATH: ./myapp
AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AzureAppService_PublishProfile_eae5998034e344898a1aa008c6868181 }}
CONFIGURATION: Release
DOTNET_CORE_VERSION: 5.0.x
DOTNET_CORE_VERSION: 6.0.x

jobs:
build-and-deploy:
Expand Down
12 changes: 6 additions & 6 deletions Application.Tests/Application.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="coverlet.collector" Version="1.3.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageReference Include="MSTest.TestAdapter" Version="2.*" />
<PackageReference Include="MSTest.TestFramework" Version="2.*" />
<PackageReference Include="coverlet.collector" Version="3.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,55 +1,50 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.ComponentModel.DataAnnotations;

using Microsoft.VisualStudio.TestTools.UnitTesting;

using TestInfrastructure;

namespace Application.Infrastructure.Validation.Tests
namespace Application.Infrastructure.Validation.Tests;

[TestClass]
public class ComplexTypeValidationResultTests
{
[TestClass]
public class ComplexTypeValidationResultTests
[TestMethod]
[TestProperty(TestProperties.Constructor, null)]
public void ThrowsArgumentNullExceptionInConstructorIfValidationResultsIsNull()
{
[TestMethod]
[TestProperty(TestProperties.Constructor, null)]
public void ThrowsArgumentNullExceptionInConstructorIfValidationResultsIsNull()
{
// Arrange.
string errorMessage = "Test";
IEnumerable<ValidationResult>? validationResults = null;
// Arrange.
const string errorMessage = "Test";
IEnumerable<ValidationResult>? validationResults = null;

// Act.
void act()
{
// Act.
void act()
{
#pragma warning disable CS8604 // Возможно, аргумент-ссылка, допускающий значение NULL.
ComplexTypeValidationResult validationResult = new(errorMessage, validationResults);
_ = new ComplexTypeValidationResult(errorMessage, validationResults);
#pragma warning restore CS8604 // Возможно, аргумент-ссылка, допускающий значение NULL.
};

// Assert.
Assert.ThrowsException<ArgumentNullException>(act);
}

[TestMethod]
[TestProperty(TestProperties.PropertyName, nameof(ComplexTypeValidationResult.ValidationResults))]
public void ValidationResultsMustBeFiledAfterCreation()
{
// Arrange.
string errorMessage = "Test";
IEnumerable<ValidationResult> validationResults = new List<ValidationResult>
{
new ValidationResult("Test 1"),
new ValidationResult("Test 2")
};
// Assert.
Assert.ThrowsException<ArgumentNullException>(act);
}

// Act.
ComplexTypeValidationResult validationResult = new(errorMessage, validationResults);
[TestMethod]
[TestProperty(TestProperties.PropertyName, nameof(ComplexTypeValidationResult.ValidationResults))]
public void ValidationResultsMustBeFiledAfterCreation()
{
// Arrange.
const string errorMessage = "Test";
IEnumerable<ValidationResult> validationResults = new List<ValidationResult>
{
new ValidationResult("Test 1"),
new ValidationResult("Test 2")
};

// Act.
ComplexTypeValidationResult validationResult = new(errorMessage, validationResults);

// Assert.
CollectionAssert.AreEquivalent(validationResults.ToArray(), validationResult.ValidationResults.ToArray());
}
// Assert.
CollectionAssert.AreEquivalent(validationResults.ToArray(), validationResult.ValidationResults.ToArray());
}
}
Loading

0 comments on commit 5946f1d

Please sign in to comment.