Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 178f17d

Browse files
StanleyGoldmanStanleyGoldman
committed
Finishing the conversion
1 parent 94414b0 commit 178f17d

File tree

5 files changed

+28
-63
lines changed

5 files changed

+28
-63
lines changed

‎src/GitHub.Api/Git/GitLogEntry.cs

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Globalization;
34
using System.Text;
45

56
namespace GitHub.Unity
@@ -44,25 +45,43 @@ public string PrettyTimeString
4445
}
4546
}
4647

47-
[NonSerialized] public DateTimeOffset timeValue;
48+
[NonSerialized] public DateTimeOffset? timeValue;
4849
public DateTimeOffset TimeValue
4950
{
50-
get { return timeValue; }
51-
set { timeValue = value; }
51+
get
52+
{
53+
if (!timeValue.HasValue)
54+
{
55+
timeValue = DateTimeOffset.Parse(TimeString);
56+
}
57+
58+
return timeValue.Value;
59+
}
5260
}
5361

54-
[NonSerialized] public DateTimeOffset commitTimeValue;
55-
public DateTimeOffset CommitTimeValue
62+
[NonSerialized] public DateTimeOffset? commitTimeValue;
63+
public DateTimeOffset? CommitTimeValue
5664
{
57-
get { return commitTimeValue; }
58-
set { commitTimeValue = value; }
65+
get
66+
{
67+
if (!timeValue.HasValue && !string.IsNullOrEmpty(CommitTimeString))
68+
{
69+
commitTimeValue = DateTimeOffset.Parse(CommitTimeString);
70+
}
71+
72+
return commitTimeValue;
73+
}
5974
}
6075

6176
public void Clear()
6277
{
6378
CommitID = MergeA = MergeB = AuthorName = AuthorEmail = Summary = Description = "";
64-
TimeValue = DateTimeOffset.Now;
65-
Changes = new List<GitStatusEntry>();
79+
80+
timeValue = DateTimeOffset.MinValue;
81+
TimeString = timeValue.Value.ToString(DateTimeFormatInfo.CurrentInfo);
82+
83+
commitTimeValue = null;
84+
CommitTimeString = null;
6685
}
6786

6887
public override string ToString()

‎src/tests/IntegrationTests/Process/ProcessManagerIntegrationTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ public async Task LogEntriesTest()
5959
Summary = "Moving project files where they should be kept",
6060
TimeString = firstCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
6161
CommitTimeString = firstCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
62-
TimeValue = firstCommitTime,
63-
CommitTimeValue = firstCommitTime,
6462
},
6563
new GitLogEntry
6664
{
@@ -79,8 +77,6 @@ public async Task LogEntriesTest()
7977
Summary = "Initial Commit",
8078
TimeString = secondCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
8179
CommitTimeString = secondCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
82-
TimeValue = secondCommitTime,
83-
CommitTimeValue = secondCommitTime,
8480
},
8581
});
8682
}
@@ -116,8 +112,6 @@ public async Task RussianLogEntriesTest()
116112
Summary = "Я люблю github",
117113
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
118114
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
119-
TimeValue = commitTime,
120-
CommitTimeValue = commitTime
121115
}
122116
});
123117
}

‎src/tests/UnitTests/IO/GitLogEntryListTests.cs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ public void NullListShouldNotEqualListOf1()
4646
Description = "Description",
4747
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
4848
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
49-
TimeValue = commitTime,
50-
CommitTimeValue = commitTime
5149
}
5250
};
5351
GitLogEntry[] otherEntries = null;
@@ -73,8 +71,6 @@ public void EmptyListShouldNotEqualListOf1()
7371
Description = "Description",
7472
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
7573
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
76-
TimeValue = commitTime,
77-
CommitTimeValue = commitTime
7874
}
7975
};
8076
GitLogEntry[] otherEntries = new GitLogEntry[0];
@@ -104,8 +100,6 @@ public void ListOf1ShouldEqualListOf1()
104100
Description = "Description",
105101
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
106102
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
107-
TimeValue = commitTime,
108-
CommitTimeValue = commitTime
109103
}
110104
};
111105

@@ -127,8 +121,6 @@ public void ListOf1ShouldEqualListOf1()
127121
Description = "Description",
128122
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
129123
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
130-
TimeValue = commitTime,
131-
CommitTimeValue = commitTime
132124
}
133125
};
134126

@@ -159,8 +151,6 @@ public void ListOf2ShouldEqualListOf2()
159151
Description = "Description",
160152
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
161153
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
162-
TimeValue = commitTime,
163-
CommitTimeValue = commitTime
164154
},
165155
new GitLogEntry
166156
{
@@ -174,8 +164,6 @@ public void ListOf2ShouldEqualListOf2()
174164
Description = "OtherDescription",
175165
TimeString = otherCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
176166
CommitTimeString = otherCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
177-
TimeValue = otherCommitTime,
178-
CommitTimeValue = otherCommitTime
179167
}
180168
};
181169

@@ -197,8 +185,6 @@ public void ListOf2ShouldEqualListOf2()
197185
Description = "Description",
198186
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
199187
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
200-
TimeValue = commitTime,
201-
CommitTimeValue = commitTime
202188
},
203189
new GitLogEntry
204190
{
@@ -212,8 +198,6 @@ public void ListOf2ShouldEqualListOf2()
212198
Description = "OtherDescription",
213199
TimeString = otherCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
214200
CommitTimeString = otherCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
215-
TimeValue = otherCommitTime,
216-
CommitTimeValue = otherCommitTime
217201
}
218202
};
219203

@@ -244,8 +228,6 @@ public void ListOf2ShouldNotEqualListOf2InDifferentOrder()
244228
Description = "Description",
245229
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
246230
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
247-
TimeValue = commitTime,
248-
CommitTimeValue = commitTime
249231
},
250232
new GitLogEntry
251233
{
@@ -259,8 +241,6 @@ public void ListOf2ShouldNotEqualListOf2InDifferentOrder()
259241
Description = "OtherDescription",
260242
TimeString = otherCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
261243
CommitTimeString = otherCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
262-
TimeValue = otherCommitTime,
263-
CommitTimeValue = otherCommitTime
264244
}
265245
};
266246

@@ -278,8 +258,6 @@ public void ListOf2ShouldNotEqualListOf2InDifferentOrder()
278258
Description = "OtherDescription",
279259
TimeString = otherCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
280260
CommitTimeString = otherCommitTime.ToString(DateTimeFormatInfo.CurrentInfo),
281-
TimeValue = otherCommitTime,
282-
CommitTimeValue = otherCommitTime
283261
},
284262
new GitLogEntry
285263
{
@@ -297,8 +275,6 @@ public void ListOf2ShouldNotEqualListOf2InDifferentOrder()
297275
Description = "Description",
298276
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
299277
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
300-
TimeValue = commitTime,
301-
CommitTimeValue = commitTime
302278
}
303279
};
304280

‎src/tests/UnitTests/IO/GitLogEntryTests.cs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ public void ShouldEqualSelf()
2626
Description = "Description",
2727
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
2828
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
29-
TimeValue = commitTime,
30-
CommitTimeValue = commitTime
3129
};
3230

3331
gitLogEntry.AssertEqual(gitLogEntry);
@@ -50,8 +48,6 @@ public void ShouldEqualAnotherWhenChangesIsNull()
5048
Description = "Description",
5149
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
5250
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
53-
TimeValue = commitTime,
54-
CommitTimeValue = commitTime
5551
};
5652

5753
var gitLogEntry2 = new GitLogEntry()
@@ -66,8 +62,6 @@ public void ShouldEqualAnotherWhenChangesIsNull()
6662
Description = "Description",
6763
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
6864
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
69-
TimeValue = commitTime,
70-
CommitTimeValue = commitTime
7165
};
7266

7367
gitLogEntry1.AssertEqual(gitLogEntry2);
@@ -89,8 +83,6 @@ public void ShouldNotEqualAnotherWhenFieldsAreDifferent()
8983
Description = "Description",
9084
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
9185
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
92-
TimeValue = commitTime,
93-
CommitTimeValue = commitTime
9486
};
9587

9688
var gitLogEntry2 = new GitLogEntry()
@@ -105,8 +97,6 @@ public void ShouldNotEqualAnotherWhenFieldsAreDifferent()
10597
Description = "Description",
10698
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
10799
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
108-
TimeValue = commitTime,
109-
CommitTimeValue = commitTime
110100
};
111101

112102
gitLogEntry1.AssertNotEqual(gitLogEntry2);
@@ -128,8 +118,6 @@ public void ShouldEqualAnotherWhenChangesIsEmpty()
128118
Description = "Description",
129119
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
130120
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
131-
TimeValue = commitTime,
132-
CommitTimeValue = commitTime
133121
};
134122

135123
var gitLogEntry2 = new GitLogEntry()
@@ -144,8 +132,6 @@ public void ShouldEqualAnotherWhenChangesIsEmpty()
144132
Description = "Description",
145133
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
146134
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
147-
TimeValue = commitTime,
148-
CommitTimeValue = commitTime
149135
};
150136

151137
gitLogEntry1.AssertEqual(gitLogEntry2);
@@ -172,8 +158,6 @@ public void ShouldEqualAnotherWhenChangesIsNotEmpty()
172158
Description = "Description",
173159
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
174160
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
175-
TimeValue = commitTime,
176-
CommitTimeValue = commitTime,
177161
};
178162

179163
var gitLogEntry2 = new GitLogEntry()
@@ -192,8 +176,6 @@ public void ShouldEqualAnotherWhenChangesIsNotEmpty()
192176
Description = "Description",
193177
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
194178
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
195-
TimeValue = commitTime,
196-
CommitTimeValue = commitTime
197179
};
198180

199181
gitLogEntry1.AssertEqual(gitLogEntry2);
@@ -220,8 +202,6 @@ public void ShouldNotEqualAnotherWhenChangesAreDifferent()
220202
Description = "Description",
221203
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
222204
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
223-
TimeValue = commitTime,
224-
CommitTimeValue = commitTime
225205
};
226206

227207
var gitLogEntry2 = new GitLogEntry()
@@ -240,8 +220,6 @@ public void ShouldNotEqualAnotherWhenChangesAreDifferent()
240220
Description = "Description",
241221
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
242222
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
243-
TimeValue = commitTime,
244-
CommitTimeValue = commitTime
245223
};
246224

247225
gitLogEntry1.AssertNotEqual(gitLogEntry2);

‎src/tests/UnitTests/IO/LogEntryOutputProcessorTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ public void ShouldParseSingleCommit()
6060
Description = "Rename RepositoryModelBase to RepositoryModel",
6161
TimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
6262
CommitTimeString = commitTime.ToString(DateTimeFormatInfo.CurrentInfo),
63-
TimeValue = commitTime,
64-
CommitTimeValue = commitTime
6563
},
6664
};
6765

0 commit comments

Comments
 (0)