Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
Expand All @@ -18,6 +18,7 @@
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
<add key="nuget-public" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,24 +104,7 @@ public void SetupHostShouldSetChildDomainsAppBaseToTestSourceLocation()
_ = new DummyClass();

string location = typeof(TestSourceHost).Assembly.Location;
Mock<TestSourceHost> sourceHost = new(location, null) { CallBase = true };

try
{
// Act
sourceHost.Object.SetupHost();
var expectedObject = sourceHost.Object.CreateInstanceForType(typeof(DummyClass), null) as DummyClass;

// Assert
expectedObject?.AppDomainAppBase.Should().Be(Path.GetDirectoryName(typeof(DesktopTestSourceHostTests).Assembly.Location));
}
finally
{
sourceHost.Object.Dispose();
}
}

public void SetupHostShouldHaveParentDomainsAppBaseSetToTestSourceLocation()
Mock<TestSourceHost> sourceHost = new(location, (IRunSettings?)null) { CallBase = true };
{
// Arrange
DummyClass dummyClass = new();
Expand Down Expand Up @@ -161,15 +144,7 @@ public void SetupHostShouldSetResolutionsPaths()
DummyClass dummyClass = new();

string location = typeof(TestSourceHost).Assembly.Location;
Mock<TestSourceHost> sourceHost = new(location, null) { CallBase = true };

try
{
// Act
sourceHost.Object.SetupHost();

// Assert
sourceHost.Verify(sh => sh.GetResolutionPaths(location, It.IsAny<bool>()), Times.Once);
Mock<TestSourceHost> sourceHost = new(location, (IRunSettings?)null) { CallBase = true };
}
finally
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public async Task BuildAsync_NoProviders_ReturnsNonNullFactory()
LoggingManager manager = new();
ILoggerFactory factory = await manager.BuildAsync(_mockServiceProvider.Object, LogLevel.Information, _mockMonitor.Object);
Assert.IsNotNull(factory);
factory.CreateLogger("smoke");
ILogger logger = factory.CreateLogger("smoke");
Assert.IsNotNull(logger);
}

[TestMethod]
Expand Down Expand Up @@ -70,7 +71,7 @@ public async Task BuildAsync_NonExtensionProvider_IsAlwaysIncluded()
manager.AddProvider((_, _) => mockProvider.Object);

ILoggerFactory factory = await manager.BuildAsync(_mockServiceProvider.Object, LogLevel.Information, _mockMonitor.Object);
factory.CreateLogger("test");
_ = factory.CreateLogger("test");

mockProvider.Verify(p => p.CreateLogger("test"), Times.Once);
}
Expand All @@ -85,7 +86,7 @@ public async Task BuildAsync_EnabledExtensionProvider_IsIncluded()
manager.AddProvider((_, _) => mockProvider.Object);

ILoggerFactory factory = await manager.BuildAsync(_mockServiceProvider.Object, LogLevel.Information, _mockMonitor.Object);
factory.CreateLogger("test");
_ = factory.CreateLogger("test");

mockProvider.Verify(p => p.CreateLogger("test"), Times.Once);
}
Expand All @@ -99,7 +100,7 @@ public async Task BuildAsync_DisabledExtensionProvider_IsExcluded()
manager.AddProvider((_, _) => mockProvider.Object);

ILoggerFactory factory = await manager.BuildAsync(_mockServiceProvider.Object, LogLevel.Information, _mockMonitor.Object);
factory.CreateLogger("test");
_ = factory.CreateLogger("test");

mockProvider.Verify(p => p.CreateLogger(It.IsAny<string>()), Times.Never);
}
Expand All @@ -115,7 +116,7 @@ public async Task BuildAsync_InitializableExtensionProvider_WhenEnabled_CallsIni
manager.AddProvider((_, _) => mockProvider.Object);

ILoggerFactory factory = await manager.BuildAsync(_mockServiceProvider.Object, LogLevel.Information, _mockMonitor.Object);
factory.CreateLogger("test");
_ = factory.CreateLogger("test");

mockProvider.Verify(p => p.InitializeAsync(), Times.Once);
mockProvider.Verify(p => p.CreateLogger("test"), Times.Once);
Expand Down Expand Up @@ -144,7 +145,7 @@ public async Task BuildAsync_NonExtensionInitializableProvider_CallsInitializeAs
manager.AddProvider((_, _) => mockProvider.Object);

ILoggerFactory factory = await manager.BuildAsync(_mockServiceProvider.Object, LogLevel.Information, _mockMonitor.Object);
factory.CreateLogger("test");
_ = factory.CreateLogger("test");

mockProvider.Verify(p => p.InitializeAsync(), Times.Once);
mockProvider.Verify(p => p.CreateLogger("test"), Times.Once);
Expand Down
Loading