Skip to content

Commit 7c76062

Browse files
committed
Fixed bug in DecodeCompareTextToCompareLog
1 parent 8302c54 commit 7c76062

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Test/UnitTests/EfSchemaCompare/CompareLogsTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,16 @@ public void DecodeStringToCompareLog()
2525
const string logStr2 =
2626
@"DIFFERENT: BookSummary->Property 'BookSummaryId', value generated. Expected = OnAdd, found = Never";
2727
const string logStr3 = @"OK: DbContext 'BookContext'";
28+
const string logStr4 =
29+
@"NOT IN DATABASE: BookDetail->ForeignKey 'FK_Books_Books_BookSummaryId', constraint name. Expected = FK_Books_Books_BookSummaryId";
2830

2931
//ATTEMPT
3032

3133
//VERIFY
3234
CompareLog.DecodeCompareTextToCompareLog(logStr1).ToString().ShouldEqual(logStr1.Replace("BookDetail->",""));
3335
CompareLog.DecodeCompareTextToCompareLog(logStr2).ToString().ShouldEqual(logStr2.Replace("BookSummary->", ""));
3436
CompareLog.DecodeCompareTextToCompareLog(logStr3).ToString().ShouldEqual(logStr3);
37+
CompareLog.DecodeCompareTextToCompareLog(logStr4).ToString().ShouldEqual(logStr4.Replace("BookDetail->", ""));
3538
}
3639

3740
private class CompareIgnoreLogs : IEnumerable<object[]>

TestSupport/EfSchemeCompare/CompareLog.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,12 @@ public static IEnumerable<string> ListAllErrors(IReadOnlyList<CompareLog> logs,
154154
}
155155
}
156156

157+
//-------------------------------------------------------
158+
//internal
157159

158-
public static CompareLog DecodeCompareTextToCompareLog(string str)
160+
internal static CompareLog DecodeCompareTextToCompareLog(string str)
159161
{
162+
str = str.Trim();
160163
var indexOfColon = str.IndexOf(':');
161164
var indexOfArrow = str.IndexOf("->", StringComparison.Ordinal);
162165
if (indexOfArrow < 0)
@@ -199,9 +202,6 @@ public static CompareLog DecodeCompareTextToCompareLog(string str)
199202
return new CompareLog(type, state, name, attribute, expected, found);
200203
}
201204

202-
//-------------------------------------------------------
203-
//internal
204-
205205
internal bool ShouldIIgnoreThisLog(IReadOnlyList<CompareLog> ignoreList)
206206
{
207207
return ignoreList.Any() && ignoreList.Any(ShouldBeIgnored);

0 commit comments

Comments
 (0)