Merge branch 'fixes/git-log-entry-default' into enhancements/history-list-view

Author: StanleyGoldman

src/GitHub.Api/Git/GitLogEntry.cs

@@ -11,7 +11,7 @@ public struct GitLogEntry
         private const string Today = "Today";
         private const string Yesterday = "Yesterday";
 
-        public static GitLogEntry Default = new GitLogEntry(String.Empty, String.Empty, String.Empty, String.Empty, String.Empty, String.Empty, String.Empty, String.Empty, String.Empty, new List<GitStatusEntry>(), String.Empty, String.Empty);
+        public static GitLogEntry Default = new GitLogEntry(String.Empty, String.Empty, String.Empty, String.Empty, String.Empty, String.Empty, String.Empty, DateTimeOffset.MinValue, DateTimeOffset.MinValue, new List<GitStatusEntry>(), String.Empty, String.Empty);
 
         public string commitID;
         public string mergeA;
@@ -61,43 +61,6 @@ public GitLogEntry(string commitID,
             this.mergeB = mergeB ?? string.Empty;
         }
 
-        public GitLogEntry(string commitID, 
-            string authorName, string authorEmail, 
-            string commitName, string commitEmail, 
-            string summary, 
-            string description, 
-            string timeString, string commitTimeString, 
-            List<GitStatusEntry> changes, 
-            string mergeA = null, string mergeB = null) : this()
-        {
-            Guard.ArgumentNotNull(commitID, "commitID");
-            Guard.ArgumentNotNull(authorName, "authorName");
-            Guard.ArgumentNotNull(authorEmail, "authorEmail");
-            Guard.ArgumentNotNull(commitEmail, "commitEmail");
-            Guard.ArgumentNotNull(commitName, "commitName");
-            Guard.ArgumentNotNull(summary, "summary");
-            Guard.ArgumentNotNull(description, "description");
-            Guard.ArgumentNotNull(timeString, "timeString");
-            Guard.ArgumentNotNull(commitTimeString, "commitTimeString");
-            Guard.ArgumentNotNull(changes, "changes");
-
-            this.commitID = commitID;
-            this.authorName = authorName;
-            this.authorEmail = authorEmail;
-            this.commitEmail = commitEmail;
-            this.commitName = commitName;
-            this.summary = summary;
-            this.description = description;
-
-            this.timeString = timeString;
-            this.commitTimeString = commitTimeString;
-
-            this.changes = changes;
-
-            this.mergeA = mergeA ?? string.Empty;
-            this.mergeB = mergeB ?? string.Empty;
-        }
-
         public string PrettyTimeString
         {
             get
@@ -118,7 +81,15 @@ public DateTimeOffset Time
             {
                 if (!timeValue.HasValue)
                 {
-                    timeValue = DateTimeOffset.ParseExact(TimeString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None);
+                    DateTimeOffset result;
+                    if (DateTimeOffset.TryParseExact(TimeString, Constants.Iso8601Format, CultureInfo.InvariantCulture,DateTimeStyles.None, out result))
+                    {
+                        timeValue = result;
+                    }
+                    else
+                    {
+                        Time = DateTimeOffset.MinValue;
+                    }
                 }
 
                 return timeValue.Value;
@@ -137,7 +108,15 @@ public DateTimeOffset CommitTime
             {
                 if (!commitTimeValue.HasValue)
                 {
-                    commitTimeValue = DateTimeOffset.ParseExact(CommitTimeString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None);
+                    DateTimeOffset result;
+                    if (DateTimeOffset.TryParseExact(CommitTimeString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    {
+                        commitTimeValue = result;
+                    }
+                    else
+                    {
+                        CommitTime = DateTimeOffset.MinValue;
+                    }
                 }
 
                 return commitTimeValue.Value;

src/tests/UnitTests/IO/GitLogEntryListTests.cs

@@ -85,11 +85,10 @@ public void ListOf1ShouldEqualListOf1()
                     "Summary", 
                     "Description", 
                     commitTime, commitTime,
-                    new List<GitStatusEntry>(new[]
+                    new List<GitStatusEntry>
                     {
-                        new GitStatusEntry("SomePath", "SomeFullPath", "SomeProjectPath", GitFileStatus.Added,
-                            "SomeOriginalPath"),
-                    }),
+                        new GitStatusEntry("SomePath", "SomeFullPath", "SomeProjectPath", GitFileStatus.Added, "SomeOriginalPath"),
+                    },
                     "MergeA", "MergeB")
             };
 
@@ -125,11 +124,10 @@ public void ListOf2ShouldEqualListOf2()
                     "AuthorName", "AuthorEmail",
                     "Summary", "Description", 
                     commitTime, commitTime,
-                    new List<GitStatusEntry>(new[]
+                    new List<GitStatusEntry>
                     {
-                        new GitStatusEntry("SomePath", "SomeFullPath", "SomeProjectPath", GitFileStatus.Added,
-                            "SomeOriginalPath"),
-                    }),
+                        new GitStatusEntry("SomePath", "SomeFullPath", "SomeProjectPath", GitFileStatus.Added, "SomeOriginalPath"),
+                    },
                     "MergeA", "MergeB"),
                 new GitLogEntry("`CommitID",
                     "`AuthorName", "`AuthorEmail", 
@@ -143,28 +141,27 @@ public void ListOf2ShouldEqualListOf2()
 
             var otherEntries = new[]
             {
-                new GitLogEntry("`CommitID",
-                    "`AuthorName", "`AuthorEmail", 
-                    "`AuthorName", "`AuthorEmail", 
-                    "`Summary", 
-                    "`Description", 
-                    commitTime, commitTime,
-                    new List<GitStatusEntry>(new[]
-                    {
-                        new GitStatusEntry("SomePath", "SomeFullPath", "SomeProjectPath", GitFileStatus.Added,
-                            "SomeOriginalPath"),
-                    }),
-                    "`MergeA", "`MergeB"),
                 new GitLogEntry("CommitID", 
                     "AuthorName", "AuthorEmail",
                     "AuthorName", "AuthorEmail", 
                     "Summary", 
                     "Description", 
                     commitTime, commitTime,
-                    new List<GitStatusEntry>(), 
-                    "MergeA", "MergeB")
+                    new List<GitStatusEntry> {
+                        new GitStatusEntry("SomePath", "SomeFullPath", "SomeProjectPath", GitFileStatus.Added, "SomeOriginalPath")
+                    }, 
+                    "MergeA", "MergeB"),
+                new GitLogEntry("`CommitID",
+                    "`AuthorName", "`AuthorEmail", 
+                    "`AuthorName", "`AuthorEmail", 
+                    "`Summary", 
+                    "`Description", 
+                    commitTime, commitTime,
+                    new List<GitStatusEntry>(),
+                    "`MergeA", "`MergeB")
             };
 
+
             entries.AssertEqual(otherEntries);
         }