Skip to content

Commit 5c09fa2

Browse files
tigtig
committed
Fixed merge issues
1 parent 9d83e23 commit 5c09fa2

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

‎UnitTests/Views/HexViewTests.cs

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,27 @@ public void AllowEdits_Edits_ApplyEdits ()
3939
// Needed because HexView relies on LayoutComplete to calc sizes
4040
hv.LayoutSubviews ();
4141

42-
Assert.True (Application.OnKeyDown (Key.Tab)); // Move to left side
42+
Assert.True (Application.RaiseKeyDownEvent (Key.Tab)); // Move to left side
4343

4444
Assert.Empty (hv.Edits);
4545
hv.AllowEdits = false;
46-
Assert.True (Application.OnKeyDown (Key.Home));
47-
Assert.False (Application.OnKeyDown (Key.A));
46+
Assert.True (Application.RaiseKeyDownEvent (Key.Home));
47+
Assert.False (Application.RaiseKeyDownEvent (Key.A));
4848
Assert.Empty (hv.Edits);
4949
Assert.Equal (126, hv.Source!.Length);
5050

5151
hv.AllowEdits = true;
52-
Assert.True (Application.OnKeyDown (Key.D4));
53-
Assert.True (Application.OnKeyDown (Key.D1));
52+
Assert.True (Application.RaiseKeyDownEvent (Key.D4));
53+
Assert.True (Application.RaiseKeyDownEvent (Key.D1));
5454
Assert.Single (hv.Edits);
5555
Assert.Equal (65, hv.Edits.ToList () [0].Value);
5656
Assert.Equal ('A', (char)hv.Edits.ToList () [0].Value);
5757
Assert.Equal (126, hv.Source.Length);
5858

5959
// Appends byte
60-
Assert.True (Application.OnKeyDown (Key.End));
61-
Assert.True (Application.OnKeyDown (Key.D4));
62-
Assert.True (Application.OnKeyDown (Key.D2));
60+
Assert.True (Application.RaiseKeyDownEvent (Key.End));
61+
Assert.True (Application.RaiseKeyDownEvent (Key.D4));
62+
Assert.True (Application.RaiseKeyDownEvent (Key.D2));
6363
Assert.Equal (2, hv.Edits.Count);
6464
Assert.Equal (66, hv.Edits.ToList () [1].Value);
6565
Assert.Equal ('B', (char)hv.Edits.ToList () [1].Value);
@@ -100,15 +100,15 @@ public void ApplyEdits_With_Argument ()
100100
hv.Source.Read (readBuffer);
101101
Assert.Equal ("Fest", Encoding.Default.GetString (readBuffer));
102102

103-
Assert.True (Application.OnKeyDown (Key.Tab)); // Move to left side
104-
Assert.True (Application.OnKeyDown (Key.D5));
105-
Assert.True (Application.OnKeyDown (Key.D4));
103+
Assert.True (Application.RaiseKeyDownEvent (Key.Tab)); // Move to left side
104+
Assert.True (Application.RaiseKeyDownEvent (Key.D5));
105+
Assert.True (Application.RaiseKeyDownEvent (Key.D4));
106106
readBuffer [hv.Edits.ToList () [0].Key] = hv.Edits.ToList () [0].Value;
107107
Assert.Equal ("Test", Encoding.Default.GetString (readBuffer));
108108

109-
Assert.True (Application.OnKeyDown (Key.Tab)); // Move to right side
110-
Assert.True (Application.OnKeyDown (Key.CursorLeft));
111-
Assert.True (Application.OnKeyDown (Key.Z.WithShift));
109+
Assert.True (Application.RaiseKeyDownEvent (Key.Tab)); // Move to right side
110+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorLeft));
111+
Assert.True (Application.RaiseKeyDownEvent (Key.Z.WithShift));
112112
readBuffer [hv.Edits.ToList () [0].Key] = hv.Edits.ToList () [0].Value;
113113
Assert.Equal ("Zest", Encoding.Default.GetString (readBuffer));
114114

@@ -157,21 +157,21 @@ public void Position_Encoding_Default ()
157157

158158
Assert.Equal (new (0, 0), hv.Position);
159159

160-
Assert.True (Application.OnKeyDown (Key.Tab));
160+
Assert.True (Application.RaiseKeyDownEvent (Key.Tab));
161161
Assert.Equal (new (0, 0), hv.Position);
162162

163-
Assert.True (Application.OnKeyDown (Key.CursorRight.WithCtrl));
163+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorRight.WithCtrl));
164164
Assert.Equal (hv.BytesPerLine - 1, hv.Position.X);
165165

166-
Assert.True (Application.OnKeyDown (Key.Home));
166+
Assert.True (Application.RaiseKeyDownEvent (Key.Home));
167167

168-
Assert.True (Application.OnKeyDown (Key.CursorRight));
168+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorRight));
169169
Assert.Equal (new (1, 0), hv.Position);
170170

171-
Assert.True (Application.OnKeyDown (Key.CursorDown));
171+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorDown));
172172
Assert.Equal (new (1, 1), hv.Position);
173173

174-
Assert.True (Application.OnKeyDown (Key.End));
174+
Assert.True (Application.RaiseKeyDownEvent (Key.End));
175175
Assert.Equal (new (3, 3), hv.Position);
176176

177177
Assert.Equal (hv.Source!.Length, hv.Address);
@@ -195,20 +195,20 @@ public void Position_Encoding_Unicode ()
195195

196196
Assert.Equal (new (0, 0), hv.Position);
197197

198-
Assert.True (Application.OnKeyDown (Key.Tab));
198+
Assert.True (Application.RaiseKeyDownEvent (Key.Tab));
199199

200-
Assert.True (Application.OnKeyDown (Key.CursorRight.WithCtrl));
200+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorRight.WithCtrl));
201201
Assert.Equal (hv.BytesPerLine - 1, hv.Position.X);
202202

203-
Assert.True (Application.OnKeyDown (Key.Home));
203+
Assert.True (Application.RaiseKeyDownEvent (Key.Home));
204204

205-
Assert.True (Application.OnKeyDown (Key.CursorRight));
205+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorRight));
206206
Assert.Equal (new (1, 0), hv.Position);
207207

208-
Assert.True (Application.OnKeyDown (Key.CursorDown));
208+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorDown));
209209
Assert.Equal (new (1, 1), hv.Position);
210210

211-
Assert.True (Application.OnKeyDown (Key.End));
211+
Assert.True (Application.RaiseKeyDownEvent (Key.End));
212212
Assert.Equal (new (6, 6), hv.Position);
213213

214214
Assert.Equal (hv.Source!.Length, hv.Address);
@@ -297,42 +297,42 @@ public void KeyBindings_Test_Movement_LeftSide ()
297297
Assert.Equal (4, hv.BytesPerLine);
298298

299299
// Default internal focus is on right side. Move back to left.
300-
Assert.True (Application.OnKeyDown (Key.Tab.WithShift));
300+
Assert.True (Application.RaiseKeyDownEvent (Key.Tab.WithShift));
301301

302-
Assert.True (Application.OnKeyDown (Key.CursorRight));
302+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorRight));
303303
Assert.Equal (1, hv.Address);
304304

305-
Assert.True (Application.OnKeyDown (Key.CursorLeft));
305+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorLeft));
306306
Assert.Equal (0, hv.Address);
307307

308-
Assert.True (Application.OnKeyDown (Key.CursorDown));
308+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorDown));
309309
Assert.Equal (4, hv.Address);
310310

311-
Assert.True (Application.OnKeyDown (Key.CursorUp));
311+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorUp));
312312
Assert.Equal (0, hv.Address);
313313

314-
Assert.True (Application.OnKeyDown (Key.PageDown));
314+
Assert.True (Application.RaiseKeyDownEvent (Key.PageDown));
315315
Assert.Equal (40, hv.Address);
316316

317-
Assert.True (Application.OnKeyDown (Key.PageUp));
317+
Assert.True (Application.RaiseKeyDownEvent (Key.PageUp));
318318
Assert.Equal (0, hv.Address);
319319

320-
Assert.True (Application.OnKeyDown (Key.End));
320+
Assert.True (Application.RaiseKeyDownEvent (Key.End));
321321
Assert.Equal (MEM_STRING_LENGTH, hv.Address);
322322

323-
Assert.True (Application.OnKeyDown (Key.Home));
323+
Assert.True (Application.RaiseKeyDownEvent (Key.Home));
324324
Assert.Equal (0, hv.Address);
325325

326-
Assert.True (Application.OnKeyDown (Key.CursorRight.WithCtrl));
326+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorRight.WithCtrl));
327327
Assert.Equal (3, hv.Address);
328328

329-
Assert.True (Application.OnKeyDown (Key.CursorLeft.WithCtrl));
329+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorLeft.WithCtrl));
330330
Assert.Equal (0, hv.Address);
331331

332-
Assert.True (Application.OnKeyDown (Key.CursorDown.WithCtrl));
332+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorDown.WithCtrl));
333333
Assert.Equal (36, hv.Address);
334334

335-
Assert.True (Application.OnKeyDown (Key.CursorUp.WithCtrl));
335+
Assert.True (Application.RaiseKeyDownEvent (Key.CursorUp.WithCtrl));
336336
Assert.Equal (0, hv.Address);
337337
Application.Top.Dispose ();
338338
Application.ResetState (true);

0 commit comments

Comments
 (0)