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.

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

DataCollector check with only Uri in Runsettings #2177

Merged

Conversation

hvinett
Copy link
Contributor

@hvinett hvinett commented Sep 17, 2019

Description

removing friendly name check when only Uri is given in run settings
If Uri is correct it proceeds with Uri otherwise if friendly name is correct we get the first uri with that friendly name and proceeds with it. In rest of the cases it shows error.

Related issue

#1952

Behavior

Friendly name Uri Result
correct null Find URI using friendly name
correct empty/invalid Invalid URI Exception
correct wrong uri Find URI using friendly name
null correct Use this URI
empty correct Invalid Friendly Name Exception
wrong correct Use the URI
correct correct Use the URI directly
wrong wrong Invalid data collector warning

@singhsarab
Copy link
Contributor

@hvinett Can you please resolve the comments and complete this one first.

@@ -43,7 +43,12 @@ public DataCollectionManagerTests()

this.dataCollectorSettings = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
this.dataCollectorSettingsWithWrongFriendlyName = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, "anyFriendlyName", uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
this.dataCollectorSettingsWithoutFriendlyName = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, string.Empty, uri, this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty).Replace("friendlyName=\"\"", string.Empty));
this.dataCollectorSettingsWithWrongUri = string.Format(this.defaultRunSettings, string.Format(this.defaultDataCollectionSettings, friendlyName, "my://custom/WrongDatacollector", this.mockDataCollector.Object.GetType().AssemblyQualifiedName, typeof(DataCollectionManagerTests).GetTypeInfo().Assembly.Location, string.Empty));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this.dataCollectorSettingsWithWrongUri [](start = 12, length = 39)

Why do these have to be a member variable?

@singhsarab singhsarab merged commit f0cd370 into microsoft:master Oct 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants