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

Merge branch 'main' into v17/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Services/DocumentUrlService.cs
This commit is contained in:
mole
2025-10-02 15:08:48 +02:00
parent 99c51a54f1 b35db9cb5b
commit 0ded9a74fb
24 changed files with 130 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/PackageManifestReaderTests.cs
View File

@@ -186,8 +186,9 @@ public class PackageManifestReaderTests
.Setup(f => f.GetEnumerator())
.Returns(new List<IFileInfo> { CreatePackageManifestFile(content) }.GetEnumerator());
Assert.ThrowsAsync<JsonException>(() => _reader.ReadPackageManifestsAsync());
EnsureLogErrorWasCalled();
var exception = Assert.ThrowsAsync<InvalidOperationException>(() => _reader.ReadPackageManifestsAsync());
Assert.NotNull(exception);
Assert.IsInstanceOf<JsonException>(exception.InnerException);
}
[Test]
@@ -202,8 +203,9 @@ public class PackageManifestReaderTests
.Setup(f => f.GetEnumerator())
.Returns(new List<IFileInfo> { CreatePackageManifestFile(content) }.GetEnumerator());
Assert.ThrowsAsync<JsonException>(() => _reader.ReadPackageManifestsAsync());
EnsureLogErrorWasCalled();
var exception = Assert.ThrowsAsync<InvalidOperationException>(() => _reader.ReadPackageManifestsAsync());
Assert.NotNull(exception);
Assert.IsInstanceOf<JsonException>(exception.InnerException);
}
[Test]
@@ -224,8 +226,9 @@ public class PackageManifestReaderTests
.Setup(f => f.GetEnumerator())
.Returns(new List<IFileInfo> { CreatePackageManifestFile(content) }.GetEnumerator());
Assert.ThrowsAsync<JsonException>(() => _reader.ReadPackageManifestsAsync());
EnsureLogErrorWasCalled();
var exception = Assert.ThrowsAsync<InvalidOperationException>(() => _reader.ReadPackageManifestsAsync());
Assert.NotNull(exception);
Assert.IsInstanceOf<JsonException>(exception.InnerException);
}
[TestCase("This is not JSON")]
@@ -236,20 +239,11 @@ public class PackageManifestReaderTests
.Setup(f => f.GetEnumerator())
.Returns(new List<IFileInfo> { CreatePackageManifestFile(content) }.GetEnumerator());
Assert.ThrowsAsync<JsonException>(() => _reader.ReadPackageManifestsAsync());
EnsureLogErrorWasCalled();
var exception = Assert.ThrowsAsync<InvalidOperationException>(() => _reader.ReadPackageManifestsAsync());
Assert.NotNull(exception);
Assert.IsInstanceOf<JsonException>(exception.InnerException);
}
private void EnsureLogErrorWasCalled(int numberOfTimes = 1) =>
_loggerMock.Verify(
x => x.Log(
It.Is<LogLevel>(l => l == LogLevel.Error),
It.IsAny<EventId>(),
It.Is<It.IsAnyType>((v, t) => true),
It.IsAny<Exception>(),
It.Is<Func<It.IsAnyType, Exception, string>>((v, t) => true)),
Times.Exactly(numberOfTimes));
private IFileInfo CreateDirectoryMock(string path, params IFileInfo[] children)
{
var directoryContentsMock = new Mock<IDirectoryContents>();