Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JonathanCrd 5003 - comparison methods for ResourceIdentifier #20456

Merged
merged 5 commits into from
Apr 16, 2021
Merged

JonathanCrd 5003 - comparison methods for ResourceIdentifier #20456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10f6ad0
Change the accessbility to virtual for Resource.Id
YalinLi0312 Mar 24, 2021
ccc17c7
merge from usptream
Apr 5, 2021
5060f5c
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash Apr 12, 2021
16a340d
Operators == and != overloads in ResourceIdentifier
JonathanCrd Apr 16, 2021
1747ee3
Added EqualsToString Tests and TestCases
JonathanCrd Apr 16, 2021
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
22 changes: 22 additions & 0 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/Resources/ResourceIdentifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,5 +446,27 @@ public override int GetHashCode()
/// </summary>
/// <param name="id"> The resource identifier. </param>
public static implicit operator string(ResourceIdentifier id) => id?.ToString();

/// <summary>
/// Operator overloading for '=='.
/// </summary>
/// <param name="id1">Left ResourceIdentifier object to compare.</param>
/// <param name="id2">Right ResourceIdentifier object to compare.</param>
/// <returns></returns>
public static bool operator ==(ResourceIdentifier id1, ResourceIdentifier id2)
{
return ResourceIdentifier.Equals(id1,id2);
}

/// <summary>
/// Operator overloading for '!='.
/// </summary>
/// <param name="id1">Left ResourceIdentifier object to compare.</param>
/// <param name="id2">Right ResourceIdentifier object to compare.</param>
/// <returns></returns>
public static bool operator !=(ResourceIdentifier id1, ResourceIdentifier id2)
{
return !ResourceIdentifier.Equals(id1,id2);
}
}
}
74 changes: 73 additions & 1 deletion sdk/resourcemanager/Azure.ResourceManager.Core/tests/Unit/ResourceIdentifierTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public void CheckHashCode(bool expected, string resourceId1, string resourceId2)
[TestCase(ChildResourceId, TrackedResourceId, false)]
[TestCase(TrackedResourceId, null, false)]
[TestCase(null, TrackedResourceId, false)]
public void Equals(string resourceProviderID1, string resourceProviderID2, bool expected)
public void EqualsToResourceIdentifier(string resourceProviderID1, string resourceProviderID2, bool expected)
{
ResourceIdentifier a = resourceProviderID1;
ResourceIdentifier b = resourceProviderID2;
Expand All @@ -268,6 +268,22 @@ public void Equals(string resourceProviderID1, string resourceProviderID2, bool
Assert.AreEqual(expected, ResourceIdentifier.Equals(a,b));
}

[TestCase(TrackedResourceId, TrackedResourceId, true)]
[TestCase(ChildResourceId, ChildResourceId, true)]
[TestCase(null, null, true)]
[TestCase(TrackedResourceId, ChildResourceId, false)]
[TestCase(ChildResourceId, TrackedResourceId, false)]
[TestCase(TrackedResourceId, null, false)]
[TestCase(null, TrackedResourceId, false)]
public void EqualsToString(string resourceProviderID1, string resourceProviderID2, bool expected)
{
ResourceIdentifier a = resourceProviderID1;
if (a != null)
Assert.AreEqual(expected, a.Equals(resourceProviderID2));

Assert.AreEqual(expected, ResourceIdentifier.Equals(a, resourceProviderID2));
}

[Test]
public void EqualsObj()
{
Expand Down Expand Up @@ -637,5 +653,61 @@ public void TestAppendLocationChildResource(string resourceId, string childTypeN
Assert.AreEqual(expected, resource.AppendChildResource(childTypeName, childResourceName).ToString());
}
}

[TestCase(TrackedResourceId, TrackedResourceId, true, "object")]
[TestCase(ChildResourceId, ChildResourceId, true, "object")]
[TestCase(null, null, true, "object")]
[TestCase(TrackedResourceId, ChildResourceId, false, "object")]
[TestCase(ChildResourceId, TrackedResourceId, false, "object")]
[TestCase(TrackedResourceId, null, false, "object")]
[TestCase(null, TrackedResourceId, false, "object")]
[TestCase(TrackedResourceId, TrackedResourceId, true, "string")]
[TestCase(ChildResourceId, ChildResourceId, true, "string")]
[TestCase(null, null, true, "string")]
[TestCase(TrackedResourceId, ChildResourceId, false, "string")]
[TestCase(ChildResourceId, TrackedResourceId, false, "string")]
[TestCase(TrackedResourceId, null, false, "string")]
[TestCase(null, TrackedResourceId, false, "string")]
public void EqualsOperator(string resourceProviderID1, string resourceProviderID2, bool expected, string comparisonType)
{
ResourceIdentifier a = resourceProviderID1;
if(comparisonType == "object")
{
ResourceIdentifier b = resourceProviderID2;
Assert.AreEqual(expected, a == b);
}
else
{
Assert.AreEqual(expected, a == resourceProviderID2);
}
}

[TestCase(TrackedResourceId, TrackedResourceId, false, "object")]
[TestCase(ChildResourceId, ChildResourceId, false, "object")]
[TestCase(null, null, false, "object")]
[TestCase(TrackedResourceId, ChildResourceId, true, "object")]
[TestCase(ChildResourceId, TrackedResourceId, true, "object")]
[TestCase(TrackedResourceId, null, true, "object")]
[TestCase(null, TrackedResourceId, true, "object")]
[TestCase(TrackedResourceId, TrackedResourceId, false, "string")]
[TestCase(ChildResourceId, ChildResourceId, false, "string")]
[TestCase(null, null, false, "string")]
[TestCase(TrackedResourceId, ChildResourceId, true, "string")]
[TestCase(ChildResourceId, TrackedResourceId, true, "string")]
[TestCase(TrackedResourceId, null, true, "string")]
[TestCase(null, TrackedResourceId, true, "string")]
public void NotEqualsOperator(string resourceProviderID1, string resourceProviderID2, bool expected, string comparisonType)
{
ResourceIdentifier a = resourceProviderID1;
if (comparisonType == "object")
{
ResourceIdentifier b = resourceProviderID2;
Assert.AreEqual(expected, a != b);
}
else
{
Assert.AreEqual(expected, a != resourceProviderID2);
}
}
}
}