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

remove default location from armclientoptions #22633

Merged
merged 5 commits into from
Jul 13, 2021
Merged

remove default location from armclientoptions #22633

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
f6ff53a
organize classes
m-nash Jul 13, 2021
c4254b3
merge from feature mgmt-track2
m-nash Jul 13, 2021
2699a44
remove unused method
m-nash Jul 13, 2021
b1449b3
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash Jul 13, 2021
ee73561
remove defaut location from armclientoptions
m-nash Jul 13, 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
20 changes: 1 addition & 19 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/ArmClientOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,10 @@ public sealed class ArmClientOptions : ClientOptions
/// Initializes a new instance of the <see cref="ArmClientOptions"/> class.
/// </summary>
public ArmClientOptions()
: this(Location.Default)
{
}

/// <summary>
/// Initializes a new instance of the <see cref="ArmClientOptions"/> class.
/// </summary>
/// <param name="defaultLocation"> The default location to use if can't be inherited from parent. </param>
public ArmClientOptions(Location defaultLocation)
{
if (defaultLocation is null)
throw new ArgumentNullException(nameof(defaultLocation));

DefaultLocation = defaultLocation;
ApiVersions = new ApiVersions(this);
}

/// <summary>
/// Gets the default location to use if can't be inherited from parent.
/// </summary>
public Location DefaultLocation { get; }

/// <summary>
/// Gets override object.
/// </summary>
Expand All @@ -63,7 +45,7 @@ public object GetOverrideObject<T>(Func<object> objectConstructor)

internal ArmClientOptions Clone()
{
ArmClientOptions copy = new ArmClientOptions(DefaultLocation);
ArmClientOptions copy = new ArmClientOptions();

copy.ApiVersions = ApiVersions.Clone();
copy.Transport = Transport;
Expand Down
9 changes: 0 additions & 9 deletions sdk/resourcemanager/Azure.ResourceManager.Core/tests/Scenario/ClientContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ public override void OnReceivedResponse(HttpMessage message)
}
}

[TestCase]
[RecordedTest]
public void ValidateOptionsTestLocation()
{
var x = new ArmClientOptions();
var y = x.Clone();
Assert.IsTrue(ReferenceEquals(x.DefaultLocation, y.DefaultLocation));
}

[TestCase]
[RecordedTest]
public void ValidateOptionsTestApiVersions()
Expand Down
53 changes: 0 additions & 53 deletions ...anager.Core/tests/SessionRecords/ArmClientOptionsTests/TestClientOptionsParamCheck().json
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions ...r.Core/tests/SessionRecords/ArmClientOptionsTests/TestClientOptionsParamCheck()Async.json
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions ...ceManager.Core/tests/SessionRecords/ClientContextTests/ValidateOptionsTestLocation().json
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions ...ager.Core/tests/SessionRecords/ClientContextTests/ValidateOptionsTestLocation()Async.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions sdk/resourcemanager/Azure.ResourceManager.Core/tests/Unit/ArmClientOptionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,6 @@ public void MultiClientSeparateVersions()
Assert.AreEqual(FakeResourceApiVersions.V2019_12_01, options2.FakeRestApiVersions().FakeResourceVersion);
}

[TestCase]
public void TestClientOptionsParamCheck()
{
Assert.Throws<ArgumentNullException>(() => { new ArmClientOptions(null); });
}

[TestCase]
public void VersionExist()
{
Expand Down