-
-
Notifications
You must be signed in to change notification settings - Fork 92
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
Provide possible suggestions for unknown fields #1106
Merged
tomkerkhove
merged 2 commits into
tomkerkhove:master
from
adamconnelly:field-suggestions
Jun 23, 2020
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
src/Promitor.Tests.Unit/Serialization/DeserializationContextTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
using System.Collections.Generic; | ||
using System.Reflection; | ||
using Promitor.Core.Scraping.Configuration.Serialization; | ||
using Xunit; | ||
|
||
namespace Promitor.Tests.Unit.Serialization | ||
{ | ||
public class DeserializationContextTests | ||
{ | ||
[Fact] | ||
public void GetSuggestions_NoFieldsConfigured_Empty() | ||
{ | ||
// Arrange | ||
var context = new DeserializationContext<Person>( | ||
new HashSet<string>(), new List<FieldDeserializationInfo>()); | ||
|
||
// Act | ||
var suggestions = context.GetSuggestions("job"); | ||
|
||
// Assert | ||
Assert.Empty(suggestions); | ||
} | ||
|
||
[Fact] | ||
public void GetSuggestions_CloseEnoughSuggestion_ReturnsSuggestion() | ||
{ | ||
// Arrange | ||
var fields = new List<FieldDeserializationInfo> | ||
{ | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Name))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Age))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Country))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.County))) | ||
}; | ||
var context = new DeserializationContext<Person>(new HashSet<string>(), fields); | ||
|
||
// Act | ||
var suggestions = context.GetSuggestions("nmae"); | ||
|
||
// Assert | ||
Assert.Collection(suggestions, suggestion => Assert.Equal("name", suggestion)); | ||
} | ||
|
||
[Fact] | ||
public void GetSuggestions_CloseEnoughSuggestion_ReturnsAllSuggestions() | ||
{ | ||
// Arrange | ||
var fields = new List<FieldDeserializationInfo> | ||
{ | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Name))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Age))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Country))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.County))) | ||
}; | ||
var context = new DeserializationContext<Person>(new HashSet<string>(), fields); | ||
|
||
// Act | ||
var suggestions = context.GetSuggestions("count"); | ||
|
||
// Assert | ||
Assert.Collection(suggestions, | ||
suggestion => Assert.Equal("country", suggestion), | ||
suggestion => Assert.Equal("county", suggestion)); | ||
} | ||
|
||
[Fact] | ||
public void GetSuggestions_IgnoredFields_IncludesIgnoredFieldsInSuggestions() | ||
{ | ||
// Arrange | ||
var fields = new List<FieldDeserializationInfo> | ||
{ | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Name))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Age))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.Country))), | ||
CreateField(typeof(Person).GetProperty(nameof(Person.County))) | ||
}; | ||
var ignoredFields = new HashSet<string> { "named" }; | ||
var context = new DeserializationContext<Person>(ignoredFields, fields); | ||
|
||
// Act | ||
var suggestions = context.GetSuggestions("nam"); | ||
|
||
// Assert | ||
Assert.Collection(suggestions, | ||
suggestion => Assert.Equal("name", suggestion), | ||
suggestion => Assert.Equal("named", suggestion)); | ||
} | ||
|
||
private FieldDeserializationInfo CreateField(PropertyInfo propertyInfo) | ||
{ | ||
return new FieldDeserializationInfo(propertyInfo, false, null, null, null); | ||
} | ||
|
||
public class Person | ||
{ | ||
public string Name { get; set; } | ||
public int Age { get; set; } | ||
public string Country { get; set; } | ||
public string County { get; set; } | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks a lot better, thanks 👌
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah - I think we can simplify it even more by adding support for deserializing
YamlSequenceNode
objects, but I didn't want to change too much at once (or have to figure out how to do that 😄).