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:
Nikolaj Geisle
@@ -2,14 +2,12 @@
|
||||
// See LICENSE for more details.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using Umbraco.Cms.Core.Cache;
|
||||
using Umbraco.Cms.Core.Models;
|
||||
using Umbraco.Cms.Core.Scoping;
|
||||
using Umbraco.Cms.Core.Services;
|
||||
using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
|
||||
using Umbraco.Cms.Infrastructure.Scoping;
|
||||
@@ -18,250 +16,249 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
||||
using Umbraco.Cms.Tests.Common.Testing;
|
||||
using Umbraco.Cms.Tests.Integration.Testing;
|
||||
|
||||
using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
|
||||
using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
|
||||
namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
|
||||
|
||||
namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
|
||||
[TestFixture]
|
||||
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
||||
public class MacroServiceTests : UmbracoIntegrationTest
|
||||
{
|
||||
[TestFixture]
|
||||
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
||||
public class MacroServiceTests : UmbracoIntegrationTest
|
||||
[SetUp]
|
||||
public void SetupTest()
|
||||
{
|
||||
[Obsolete("After merging IMacroWithAliasService interface with IMacroService in Umbraco 11, this should go back to just being GetRequiredService<IMacroService>()")]
|
||||
private IMacroWithAliasService MacroService => GetRequiredService<IMacroService>() as IMacroWithAliasService;
|
||||
|
||||
[SetUp]
|
||||
public void SetupTest()
|
||||
var scopeProvider = ScopeProvider;
|
||||
using (var scope = scopeProvider.CreateScope())
|
||||
{
|
||||
IScopeProvider scopeProvider = ScopeProvider;
|
||||
using (IScope scope = scopeProvider.CreateScope())
|
||||
{
|
||||
var repository = new MacroRepository((IScopeAccessor)scopeProvider, AppCaches.Disabled, Mock.Of<ILogger<MacroRepository>>(), ShortStringHelper);
|
||||
var repository = new MacroRepository((IScopeAccessor)scopeProvider, AppCaches.Disabled,
|
||||
Mock.Of<ILogger<MacroRepository>>(), ShortStringHelper);
|
||||
|
||||
repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
|
||||
repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
|
||||
repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
|
||||
scope.Complete();
|
||||
}
|
||||
repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
|
||||
repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
|
||||
repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
|
||||
scope.Complete();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Get_By_Alias()
|
||||
{
|
||||
// Act
|
||||
IMacro macro = MacroService.GetByAlias("test1");
|
||||
|
||||
// Assert
|
||||
Assert.IsNotNull(macro);
|
||||
Assert.AreEqual("Test1", macro.Name);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Get_By_Aliases()
|
||||
{
|
||||
// Act
|
||||
IEnumerable<IMacro> macros = MacroService.GetAll("test1", "test2");
|
||||
|
||||
// Assert
|
||||
Assert.IsNotNull(macros);
|
||||
Assert.AreEqual(2, macros.Count());
|
||||
Assert.AreEqual("Test1", macros.ToArray()[0].Name);
|
||||
Assert.AreEqual("Test2", macros.ToArray()[1].Name);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Get_All()
|
||||
{
|
||||
// Act
|
||||
IEnumerable<IMacro> result = MacroService.GetAll();
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual(3, result.Count());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Create()
|
||||
{
|
||||
// Act
|
||||
IMacro macro = CreateMacro();
|
||||
MacroService.Save(macro);
|
||||
|
||||
// Assert
|
||||
Assert.IsTrue(macro.HasIdentity);
|
||||
Assert.Greater(macro.Id, 0);
|
||||
Assert.AreNotEqual(Guid.Empty, macro.Key);
|
||||
IMacro result = MacroService.GetById(macro.Id);
|
||||
Assert.AreEqual("test", result.Alias);
|
||||
Assert.AreEqual("Test", result.Name);
|
||||
Assert.AreEqual("~/Views/MacroPartials/Test.cshtml", result.MacroSource);
|
||||
Assert.AreEqual(1234, result.CacheDuration);
|
||||
|
||||
result = MacroService.GetById(macro.Key);
|
||||
Assert.AreEqual("test", result.Alias);
|
||||
Assert.AreEqual("Test", result.Name);
|
||||
Assert.AreEqual("~/Views/MacroPartials/Test.cshtml", result.MacroSource);
|
||||
Assert.AreEqual(1234, result.CacheDuration);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Delete()
|
||||
{
|
||||
// Arrange
|
||||
var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
|
||||
MacroService.Save(macro);
|
||||
|
||||
// Act
|
||||
MacroService.Delete(macro);
|
||||
|
||||
// Assert
|
||||
IMacro result = MacroService.GetById(macro.Id);
|
||||
Assert.IsNull(result);
|
||||
|
||||
result = MacroService.GetById(macro.Key);
|
||||
Assert.IsNull(result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Update()
|
||||
{
|
||||
// Arrange
|
||||
IMacro macro = CreateMacro();
|
||||
MacroService.Save(macro);
|
||||
|
||||
// Act
|
||||
Guid currKey = macro.Key;
|
||||
macro.Name = "New name";
|
||||
macro.Alias = "NewAlias";
|
||||
MacroService.Save(macro);
|
||||
|
||||
macro = MacroService.GetById(macro.Id);
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual("New name", macro.Name);
|
||||
Assert.AreEqual("NewAlias", macro.Alias);
|
||||
Assert.AreEqual(currKey, macro.Key);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Update_Property()
|
||||
{
|
||||
// Arrange
|
||||
IMacro macro = CreateMacro();
|
||||
macro.Properties.Add(new MacroProperty("blah", "Blah", 0, "blah"));
|
||||
MacroService.Save(macro);
|
||||
|
||||
Assert.AreNotEqual(Guid.Empty, macro.Properties[0].Key);
|
||||
|
||||
// Act
|
||||
Guid currPropKey = macro.Properties[0].Key;
|
||||
macro.Properties[0].Alias = "new Alias";
|
||||
macro.Properties[0].Name = "new Name";
|
||||
macro.Properties[0].SortOrder = 1;
|
||||
macro.Properties[0].EditorAlias = "new";
|
||||
MacroService.Save(macro);
|
||||
|
||||
macro = MacroService.GetById(macro.Id);
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual(1, macro.Properties.Count);
|
||||
Assert.AreEqual(currPropKey, macro.Properties[0].Key);
|
||||
Assert.AreEqual("new Alias", macro.Properties[0].Alias);
|
||||
Assert.AreEqual("new Name", macro.Properties[0].Name);
|
||||
Assert.AreEqual(1, macro.Properties[0].SortOrder);
|
||||
Assert.AreEqual("new", macro.Properties[0].EditorAlias);
|
||||
Assert.AreEqual(currPropKey, macro.Properties[0].Key);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Update_Remove_Property()
|
||||
{
|
||||
// Arrange
|
||||
IMacro macro = CreateMacro();
|
||||
macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
|
||||
macro.Properties.Add(new MacroProperty("blah2", "Blah2", 1, "blah2"));
|
||||
macro.Properties.Add(new MacroProperty("blah3", "Blah3", 2, "blah3"));
|
||||
MacroService.Save(macro);
|
||||
|
||||
Guid lastKey = macro.Properties[0].Key;
|
||||
for (int i = 1; i < macro.Properties.Count; i++)
|
||||
{
|
||||
Assert.AreNotEqual(Guid.Empty, macro.Properties[i].Key);
|
||||
Assert.AreNotEqual(lastKey, macro.Properties[i].Key);
|
||||
lastKey = macro.Properties[i].Key;
|
||||
}
|
||||
|
||||
// Act
|
||||
macro.Properties["blah1"].Alias = "newAlias";
|
||||
macro.Properties["blah1"].Name = "new Name";
|
||||
macro.Properties["blah1"].SortOrder = 1;
|
||||
macro.Properties["blah1"].EditorAlias = "new";
|
||||
macro.Properties.Remove("blah3");
|
||||
|
||||
var allPropKeys = macro.Properties.Values.Select(x => new { x.Alias, x.Key }).ToArray();
|
||||
|
||||
MacroService.Save(macro);
|
||||
|
||||
macro = MacroService.GetById(macro.Id);
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual(2, macro.Properties.Count);
|
||||
Assert.AreEqual("newAlias", macro.Properties["newAlias"].Alias);
|
||||
Assert.AreEqual("new Name", macro.Properties["newAlias"].Name);
|
||||
Assert.AreEqual(1, macro.Properties["newAlias"].SortOrder);
|
||||
Assert.AreEqual("new", macro.Properties["newAlias"].EditorAlias);
|
||||
foreach (var propKey in allPropKeys)
|
||||
{
|
||||
Assert.AreEqual(propKey.Key, macro.Properties[propKey.Alias].Key);
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Add_And_Remove_Properties()
|
||||
{
|
||||
IMacro macro = CreateMacro();
|
||||
|
||||
// Adds some properties
|
||||
macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
|
||||
macro.Properties.Add(new MacroProperty("blah2", "Blah2", 0, "blah2"));
|
||||
macro.Properties.Add(new MacroProperty("blah3", "Blah3", 0, "blah3"));
|
||||
macro.Properties.Add(new MacroProperty("blah4", "Blah4", 0, "blah4"));
|
||||
MacroService.Save(macro);
|
||||
|
||||
IMacro result1 = MacroService.GetById(macro.Id);
|
||||
Assert.AreEqual(4, result1.Properties.Values.Count());
|
||||
|
||||
// Simulate clearing the sections
|
||||
foreach (IMacroProperty s in result1.Properties.Values.ToArray())
|
||||
{
|
||||
result1.Properties.Remove(s.Alias);
|
||||
}
|
||||
|
||||
// Now just re-add a couple
|
||||
result1.Properties.Add(new MacroProperty("blah3", "Blah3", 0, "blah3"));
|
||||
result1.Properties.Add(new MacroProperty("blah4", "Blah4", 0, "blah4"));
|
||||
MacroService.Save(result1);
|
||||
|
||||
// Assert
|
||||
result1 = MacroService.GetById(result1.Id);
|
||||
Assert.AreEqual(2, result1.Properties.Values.Count());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Cannot_Save_Macro_With_Empty_Name()
|
||||
{
|
||||
// Arrange
|
||||
IMacro macro = CreateMacro(name: string.Empty);
|
||||
|
||||
// Act & Assert
|
||||
Assert.Throws<ArgumentException>(() => MacroService.Save(macro));
|
||||
}
|
||||
|
||||
private static IMacro CreateMacro(string name = "Test") =>
|
||||
new MacroBuilder()
|
||||
.WithAlias("test")
|
||||
.WithName(name)
|
||||
.WithSource("~/Views/MacroPartials/Test.cshtml")
|
||||
.WithCacheDuration(1234)
|
||||
.Build();
|
||||
}
|
||||
|
||||
[Obsolete(
|
||||
"After merging IMacroWithAliasService interface with IMacroService in Umbraco 11, this should go back to just being GetRequiredService<IMacroService>()")]
|
||||
private IMacroWithAliasService MacroService => GetRequiredService<IMacroService>() as IMacroWithAliasService;
|
||||
|
||||
[Test]
|
||||
public void Can_Get_By_Alias()
|
||||
{
|
||||
// Act
|
||||
var macro = MacroService.GetByAlias("test1");
|
||||
|
||||
// Assert
|
||||
Assert.IsNotNull(macro);
|
||||
Assert.AreEqual("Test1", macro.Name);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Get_By_Aliases()
|
||||
{
|
||||
// Act
|
||||
var macros = MacroService.GetAll("test1", "test2");
|
||||
|
||||
// Assert
|
||||
Assert.IsNotNull(macros);
|
||||
Assert.AreEqual(2, macros.Count());
|
||||
Assert.AreEqual("Test1", macros.ToArray()[0].Name);
|
||||
Assert.AreEqual("Test2", macros.ToArray()[1].Name);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Get_All()
|
||||
{
|
||||
// Act
|
||||
var result = MacroService.GetAll();
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual(3, result.Count());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Create()
|
||||
{
|
||||
// Act
|
||||
var macro = CreateMacro();
|
||||
MacroService.Save(macro);
|
||||
|
||||
// Assert
|
||||
Assert.IsTrue(macro.HasIdentity);
|
||||
Assert.Greater(macro.Id, 0);
|
||||
Assert.AreNotEqual(Guid.Empty, macro.Key);
|
||||
var result = MacroService.GetById(macro.Id);
|
||||
Assert.AreEqual("test", result.Alias);
|
||||
Assert.AreEqual("Test", result.Name);
|
||||
Assert.AreEqual("~/Views/MacroPartials/Test.cshtml", result.MacroSource);
|
||||
Assert.AreEqual(1234, result.CacheDuration);
|
||||
|
||||
result = MacroService.GetById(macro.Key);
|
||||
Assert.AreEqual("test", result.Alias);
|
||||
Assert.AreEqual("Test", result.Name);
|
||||
Assert.AreEqual("~/Views/MacroPartials/Test.cshtml", result.MacroSource);
|
||||
Assert.AreEqual(1234, result.CacheDuration);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Delete()
|
||||
{
|
||||
// Arrange
|
||||
var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml",
|
||||
cacheDuration: 1234);
|
||||
MacroService.Save(macro);
|
||||
|
||||
// Act
|
||||
MacroService.Delete(macro);
|
||||
|
||||
// Assert
|
||||
var result = MacroService.GetById(macro.Id);
|
||||
Assert.IsNull(result);
|
||||
|
||||
result = MacroService.GetById(macro.Key);
|
||||
Assert.IsNull(result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Update()
|
||||
{
|
||||
// Arrange
|
||||
var macro = CreateMacro();
|
||||
MacroService.Save(macro);
|
||||
|
||||
// Act
|
||||
var currKey = macro.Key;
|
||||
macro.Name = "New name";
|
||||
macro.Alias = "NewAlias";
|
||||
MacroService.Save(macro);
|
||||
|
||||
macro = MacroService.GetById(macro.Id);
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual("New name", macro.Name);
|
||||
Assert.AreEqual("NewAlias", macro.Alias);
|
||||
Assert.AreEqual(currKey, macro.Key);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Update_Property()
|
||||
{
|
||||
// Arrange
|
||||
var macro = CreateMacro();
|
||||
macro.Properties.Add(new MacroProperty("blah", "Blah", 0, "blah"));
|
||||
MacroService.Save(macro);
|
||||
|
||||
Assert.AreNotEqual(Guid.Empty, macro.Properties[0].Key);
|
||||
|
||||
// Act
|
||||
var currPropKey = macro.Properties[0].Key;
|
||||
macro.Properties[0].Alias = "new Alias";
|
||||
macro.Properties[0].Name = "new Name";
|
||||
macro.Properties[0].SortOrder = 1;
|
||||
macro.Properties[0].EditorAlias = "new";
|
||||
MacroService.Save(macro);
|
||||
|
||||
macro = MacroService.GetById(macro.Id);
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual(1, macro.Properties.Count);
|
||||
Assert.AreEqual(currPropKey, macro.Properties[0].Key);
|
||||
Assert.AreEqual("new Alias", macro.Properties[0].Alias);
|
||||
Assert.AreEqual("new Name", macro.Properties[0].Name);
|
||||
Assert.AreEqual(1, macro.Properties[0].SortOrder);
|
||||
Assert.AreEqual("new", macro.Properties[0].EditorAlias);
|
||||
Assert.AreEqual(currPropKey, macro.Properties[0].Key);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Update_Remove_Property()
|
||||
{
|
||||
// Arrange
|
||||
var macro = CreateMacro();
|
||||
macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
|
||||
macro.Properties.Add(new MacroProperty("blah2", "Blah2", 1, "blah2"));
|
||||
macro.Properties.Add(new MacroProperty("blah3", "Blah3", 2, "blah3"));
|
||||
MacroService.Save(macro);
|
||||
|
||||
var lastKey = macro.Properties[0].Key;
|
||||
for (var i = 1; i < macro.Properties.Count; i++)
|
||||
{
|
||||
Assert.AreNotEqual(Guid.Empty, macro.Properties[i].Key);
|
||||
Assert.AreNotEqual(lastKey, macro.Properties[i].Key);
|
||||
lastKey = macro.Properties[i].Key;
|
||||
}
|
||||
|
||||
// Act
|
||||
macro.Properties["blah1"].Alias = "newAlias";
|
||||
macro.Properties["blah1"].Name = "new Name";
|
||||
macro.Properties["blah1"].SortOrder = 1;
|
||||
macro.Properties["blah1"].EditorAlias = "new";
|
||||
macro.Properties.Remove("blah3");
|
||||
|
||||
var allPropKeys = macro.Properties.Values.Select(x => new { x.Alias, x.Key }).ToArray();
|
||||
|
||||
MacroService.Save(macro);
|
||||
|
||||
macro = MacroService.GetById(macro.Id);
|
||||
|
||||
// Assert
|
||||
Assert.AreEqual(2, macro.Properties.Count);
|
||||
Assert.AreEqual("newAlias", macro.Properties["newAlias"].Alias);
|
||||
Assert.AreEqual("new Name", macro.Properties["newAlias"].Name);
|
||||
Assert.AreEqual(1, macro.Properties["newAlias"].SortOrder);
|
||||
Assert.AreEqual("new", macro.Properties["newAlias"].EditorAlias);
|
||||
foreach (var propKey in allPropKeys)
|
||||
{
|
||||
Assert.AreEqual(propKey.Key, macro.Properties[propKey.Alias].Key);
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Can_Add_And_Remove_Properties()
|
||||
{
|
||||
var macro = CreateMacro();
|
||||
|
||||
// Adds some properties
|
||||
macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
|
||||
macro.Properties.Add(new MacroProperty("blah2", "Blah2", 0, "blah2"));
|
||||
macro.Properties.Add(new MacroProperty("blah3", "Blah3", 0, "blah3"));
|
||||
macro.Properties.Add(new MacroProperty("blah4", "Blah4", 0, "blah4"));
|
||||
MacroService.Save(macro);
|
||||
|
||||
var result1 = MacroService.GetById(macro.Id);
|
||||
Assert.AreEqual(4, result1.Properties.Values.Count());
|
||||
|
||||
// Simulate clearing the sections
|
||||
foreach (var s in result1.Properties.Values.ToArray())
|
||||
{
|
||||
result1.Properties.Remove(s.Alias);
|
||||
}
|
||||
|
||||
// Now just re-add a couple
|
||||
result1.Properties.Add(new MacroProperty("blah3", "Blah3", 0, "blah3"));
|
||||
result1.Properties.Add(new MacroProperty("blah4", "Blah4", 0, "blah4"));
|
||||
MacroService.Save(result1);
|
||||
|
||||
// Assert
|
||||
result1 = MacroService.GetById(result1.Id);
|
||||
Assert.AreEqual(2, result1.Properties.Values.Count());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Cannot_Save_Macro_With_Empty_Name()
|
||||
{
|
||||
// Arrange
|
||||
var macro = CreateMacro(string.Empty);
|
||||
|
||||
// Act & Assert
|
||||
Assert.Throws<ArgumentException>(() => MacroService.Save(macro));
|
||||
}
|
||||
|
||||
private static IMacro CreateMacro(string name = "Test") =>
|
||||
new MacroBuilder()
|
||||
.WithAlias("test")
|
||||
.WithName(name)
|
||||
.WithSource("~/Views/MacroPartials/Test.cshtml")
|
||||
.WithCacheDuration(1234)
|
||||
.Build();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user