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

Fix UdiRange.Parse() throwing ArgumentException for valid value (#16788)

Browse Source 
* Add test to assert UdiRange can round-trip all selectors

* Fix parsing UdiRange without a selector
This commit is contained in:
Ronald Barendse
2024-07-24 14:28:19 +02:00
committed by GitHub
parent 7e444e5604
commit 2f78d1a8f3
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Core/UdiRange.cs
View File

@@ -75,17 +75,25 @@ public class UdiRange
public static bool operator !=(UdiRange range1, UdiRange range2) => !(range1 == range2);
public static UdiRange Parse(string s)
public static UdiRange Parse(string value)
{
if (Uri.IsWellFormedUriString(s, UriKind.Absolute) == false
|| Uri.TryCreate(s, UriKind.Absolute, out Uri? uri) == false)
if (Uri.TryCreate(value, UriKind.Absolute, out Uri? uri) is false ||
uri.IsWellFormedOriginalString() is false)
{
// if (tryParse) return false;
throw new FormatException(string.Format("String \"{0}\" is not a valid udi range.", s));
throw new FormatException($"String \"{value}\" is not a valid UDI range.");
}
Uri udiUri = uri.Query == string.Empty ? uri : new UriBuilder(uri) { Query = string.Empty }.Uri;
return new UdiRange(Udi.Create(udiUri), uri.Query.TrimStart(Constants.CharArrays.QuestionMark));
// Remove selector from UDI
Uri udiUri = string.IsNullOrEmpty(uri.Query)
? uri
: new UriBuilder(uri) { Query = string.Empty }.Uri;
var udi = Udi.Create(udiUri);
// Only specify selector if query string is not empty
return string.IsNullOrEmpty(uri.Query)
? new UdiRange(udi)
: new UdiRange(udi, uri.Query.TrimStart(Constants.CharArrays.QuestionMark));
}
public override string ToString() => _uriValue.ToString();

15
tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs
View File

@@ -201,6 +201,21 @@ public class UdiTests
Assert.Throws<ArgumentException>(() => new UdiRange(guidUdi, "x"));
}
[Test]
[TestCase(Constants.DeploySelector.This)]
[TestCase(Constants.DeploySelector.ThisAndChildren)]
[TestCase(Constants.DeploySelector.ThisAndDescendants)]
[TestCase(Constants.DeploySelector.ChildrenOfThis)]
[TestCase(Constants.DeploySelector.DescendantsOfThis)]
[TestCase(Constants.DeploySelector.EntitiesOfType)]
public void RangeParseTest(string selector)
{
var expected = new UdiRange(Udi.Create(Constants.UdiEntityType.AnyGuid, Guid.NewGuid()), selector);
var actual = UdiRange.Parse(expected.ToString());
Assert.AreEqual(expected, actual);
}
[Test]
public void TryParseTest()
{