Skip to content
This repository was archived by the owner on Nov 25, 2023. It is now read-only.

Commit 1d0c08c

Browse files
InvvardInvvard
committed
Update unites tests
1 parent f1ca857 commit 1d0c08c

File tree

3 files changed

+176
-196
lines changed

3 files changed

+176
-196
lines changed

‎src/InvvardDev.EZLayoutDisplay.Tests/Helper/EZLayoutMakerTest.cs‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ private static ErgodoxLayout InitializeDataTree()
1818
{
1919
Title = "",
2020
HashId = "",
21-
Revisions = new List<Revision>
22-
{
23-
new Revision { HashId = HashId, Layers = new List<ErgodoxLayer> { new ErgodoxLayer() { Color = "", Title = "", Position = 0, Keys = new List<ErgodoxKey>() } } }
24-
}
21+
Revision = new Revision { HashId = HashId, Layers = new List<ErgodoxLayer> { new ErgodoxLayer() { Color = "", Title = "", Position = 0, Keys = new List<ErgodoxKey>() } } }
2522
};
2623
}
2724

@@ -31,8 +28,8 @@ public void PrepareEZLayout_InitializeEZLayout(string expectedTitle, string expe
3128
{
3229
// Arrange
3330
var revision = new Revision { Layers = new List<ErgodoxLayer>() };
34-
ErgodoxLayout ergodoxLayout = new ErgodoxLayout { Title = expectedTitle, HashId = expectedHashId, Revisions = new List<Revision> { new Revision { HashId = HashId } } };
35-
ergodoxLayout.Revisions.Add(revision);
31+
ErgodoxLayout ergodoxLayout = new ErgodoxLayout { Title = expectedTitle, HashId = expectedHashId, Revision = new Revision { HashId = HashId } };
32+
ergodoxLayout.Revision = revision;
3633
EZLayout ezLayoutResult;
3734

3835
// Act
@@ -52,7 +49,7 @@ public void PrepareEZLayout_InitializeEZLayer(int expectedIndex, string expected
5249
var ergodoxLayer = new ErgodoxLayer() { Color = expectedColor, Title = expectedTitle, Position = expectedIndex, Keys = new List<ErgodoxKey>() };
5350
ErgodoxLayout ergodoxLayout = new ErgodoxLayout
5451
{
55-
Title = "", HashId = "", Revisions = new List<Revision> { new Revision { HashId = HashId, Layers = new List<ErgodoxLayer> { ergodoxLayer } } }
52+
Title = "", HashId = "", Revision = new Revision { HashId = HashId, Layers = new List<ErgodoxLayer> { ergodoxLayer } }
5653
};
5754

5855
EZLayout ezLayoutResult;
@@ -82,7 +79,7 @@ public void PrepareEZLayout_ColorKey(string layerColor, string keyColor, string
8279
var ergodoxLayer = new ErgodoxLayer { Color = layerColor, Keys = new List<ErgodoxKey> { new ErgodoxKey { GlowColor = keyColor } } };
8380
ErgodoxLayout ergodoxLayout = new ErgodoxLayout
8481
{
85-
Title = "", HashId = "", Revisions = new List<Revision> { new Revision { HashId = HashId, Layers = new List<ErgodoxLayer> { ergodoxLayer } } }
82+
Title = "", HashId = "", Revision = new Revision { HashId = HashId, Layers = new List<ErgodoxLayer> { ergodoxLayer } }
8683
};
8784

8885
EZLayout ezLayoutResult;
@@ -101,7 +98,7 @@ public void PrepareEZLayout_KeyCodeUnknown()
10198
// Arrange
10299
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = "KC_UNKNOWN_ADSLKFJ" };
103100
ErgodoxLayout ergodoxLayout = InitializeDataTree();
104-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
101+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
105102

106103
EZLayout ezLayoutResult;
107104

@@ -123,7 +120,7 @@ public void PrepareEZLayout_InitializeEZKey(string expectedKeyCode, string expec
123120
// Arrange
124121
var ergodoxKey = new ErgodoxKey() { GlowColor = expectedColor, Code = expectedKeyCode };
125122
ErgodoxLayout ergodoxLayout = InitializeDataTree();
126-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
123+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
127124

128125
EZLayout ezLayoutResult;
129126

@@ -159,7 +156,7 @@ public void PrepareEZLayout_KeyCategoryWithSimpleLabel(string keyCode, string ex
159156
// Arrange
160157
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = keyCode };
161158
ErgodoxLayout ergodoxLayout = InitializeDataTree();
162-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
159+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
163160

164161
EZLayout ezLayoutResult;
165162

@@ -185,7 +182,7 @@ public void PrepareEZLayout_KeyCategoryOSM(string keyCode, string command, strin
185182
// Arrange
186183
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = keyCode, Command = command, Layer = 1 };
187184
ErgodoxLayout ergodoxLayout = InitializeDataTree();
188-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
185+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
189186

190187
EZLayout ezLayoutResult;
191188

@@ -225,7 +222,7 @@ public void PrepareEZLayout_KeyCategoryLayer(string keyCode, string expectedLabe
225222
// Arrange
226223
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = keyCode, Layer = 1 };
227224
ErgodoxLayout ergodoxLayout = InitializeDataTree();
228-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
225+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
229226

230227
EZLayout ezLayoutResult;
231228

@@ -254,7 +251,7 @@ public void PrepareEZLayout_KeyCategoryLayerShortcut(string keyCode,
254251
// Arrange
255252
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = keyCode, Command = command, Layer = 1 };
256253
ErgodoxLayout ergodoxLayout = InitializeDataTree();
257-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
254+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
258255

259256
EZLayout ezLayoutResult;
260257

@@ -296,7 +293,7 @@ public void PrepareEZLayout_KeyCategoryWithGlyphs(string keyCode, string expecte
296293
// Arrange
297294
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = keyCode };
298295
ErgodoxLayout ergodoxLayout = InitializeDataTree();
299-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
296+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
300297

301298
EZLayout ezLayoutResult;
302299

@@ -327,7 +324,7 @@ public void PrepareEZLayout_KeyCategoryDualFunction(string keyCode,
327324
// Arrange
328325
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = keyCode, Command = command };
329326
ErgodoxLayout ergodoxLayout = InitializeDataTree();
330-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
327+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
331328

332329
EZLayout ezLayoutResult;
333330

@@ -361,7 +358,7 @@ public void PrepareEZLayout_KeyCategoryShortcuts(string keyCode, string command,
361358
// Arrange
362359
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = keyCode, Command = command };
363360
ErgodoxLayout ergodoxLayout = InitializeDataTree();
364-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
361+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
365362

366363
EZLayout ezLayoutResult;
367364

@@ -430,7 +427,7 @@ public void PrepareEZLayout_ProcessModifiers(bool leftAlt,
430427
};
431428
var ergodoxKey = new ErgodoxKey() { GlowColor = "", Code = "KC_A", Modifiers = modifiers };
432429
ErgodoxLayout ergodoxLayout = InitializeDataTree();
433-
ergodoxLayout.Revisions.First().Layers.First().Keys.Add(ergodoxKey);
430+
ergodoxLayout.Revision.Layers.First().Keys.Add(ergodoxKey);
434431

435432
EZLayout ezLayoutResult;
436433

‎src/InvvardDev.EZLayoutDisplay.Tests/Service/LayoutServiceTest.cs‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,17 @@ private static ErgodoxLayout InitializeDataTree()
1717
return new ErgodoxLayout {
1818
Title = "",
1919
HashId = "",
20-
Revisions = new List<Revision> {
21-
new Revision {
22-
HashId = "hashId-1",
23-
Layers = new List<ErgodoxLayer> {
24-
new ErgodoxLayer() {
25-
Color = "",
26-
Title = "",
27-
Position = 0,
28-
Keys = new List<ErgodoxKey>()
29-
}
30-
}
31-
}
32-
}
20+
Revision = new Revision {
21+
HashId = "hashId-1",
22+
Layers = new List<ErgodoxLayer> {
23+
new ErgodoxLayer() {
24+
Color = "",
25+
Title = "",
26+
Position = 0,
27+
Keys = new List<ErgodoxKey>()
28+
}
29+
}
30+
}
3331
};
3432
}
3533

@@ -59,7 +57,7 @@ public async Task GetLayoutInfo(string layoutHashId, bool exist)
5957
{
6058
Assert.NotNull(response);
6159
Assert.IsType<ErgodoxLayout>(response);
62-
Assert.Single(response.Revisions);
60+
Assert.NotNull(response.Revision);
6361
Assert.False(string.IsNullOrWhiteSpace(response.HashId));
6462
Assert.False(string.IsNullOrWhiteSpace(response.Title));
6563
}
@@ -91,7 +89,7 @@ public async Task GetErgodoxLayout(string layoutHashId, bool exist)
9189
{
9290
Assert.NotNull(response);
9391
Assert.IsType<ErgodoxLayout>(response);
94-
Assert.Single(response.Revisions);
92+
Assert.NotNull(response.Revision);
9593
Assert.False(string.IsNullOrWhiteSpace(response.HashId));
9694
Assert.False(string.IsNullOrWhiteSpace(response.Title));
9795
}
@@ -103,7 +101,7 @@ public void PrepareEZLayout_OneLayer_ManyKeys()
103101
// Arrange
104102
ILayoutService layoutService = new LayoutService();
105103
ErgodoxLayout ergodoxLayout = InitializeDataTree();
106-
var keys = ergodoxLayout.Revisions.First().Layers.First().Keys;
104+
var keys = ergodoxLayout.Revision.Layers.First().Keys;
107105
keys.Add(new ErgodoxKey() {
108106
GlowColor = "",
109107
Code = "KC_A"
@@ -119,7 +117,7 @@ public void PrepareEZLayout_OneLayer_ManyKeys()
119117
EZLayout ezLayoutResult;
120118

121119
// Act
122-
ezLayoutResult = layoutService.PrepareEZLayout(ergodoxLayout, ergodoxLayout.Revisions.First().HashId);
120+
ezLayoutResult = layoutService.PrepareEZLayout(ergodoxLayout, ergodoxLayout.Revision.HashId);
123121

124122
// Assert
125123
Assert.Single(ezLayoutResult.EZLayers);
@@ -140,7 +138,7 @@ public void PrepareEZLayout_TwoLayer_ManyKeys()
140138
// Arrange
141139
ILayoutService layoutService = new LayoutService();
142140
ErgodoxLayout ergodoxLayout = InitializeDataTree();
143-
var layer0Keys = ergodoxLayout.Revisions.First().Layers.First().Keys;
141+
var layer0Keys = ergodoxLayout.Revision.Layers.First().Keys;
144142
layer0Keys.Add(new ErgodoxKey() {
145143
GlowColor = "",
146144
Code = "KC_A"
@@ -154,14 +152,14 @@ public void PrepareEZLayout_TwoLayer_ManyKeys()
154152
Code = "KC_TRANSPARENT"
155153
});
156154

157-
ergodoxLayout.Revisions.First()
155+
ergodoxLayout.Revision
158156
.Layers.Add(new ErgodoxLayer {
159157
Color = "color",
160158
Title = "Layer 2",
161159
Position = 1,
162160
Keys = new List<ErgodoxKey>()
163161
});
164-
var layer1Keys = ergodoxLayout.Revisions.First().Layers[1].Keys;
162+
var layer1Keys = ergodoxLayout.Revision.Layers[1].Keys;
165163
layer1Keys.Add(new ErgodoxKey() {
166164
GlowColor = "",
167165
Code = "KC_F1"
@@ -173,7 +171,7 @@ public void PrepareEZLayout_TwoLayer_ManyKeys()
173171
EZLayout ezLayoutResult;
174172

175173
// Act
176-
ezLayoutResult = layoutService.PrepareEZLayout(ergodoxLayout, ergodoxLayout.Revisions.First().HashId);
174+
ezLayoutResult = layoutService.PrepareEZLayout(ergodoxLayout, ergodoxLayout.Revision.HashId);
177175

178176
// Assert
179177
Assert.Equal(2, ezLayoutResult.EZLayers.Count);

0 commit comments

Comments
 (0)