yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix legacy tests

Browse Source
This commit is contained in:
Paul Johnson
2020-11-20 12:24:16 +00:00
parent 39657dea6d
commit 5e2de50382
13 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Logging/ProfilingLogger.cs
View File

@@ -23,10 +23,7 @@ namespace Umbraco.Core.Logging
/// <summary>
/// Initializes a new instance of the <see cref="ProfilingLogger"/> class.
/// </summary>
public ProfilingLogger(ILogger<ProfilingLogger> logger, IProfiler profiler) : this(logger as ILogger, profiler)
{ }
public ProfilingLogger(ILogger logger, IProfiler profiler)
public ProfilingLogger(ILogger<ProfilingLogger> logger, IProfiler profiler)
{
Logger = logger ?? throw new ArgumentNullException(nameof(logger));
Profiler = profiler ?? throw new ArgumentNullException(nameof(profiler));

2
src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
View File

@@ -66,7 +66,7 @@ namespace Umbraco.Tests.Integration.Implementations
_hostingLifetime = new AspNetCoreApplicationShutdownRegistry(Mock.Of<IHostApplicationLifetime>());
ConsoleLoggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
ProfilingLogger = new ProfilingLogger(ConsoleLoggerFactory.CreateLogger("ProfilingLogger"), Profiler);
ProfilingLogger = new ProfilingLogger(ConsoleLoggerFactory.CreateLogger<ProfilingLogger>(), Profiler);
}

6
src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
View File

@@ -52,7 +52,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
mock.Setup(x => x.GetService(typeof (ILogger))).Returns(logger);
mock.Setup(x => x.GetService(typeof(ILogger<ComponentCollection>))).Returns(loggerFactory.CreateLogger<ComponentCollection>);
mock.Setup(x => x.GetService(typeof(ILoggerFactory))).Returns(loggerFactory);
mock.Setup(x => x.GetService(typeof (IProfilingLogger))).Returns(new ProfilingLogger(logger, Mock.Of<IProfiler>()));
mock.Setup(x => x.GetService(typeof (IProfilingLogger))).Returns(new ProfilingLogger(loggerFactory.CreateLogger<ProfilingLogger>(), Mock.Of<IProfiler>()));
mock.Setup(x => x.GetService(typeof (IUmbracoDatabaseFactory))).Returns(f);
mock.Setup(x => x.GetService(typeof (IScopeProvider))).Returns(p);
@@ -96,7 +96,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
if (type == typeof(Composer1)) return new Composer1();
if (type == typeof(Composer5)) return new Composer5();
if (type == typeof(Component5)) return new Component5(new SomeResource());
if (type == typeof(IProfilingLogger)) return new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
if (type == typeof(IProfilingLogger)) return new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
if (type == typeof(ILogger<ComponentCollection>)) return Mock.Of<ILogger<ComponentCollection>>();
throw new NotSupportedException(type.FullName);
});
@@ -220,7 +220,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
if (type == typeof(Composer5a)) return new Composer5a();
if (type == typeof(Component5)) return new Component5(new SomeResource());
if (type == typeof(Component5a)) return new Component5a();
if (type == typeof(IProfilingLogger)) return new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
if (type == typeof(IProfilingLogger)) return new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
if (type == typeof(ILogger<ComponentCollection>)) return Mock.Of<ILogger<ComponentCollection>>();
throw new NotSupportedException(type.FullName);
});

2
src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
[SetUp]
public void Initialize()
{
ProfilingLogger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
ProfilingLogger = new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
var typeFinder = TestHelper.GetTypeFinder();
var ioHelper = TestHelper.IOHelper;

10
src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
var typeFinder = TestHelper.GetTypeFinder();
_typeLoader = new TypeLoader(typeFinder, NoAppCache.Instance,
new DirectoryInfo(TestHelper.IOHelper.MapPath("~/App_Data/TEMP")),
Mock.Of<ILogger<TypeLoader>>(), new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()), false,
Mock.Of<ILogger<TypeLoader>>(), new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()), false,
// for testing, we'll specify which assemblies are scanned for the PluginTypeResolver
// TODO: Should probably update this so it only searches this assembly and add custom types to be found
@@ -240,16 +240,16 @@ AnotherContentFinder
var list3 = new[] { f1, f3, f5, f7 };
//Act
var hash1 = GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
var hash2 = GetFileHash(list2, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
var hash3 = GetFileHash(list3, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
var hash1 = GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
var hash2 = GetFileHash(list2, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
var hash3 = GetFileHash(list3, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
//Assert
Assert.AreNotEqual(hash1, hash2);
Assert.AreNotEqual(hash1, hash3);
Assert.AreNotEqual(hash2, hash3);
Assert.AreEqual(hash1, GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())));
Assert.AreEqual(hash1, GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>())));
}
[Test]

3
src/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs
View File

@@ -4,6 +4,7 @@ using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Threading;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using Newtonsoft.Json;
@@ -224,7 +225,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Models
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = NullLoggerFactory.Instance.CreateLogger("ProfilingLogger");
var logger = NullLoggerFactory.Instance.CreateLogger<ProfilingLogger>();
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}

2
src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Published
{
private (IPublishedContentType, IPublishedContentType) CreateContentTypes()
{
var logger = Mock.Of<ILogger>();
var logger = Mock.Of<ILogger<ProfilingLogger>>();
var loggerFactory = NullLoggerFactory.Instance;
var profiler = Mock.Of<IProfiler>();
var proflog = new ProfilingLogger(logger, profiler);

2
src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
View File

@@ -40,7 +40,7 @@ namespace Umbraco.Tests.TestHelpers
var services = TestHelper.GetRegister();
var ioHelper = TestHelper.IOHelper;
var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
var logger = new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
var typeFinder = TestHelper.GetTypeFinder();
var typeLoader = new TypeLoader(typeFinder, NoAppCache.Instance,
new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),

2
src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
View File

@@ -109,7 +109,7 @@ namespace Umbraco.Tests.TestHelpers
contentFinders ?? new ContentFinderCollection(Enumerable.Empty<IContentFinder>()),
new TestLastChanceFinder(),
new TestVariationContextAccessor(),
new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()),
new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()),
Mock.Of<ILogger<PublishedRouter>>(),
Mock.Of<IPublishedUrlProvider>(),
Mock.Of<IRequestAccessor>(),

4
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -189,7 +189,7 @@ namespace Umbraco.Tests.Testing
_loggerFactory = loggerFactory;
var profiler = new LogProfiler(loggerFactory.CreateLogger<LogProfiler>());
var msLogger = loggerFactory.CreateLogger("msLogger");
var proflogger = new ProfilingLogger(loggerFactory.CreateLogger("ProfilingLogger"), profiler);
var proflogger = new ProfilingLogger(loggerFactory.CreateLogger<ProfilingLogger>(), profiler);
IOHelper = TestHelper.IOHelper;
TypeFinder = new TypeFinder(loggerFactory.CreateLogger<TypeFinder>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash());
@@ -207,7 +207,7 @@ namespace Umbraco.Tests.Testing
var services = TestHelper.GetRegister();
Builder = new UmbracoBuilder(services, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
Builder = new UmbracoBuilder(services, Mock.Of<IConfiguration>(), typeLoader);
//TestHelper.GetConfigs().RegisterWith(register);
services.AddUnique(typeof(ILoggerFactory), loggerFactory);

3
src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
View File

@@ -1,4 +1,5 @@
using System.IO;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using NUnit.Framework;
using Umbraco.Core;
@@ -20,7 +21,7 @@ namespace Umbraco.Tests.UmbracoExamine
{
// var logger = new SerilogLogger<object>(new FileInfo(TestHelper.MapPathForTestFiles("~/unit-test.config")));
_profilingLogger = new ProfilingLogger(NullLogger.Instance, new LogProfiler(NullLogger<LogProfiler>.Instance));
_profilingLogger = new ProfilingLogger(NullLoggerFactory.Instance.CreateLogger<ProfilingLogger>(), new LogProfiler(NullLogger<LogProfiler>.Instance));
}
private IProfilingLogger _profilingLogger;

2
src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
View File

@@ -159,7 +159,7 @@ namespace Umbraco.Tests.UmbracoExamine
public static IProfilingLogger GetMockProfilingLogger()
{
return new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
return new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
}
public static UmbracoContentIndex GetUmbracoIndexer(

2
src/Umbraco.Web/UmbracoApplicationBase.cs
View File

@@ -113,7 +113,7 @@ namespace Umbraco.Web
runtimeHashPaths.AddFile(new FileInfo(hostingEnvironment.MapPathContentRoot("~/App_Code")));
// global.asax (the app domain also monitors this, if it changes will do a full restart)
runtimeHashPaths.AddFile(new FileInfo(hostingEnvironment.MapPathContentRoot("~/global.asax")));
var runtimeHash = new RuntimeHash(new ProfilingLogger(_loggerFactory.CreateLogger("RuntimeHash"), profiler), runtimeHashPaths);
var runtimeHash = new RuntimeHash(new ProfilingLogger(_loggerFactory.CreateLogger<ProfilingLogger>(), profiler), runtimeHashPaths);
return new TypeFinder(_loggerFactory.CreateLogger<TypeFinder>(), new DefaultUmbracoAssemblyProvider(
// GetEntryAssembly was actually an exposed API by request of the aspnetcore team which works in aspnet core because a website
// in that case is essentially an exe. However in netframework there is no entry assembly, things don't really work that way since