Skip to content

Commit

Permalink
Rewrite diff generator (#666)
Browse files Browse the repository at this point in the history 
* Rewrite diff generator

It was mistakenly indicating diffs existed which were not different.

* Adds some tests for diff behavior
  • Loading branch information
@gfs
gfs authored Nov 1, 2022
1 parent 3faa145 commit 07e2f30
Show file tree
Hide file tree
Showing 2 changed files with 153 additions and 125 deletions.
152 changes: 27 additions & 125 deletions Lib/Collectors/BaseCompare.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public static List<Diff> GenerateDiffs(object? first, object? second)
}
IEnumerable<PropertyInfo> firstProperties = first.GetType().GetProperties();
IEnumerable<PropertyInfo> secondProperties = second.GetType().GetProperties();
IEnumerable<PropertyInfo> sharedProperties = firstProperties.Intersect(secondProperties);
IEnumerable<PropertyInfo> sharedProperties = firstProperties.Intersect(secondProperties).ToList();
firstProperties = firstProperties.Except(sharedProperties);
secondProperties = secondProperties.Except(sharedProperties);
foreach(var firstProperty in firstProperties)
Expand All @@ -172,7 +172,7 @@ public static List<Diff> GenerateDiffs(object? first, object? second)
{
continue;
}
diffs.Add(new Diff(secondProperty.Name, secondProperty.GetValue(first), null));
diffs.Add(new Diff(secondProperty.Name, null, secondProperty.GetValue(second)));
}

foreach (var prop in sharedProperties)
Expand All @@ -183,24 +183,20 @@ public static List<Diff> GenerateDiffs(object? first, object? second)
{
continue;
}
object? added = null;
object? removed = null;

object? firstProp = first is null ? first : prop.GetValue(first);
object? secondProp = second is null ? second : prop.GetValue(second);
if (firstProp == null && secondProp == null)
{
continue;
}
else if (firstProp == null && secondProp != null)
if (firstProp == null && secondProp != null)
{
added = prop.GetValue(second);
diffs.Add(new Diff(prop.Name, added, null));
diffs.Add(new Diff(prop.Name, null, prop.GetValue(second)));
}
else if (secondProp == null && firstProp != null)
{
removed = prop.GetValue(first);
diffs.Add(new Diff(prop.Name, null, removed));
diffs.Add(new Diff(prop.Name, prop.GetValue(first), null));
}
else
{
Expand All @@ -209,78 +205,37 @@ public static List<Diff> GenerateDiffs(object? first, object? second)

if (firstVal is List<string> && secondVal is List<string>)
{
added = ((List<string>)secondVal).Except((List<string>)firstVal);
removed = ((List<string>)firstVal).Except((List<string>)secondVal);
if (!((IEnumerable<string>)added).Any())
{
added = null;
}
if (!((IEnumerable<string>)removed).Any())
if (!compareLogic.Compare(firstVal, secondVal).AreEqual)
{
removed = null;
diffs.Add(new Diff(prop.Name, firstVal, secondVal));
}
}
else if (firstVal is List<KeyValuePair<string, string>> && secondVal is List<KeyValuePair<string, string>>)
{
added = ((List<KeyValuePair<string, string>>)secondVal).Except((List<KeyValuePair<string, string>>)firstVal);
removed = ((List<KeyValuePair<string, string>>)firstVal).Except((List<KeyValuePair<string, string>>)secondVal);
if (!((IEnumerable<KeyValuePair<string, string>>)added).Any())
{
added = null;
}
if (!((IEnumerable<KeyValuePair<string, string>>)removed).Any())
if (!compareLogic.Compare(firstVal, secondVal).AreEqual)
{
removed = null;
diffs.Add(new Diff(prop.Name, firstVal, secondVal));
}
}
else if (firstVal is Dictionary<string, string> && secondVal is Dictionary<string, string>)
{
added = ((Dictionary<string, string>)secondVal)
.Except((Dictionary<string, string>)firstVal)
.ToDictionary(x => x.Key, x => x.Value);

removed = ((Dictionary<string, string>)firstVal)
.Except((Dictionary<string, string>)secondVal)
.ToDictionary(x => x.Key, x => x.Value);
if (!((IEnumerable<KeyValuePair<string, string>>)added).Any())
{
added = null;
}
if (!((IEnumerable<KeyValuePair<string, string>>)removed).Any())
if (!compareLogic.Compare(firstVal, secondVal).AreEqual)
{
removed = null;
diffs.Add(new Diff(prop.Name, firstVal, secondVal));
}
}
else if (firstVal is Dictionary<string, List<string>> firstDictionary && secondVal is Dictionary<string, List<string>> secondDictionary)
{
added = secondDictionary
.Except(firstDictionary)
.ToDictionary(x => x.Key, x => x.Value);

removed = firstDictionary
.Except(secondDictionary)
.ToDictionary(x => x.Key, x => x.Value);
if (!((Dictionary<string, List<string>>)added).Any())
{
added = null;
}
if (!((Dictionary<string, List<string>>)removed).Any())
if (!compareLogic.Compare(firstVal, secondVal).AreEqual)
{
removed = null;
diffs.Add(new Diff(prop.Name, firstVal, secondVal));
}
}
else if (firstVal is Dictionary<(TpmAlgId, uint), byte[]> firstTpmAlgDict && secondVal is Dictionary<(TpmAlgId, uint), byte[]> secondTpmAlgDict)
{
added = secondTpmAlgDict.Where(x => !firstTpmAlgDict.ContainsKey(x.Key) || !firstTpmAlgDict[x.Key].SequenceEqual(x.Value));
removed = firstTpmAlgDict.Where(x => !secondTpmAlgDict.ContainsKey(x.Key) || !secondTpmAlgDict[x.Key].SequenceEqual(x.Value));

if (!((IEnumerable<KeyValuePair<(TpmAlgId, uint), byte[]>>)added).Any())
{
added = null;
}
if (!((IEnumerable<KeyValuePair<(TpmAlgId, uint), byte[]>>)removed).Any())
if (!compareLogic.Compare(firstVal, secondVal).AreEqual)
{
removed = null;
diffs.Add(new Diff(prop.Name, firstVal, secondVal));
}
}
else if ((firstVal is string || firstVal is int || firstVal is bool) && (secondVal is string || secondVal is int || secondVal is bool))
Expand All @@ -298,8 +253,6 @@ public static List<Diff> GenerateDiffs(object? first, object? second)
{
diffs.Add(new Diff(prop.Name, firstVal, secondVal));
}

diffs.Add(new Diff(prop.Name, added, removed));
}
}
catch (InvalidCastException e)
Expand Down Expand Up @@ -330,7 +283,7 @@ public static List<Diff> GenerateDiffs(object? first, object? second)
{
continue;
}
diffs.Add(new Diff(secondField.Name, secondField.GetValue(first), null));
diffs.Add(new Diff(secondField.Name, secondField.GetValue(second), null));
}
foreach (var field in sharedFields)
{
Expand All @@ -340,24 +293,20 @@ public static List<Diff> GenerateDiffs(object? first, object? second)
{
continue;
}
object? added = null;
object? removed = null;

object? firstField = field.GetValue(first);
object? secondField = field.GetValue(second);
if (firstField == null && secondField == null)
{
continue;
}
else if (firstField == null && secondField != null)
if (firstField == null && secondField != null)
{
added = field.GetValue(second);
diffs.Add(new Diff(field.Name, added, null));
diffs.Add(new Diff(field.Name, null, field.GetValue(second)));
}
else if (secondField == null && firstField != null)
{
removed = field.GetValue(first);
diffs.Add(new Diff(field.Name, null, removed));
diffs.Add(new Diff(field.Name, field.GetValue(first), null));
}
else
{
Expand All @@ -366,79 +315,34 @@ public static List<Diff> GenerateDiffs(object? first, object? second)

if (firstVal is List<string> && secondVal is List<string>)
{
added = ((List<string>)secondVal).Except((List<string>)firstVal);
removed = ((List<string>)firstVal).Except((List<string>)secondVal);
if (!((IEnumerable<string>)added).Any())
{
added = null;
}
if (!((IEnumerable<string>)removed).Any())
if (!compareLogic.Compare(firstVal, secondVal).AreEqual)
{
removed = null;
diffs.Add(new Diff(field.Name, firstVal, secondVal));
}
}
else if (firstVal is List<KeyValuePair<string, string>> && secondVal is List<KeyValuePair<string, string>>)
{
added = ((List<KeyValuePair<string, string>>)secondVal).Except((List<KeyValuePair<string, string>>)firstVal);
removed = ((List<KeyValuePair<string, string>>)firstVal).Except((List<KeyValuePair<string, string>>)secondVal);
if (!((IEnumerable<KeyValuePair<string, string>>)added).Any())
{
added = null;
}
if (!((IEnumerable<KeyValuePair<string, string>>)removed).Any())
if (!compareLogic.Compare(firstVal, secondVal).AreEqual)
{
removed = null;
diffs.Add(new Diff(field.Name, firstVal, secondVal));
}
}
else if (firstVal is Dictionary<string, string> && secondVal is Dictionary<string, string>)
{
added = ((Dictionary<string, string>)secondVal)
.Except((Dictionary<string, string>)firstVal)
.ToDictionary(x => x.Key, x => x.Value);

removed = ((Dictionary<string, string>)firstVal)
.Except((Dictionary<string, string>)secondVal)
.ToDictionary(x => x.Key, x => x.Value);
if (!((IEnumerable<KeyValuePair<string, string>>)added).Any())
{
added = null;
}
if (!((IEnumerable<KeyValuePair<string, string>>)removed).Any())
if (!compareLogic.Compare(firstVal, secondVal).AreEqual)
{
removed = null;
diffs.Add(new Diff(field.Name, firstVal, secondVal));
}
}
else if (firstVal is Dictionary<string, List<string>> firstDictionary && secondVal is Dictionary<string, List<string>> secondDictionary)
{
added = secondDictionary
.Except(firstDictionary)
.ToDictionary(x => x.Key, x => x.Value);
diffs.Add(new Diff(field.Name, firstVal, secondVal));

removed = firstDictionary
.Except(secondDictionary)
.ToDictionary(x => x.Key, x => x.Value);
if (!((Dictionary<string, List<string>>)added).Any())
{
added = null;
}
if (!((Dictionary<string, List<string>>)removed).Any())
{
removed = null;
}
}
else if (firstVal is Dictionary<(TpmAlgId, uint), byte[]> firstTpmAlgDict && secondVal is Dictionary<(TpmAlgId, uint), byte[]> secondTpmAlgDict)
{
added = secondTpmAlgDict.Where(x => !firstTpmAlgDict.ContainsKey(x.Key) || !firstTpmAlgDict[x.Key].SequenceEqual(x.Value));
removed = firstTpmAlgDict.Where(x => !secondTpmAlgDict.ContainsKey(x.Key) || !secondTpmAlgDict[x.Key].SequenceEqual(x.Value));
diffs.Add(new Diff(field.Name, firstVal, secondVal));

if (!((IEnumerable<KeyValuePair<(TpmAlgId, uint), byte[]>>)added).Any())
{
added = null;
}
if (!((IEnumerable<KeyValuePair<(TpmAlgId, uint), byte[]>>)removed).Any())
{
removed = null;
}
}
else if ((firstVal is string || firstVal is int || firstVal is bool) && (secondVal is string || secondVal is int || secondVal is bool))
{
Expand All @@ -455,8 +359,6 @@ public static List<Diff> GenerateDiffs(object? first, object? second)
{
diffs.Add(new Diff(field.Name, firstVal, secondVal));
}

diffs.Add(new Diff(field.Name, added, removed));
}
}
catch (InvalidCastException e)
Expand Down
Loading

0 comments on commit 07e2f30

Please sign in to comment.