Skip to content

Commit 127bddc

Browse files
MartinGC94MartinGC94
committed
Update tests to support new tokens.
1 parent 269389a commit 127bddc

File tree

5 files changed

+123
-69
lines changed

5 files changed

+123
-69
lines changed

‎test/HistoryTest.cs

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -781,14 +781,14 @@ public void InteractiveHistorySearch()
781781
TokenClassification.Command, "echo",
782782
TokenClassification.None, " ",
783783
emphasisColors, 'a',
784-
TokenClassification.None, "aa",
784+
TokenClassification.CommandArgument, "aa",
785785
NextLine,
786786
statusColors, "bck-i-search: a_")),
787787
'b', CheckThat(() => AssertScreenIs(2,
788788
TokenClassification.Command, "echo",
789789
TokenClassification.None, " ",
790790
emphasisColors, "ab",
791-
TokenClassification.None, 'b',
791+
TokenClassification.CommandArgument, 'b',
792792
NextLine,
793793
statusColors, "bck-i-search: ab_")),
794794
'c', CheckThat(() => AssertScreenIs(2,
@@ -806,21 +806,21 @@ public void InteractiveHistorySearch()
806806
TokenClassification.Command, "echo",
807807
TokenClassification.None, " ",
808808
emphasisColors, 'a',
809-
TokenClassification.None, "aa",
809+
TokenClassification.CommandArgument, "aa",
810810
NextLine,
811811
statusColors, "bck-i-search: a_")),
812812
_.Ctrl_r, CheckThat(() => AssertScreenIs(2,
813813
TokenClassification.Command, "echo",
814814
TokenClassification.None, " ",
815815
emphasisColors, 'a',
816-
TokenClassification.None, "bb",
816+
TokenClassification.CommandArgument, "bb",
817817
NextLine,
818818
statusColors, "bck-i-search: a_")),
819819
_.Ctrl_r, CheckThat(() => AssertScreenIs(2,
820820
TokenClassification.Command, "echo",
821821
TokenClassification.None, " ",
822822
emphasisColors, 'a',
823-
TokenClassification.None, "bc",
823+
TokenClassification.CommandArgument, "bc",
824824
NextLine,
825825
statusColors, "bck-i-search: a_"))));
826826

@@ -833,15 +833,15 @@ public void InteractiveHistorySearch()
833833
TokenClassification.Command, "echo",
834834
TokenClassification.None, " ",
835835
emphasisColors, 'a',
836-
TokenClassification.None, "bc",
836+
TokenClassification.CommandArgument, "bc",
837837
NextLine,
838838
statusColors, "bck-i-search: a_")),
839839
'b',
840840
CheckThat(() => AssertScreenIs(2,
841841
TokenClassification.Command, "echo",
842842
TokenClassification.None, " ",
843843
emphasisColors, "ab",
844-
TokenClassification.None, 'c',
844+
TokenClassification.CommandArgument, 'c',
845845
NextLine,
846846
statusColors, "bck-i-search: ab_"))));
847847

@@ -853,14 +853,14 @@ public void InteractiveHistorySearch()
853853
TokenClassification.Command, "echo",
854854
TokenClassification.None, " ",
855855
emphasisColors, 'a',
856-
TokenClassification.None, "bc",
856+
TokenClassification.CommandArgument, "bc",
857857
NextLine,
858858
statusColors, "bck-i-search: a_")),
859859
_.Ctrl_g,
860860
CheckThat(() => AssertScreenIs(2,
861861
TokenClassification.Command, "echo",
862862
TokenClassification.None, " ",
863-
TokenClassification.None, "zed",
863+
TokenClassification.CommandArgument, "zed",
864864
NextLine))));
865865

866866
// Test that a random function terminates the search and has an
@@ -872,7 +872,7 @@ public void InteractiveHistorySearch()
872872
TokenClassification.Command, "echo",
873873
TokenClassification.None, " ",
874874
emphasisColors, 'a',
875-
TokenClassification.None, "bc",
875+
TokenClassification.CommandArgument, "bc",
876876
NextLine,
877877
statusColors, "bck-i-search: a_")),
878878
_.Alt_d, "zed"));
@@ -886,7 +886,7 @@ public void InteractiveHistorySearch()
886886
TokenClassification.Command, "echo",
887887
TokenClassification.None, " ",
888888
emphasisColors, 'a',
889-
TokenClassification.None, "bc",
889+
TokenClassification.CommandArgument, "bc",
890890
NextLine,
891891
statusColors, "bck-i-search: a_")),
892892
_.Escape, "y"));
@@ -900,15 +900,15 @@ public void InteractiveHistorySearch()
900900
TokenClassification.Command, "echo",
901901
TokenClassification.None, " ",
902902
emphasisColors, "ab",
903-
TokenClassification.None, 'b',
903+
TokenClassification.CommandArgument, 'b',
904904
NextLine,
905905
statusColors, "bck-i-search: ab_")),
906906
_.Backspace,
907907
CheckThat(() => AssertScreenIs(2,
908908
TokenClassification.Command, "echo",
909909
TokenClassification.None, " ",
910910
emphasisColors, 'a',
911-
TokenClassification.None, "aa",
911+
TokenClassification.CommandArgument, "aa",
912912
NextLine,
913913
statusColors, "bck-i-search: a_"))));
914914

@@ -919,30 +919,30 @@ public void InteractiveHistorySearch()
919919
TokenClassification.Command, "echo",
920920
TokenClassification.None, " ",
921921
emphasisColors, 'a',
922-
TokenClassification.None, "bc",
922+
TokenClassification.CommandArgument, "bc",
923923
NextLine,
924924
statusColors, "bck-i-search: a_")),
925925
_.Ctrl_r,
926926
CheckThat(() => AssertScreenIs(2,
927927
TokenClassification.Command, "echo",
928928
TokenClassification.None, " ",
929929
emphasisColors, 'a',
930-
TokenClassification.None, "bzz",
930+
TokenClassification.CommandArgument, "bzz",
931931
NextLine,
932932
statusColors, "bck-i-search: a_")),
933933
_.Ctrl_r,
934934
CheckThat(() => AssertScreenIs(2,
935935
TokenClassification.Command, "echo",
936936
TokenClassification.None, " ",
937-
TokenClassification.None, "abzz",
937+
TokenClassification.CommandArgument, "abzz",
938938
NextLine,
939939
statusColors, "failed-bck-i-search: a_")),
940940
_.Ctrl_s,
941941
CheckThat(() => AssertScreenIs(2,
942942
TokenClassification.Command, "echo",
943943
TokenClassification.None, " ",
944944
emphasisColors, 'a',
945-
TokenClassification.None, "bzz",
945+
TokenClassification.CommandArgument, "bzz",
946946
NextLine,
947947
statusColors, "fwd-i-search: a_")),
948948
_.Ctrl_g));
@@ -952,7 +952,8 @@ public void InteractiveHistorySearch()
952952
Test("echo aa1", Keys(_.Ctrl_r, "zz", _.Backspace, _.Backspace, "a1",
953953
CheckThat(() => AssertScreenIs(2,
954954
TokenClassification.Command, "echo",
955-
TokenClassification.None, " a",
955+
TokenClassification.None, " ",
956+
TokenClassification.CommandArgument, "a",
956957
emphasisColors, "a1",
957958
NextLine,
958959
statusColors, "bck-i-search: a1_"))
@@ -967,31 +968,31 @@ public void InteractiveHistorySearch()
967968
TokenClassification.Command, "echo",
968969
TokenClassification.None, " ",
969970
emphasisColors, "aa",
970-
TokenClassification.None, "2",
971+
TokenClassification.CommandArgument, "2",
971972
NextLine,
972973
statusColors, "bck-i-search: aa_")),
973974
_.Ctrl_r,
974975
CheckThat(() => AssertScreenIs(2,
975976
TokenClassification.Command, "echo",
976977
TokenClassification.None, " ",
977978
emphasisColors, "aa",
978-
TokenClassification.None, "1",
979+
TokenClassification.CommandArgument, "1",
979980
NextLine,
980981
statusColors, "bck-i-search: aa_")),
981982
_.Backspace,
982983
CheckThat(() => AssertScreenIs(2,
983984
TokenClassification.Command, "echo",
984985
TokenClassification.None, " ",
985986
emphasisColors, "a",
986-
TokenClassification.None, "a2",
987+
TokenClassification.CommandArgument, "a2",
987988
NextLine,
988989
statusColors, "bck-i-search: a_")),
989990
'a', _.Ctrl_r,
990991
CheckThat(() => AssertScreenIs(2,
991992
TokenClassification.Command, "echo",
992993
TokenClassification.None, " ",
993994
emphasisColors, "aa",
994-
TokenClassification.None, "1",
995+
TokenClassification.CommandArgument, "1",
995996
NextLine,
996997
statusColors, "bck-i-search: aa_")),
997998
_.Backspace));

‎test/KillYankTest.cs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ public void SelectBackwardWord()
392392
CheckThat(() => AssertScreenIs(1,
393393
TokenClassification.Command, "echo",
394394
TokenClassification.None, " ",
395+
TokenClassification.CommandArgument,
395396
Selected("foo "), "bar")),
396397
_.Delete));
397398
}
@@ -406,7 +407,9 @@ public void SelectNextWord()
406407
CheckThat(() => AssertScreenIs(1,
407408
TokenClassification.Command, Selected("foo"),
408409
TokenClassification.None, Selected(" "),
409-
TokenClassification.None, "echo bar")),
410+
TokenClassification.CommandArgument,"echo",
411+
TokenClassification.None," ",
412+
TokenClassification.CommandArgument, "bar")),
410413
_.Delete));
411414
}
412415

@@ -419,7 +422,10 @@ public void SelectForwardWord()
419422
"foo echo bar", _.Home, _.Alt_F,
420423
CheckThat(() => AssertScreenIs(1,
421424
TokenClassification.Command, Selected("foo"),
422-
TokenClassification.None, " echo bar")),
425+
TokenClassification.None, " ",
426+
TokenClassification.CommandArgument, "echo",
427+
TokenClassification.None, " ",
428+
TokenClassification.CommandArgument, "bar")),
423429
_.Delete));
424430
}
425431

@@ -432,7 +438,10 @@ public void SelectShellForwardWord()
432438
"a\\b\\c echo bar", _.Home, _.Ctrl_z,
433439
CheckThat(() => AssertScreenIs(1,
434440
TokenClassification.Command, Selected("a\\b\\c"),
435-
TokenClassification.None, " echo bar")),
441+
TokenClassification.None, " ",
442+
TokenClassification.CommandArgument, "echo",
443+
TokenClassification.None, " ",
444+
TokenClassification.CommandArgument, "bar")),
436445
_.Delete));
437446
}
438447

@@ -445,7 +454,9 @@ public void SelectShellNextWord()
445454
"a\\b\\c echo bar", _.Home, _.Ctrl_z,
446455
CheckThat(() => AssertScreenIs(1,
447456
TokenClassification.Command, Selected("a\\b\\c "),
448-
TokenClassification.None, "echo bar")),
457+
TokenClassification.CommandArgument, "echo",
458+
TokenClassification.None, " ",
459+
TokenClassification.CommandArgument, "bar")),
449460
_.Delete));
450461
}
451462

@@ -458,7 +469,9 @@ public void SelectShellBackwardWord()
458469
"echo bar 'a b c'", _.Ctrl_z,
459470
CheckThat(() => AssertScreenIs(1,
460471
TokenClassification.Command, "echo",
461-
TokenClassification.None, " bar ",
472+
TokenClassification.None, " ",
473+
TokenClassification.CommandArgument, "bar",
474+
TokenClassification.None, " ",
462475
TokenClassification.String, Selected("'a b c'"))),
463476
_.Delete));
464477
}

‎test/RenderTest.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ public void Render()
6969
AssertScreenIs(1,
7070
TokenClassification.None, ". ",
7171
TokenClassification.Command, "-abc",
72-
TokenClassification.None, " def;. ",
72+
TokenClassification.None, " ",
73+
TokenClassification.CommandArgument, "def",
74+
TokenClassification.None, ";. ",
7375
TokenClassification.Command, "abc",
7476
TokenClassification.Variable, "$name",
7577
TokenClassification.None, " ",
@@ -86,7 +88,8 @@ public void Render()
8688
AssertScreenIs(1,
8789
TokenClassification.None, ". ",
8890
TokenClassification.Command, "++",
89-
TokenClassification.None, " abc",
91+
TokenClassification.None, " ",
92+
TokenClassification.CommandArgument, "abc",
9093
TokenClassification.Variable, "$name",
9194
TokenClassification.None, " ",
9295
TokenClassification.Parameter, "-def")),
@@ -103,7 +106,8 @@ public void Render()
103106
TokenClassification.Keyword, "process",
104107
TokenClassification.None, " ",
105108
TokenClassification.Variable, "$abc",
106-
TokenClassification.None, "\\name | def")),
109+
TokenClassification.CommandArgument, "\\name",
110+
TokenClassification.None, " | def")),
107111
_.Ctrl_c,
108112
InputAcceptedNow
109113
));
@@ -113,7 +117,9 @@ public void Render()
113117
CheckThat(() =>
114118
AssertScreenIs(1,
115119
TokenClassification.Keyword, "process",
116-
TokenClassification.None, " out put")),
120+
TokenClassification.None, " ",
121+
TokenClassification.CommandArgument, "out",
122+
TokenClassification.None, " put")),
117123
_.Ctrl_c,
118124
InputAcceptedNow
119125
));

0 commit comments

Comments
 (0)