V10: fix build warnings in test projects (#12509)
* Run code cleanup * Dotnet format benchmarks project * Fix up Test.Common * Run dotnet format + manual cleanup * Run code cleanup for unit tests * Run dotnet format * Fix up errors * Manual cleanup of Unit test project * Update tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Fix according to review * Fix after merge * Fix errors Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk> Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> Co-authored-by: Zeegaan <nge@umbraco.dk>
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -1,10 +1,9 @@
|
||||
// Copyright (c) Umbraco.
|
||||
// See LICENSE for more details.
|
||||
|
||||
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded
|
||||
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded;
|
||||
|
||||
public static class StringExtensions
|
||||
{
|
||||
public static class StringExtensions
|
||||
{
|
||||
public static string ClearLf(this string s) => s.Replace("\r", string.Empty);
|
||||
}
|
||||
public static string ClearLf(this string s) => s.Replace("\r", string.Empty);
|
||||
}
|
||||
|
||||
@@ -7,57 +7,56 @@ using NUnit.Framework;
|
||||
using Umbraco.Cms.Infrastructure.ModelsBuilder;
|
||||
using Umbraco.Cms.Infrastructure.ModelsBuilder.Building;
|
||||
|
||||
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded
|
||||
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded;
|
||||
|
||||
[TestFixture]
|
||||
public class UmbracoApplicationTests
|
||||
{
|
||||
[TestFixture]
|
||||
public class UmbracoApplicationTests
|
||||
//// [Test]
|
||||
//// public void Test()
|
||||
//// {
|
||||
//// // start and terminate
|
||||
//// using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
|
||||
//// { }
|
||||
|
||||
//// // start and terminate
|
||||
//// using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
|
||||
//// { }
|
||||
|
||||
//// // start, use and terminate
|
||||
//// using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
|
||||
//// {
|
||||
//// var types = app.GetContentTypes();
|
||||
//// }
|
||||
//// }
|
||||
|
||||
[Test]
|
||||
public void ThrowsOnDuplicateAliases()
|
||||
{
|
||||
//// [Test]
|
||||
//// public void Test()
|
||||
//// {
|
||||
//// // start and terminate
|
||||
//// using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
|
||||
//// { }
|
||||
|
||||
//// // start and terminate
|
||||
//// using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
|
||||
//// { }
|
||||
|
||||
//// // start, use and terminate
|
||||
//// using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
|
||||
//// {
|
||||
//// var types = app.GetContentTypes();
|
||||
//// }
|
||||
//// }
|
||||
|
||||
[Test]
|
||||
public void ThrowsOnDuplicateAliases()
|
||||
var typeModels = new List<TypeModel>
|
||||
{
|
||||
var typeModels = new List<TypeModel>
|
||||
{
|
||||
new TypeModel { ItemType = TypeModel.ItemTypes.Content, Alias = "content1" },
|
||||
new TypeModel { ItemType = TypeModel.ItemTypes.Content, Alias = "content2" },
|
||||
new TypeModel { ItemType = TypeModel.ItemTypes.Media, Alias = "media1" },
|
||||
new TypeModel { ItemType = TypeModel.ItemTypes.Media, Alias = "media2" },
|
||||
new TypeModel { ItemType = TypeModel.ItemTypes.Member, Alias = "member1" },
|
||||
new TypeModel { ItemType = TypeModel.ItemTypes.Member, Alias = "member2" },
|
||||
};
|
||||
new() { ItemType = TypeModel.ItemTypes.Content, Alias = "content1" },
|
||||
new() { ItemType = TypeModel.ItemTypes.Content, Alias = "content2" },
|
||||
new() { ItemType = TypeModel.ItemTypes.Media, Alias = "media1" },
|
||||
new() { ItemType = TypeModel.ItemTypes.Media, Alias = "media2" },
|
||||
new() { ItemType = TypeModel.ItemTypes.Member, Alias = "member1" },
|
||||
new() { ItemType = TypeModel.ItemTypes.Member, Alias = "member2" },
|
||||
};
|
||||
|
||||
Assert.AreEqual(6, UmbracoServices.EnsureDistinctAliases(typeModels).Count);
|
||||
Assert.AreEqual(6, UmbracoServices.EnsureDistinctAliases(typeModels).Count);
|
||||
|
||||
typeModels.Add(new TypeModel { ItemType = TypeModel.ItemTypes.Media, Alias = "content1" });
|
||||
typeModels.Add(new TypeModel { ItemType = TypeModel.ItemTypes.Media, Alias = "content1" });
|
||||
|
||||
try
|
||||
{
|
||||
UmbracoServices.EnsureDistinctAliases(typeModels);
|
||||
}
|
||||
catch (NotSupportedException e)
|
||||
{
|
||||
Console.WriteLine(e.Message);
|
||||
return;
|
||||
}
|
||||
|
||||
Assert.Fail("Expected NotSupportedException.");
|
||||
try
|
||||
{
|
||||
UmbracoServices.EnsureDistinctAliases(typeModels);
|
||||
}
|
||||
catch (NotSupportedException e)
|
||||
{
|
||||
Console.WriteLine(e.Message);
|
||||
return;
|
||||
}
|
||||
|
||||
Assert.Fail("Expected NotSupportedException.");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user