Skip to content

Commit e2ff74d

Browse files
dsymedsyme
committed
update tests
1 parent 96d40ae commit e2ff74d

File tree

1 file changed

+10
-28
lines changed

1 file changed

+10
-28
lines changed

‎tests/service/ProjectAnalysisTests.fs‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2696,60 +2696,42 @@ let ``Test Project16 sym locations`` () =
26962696

26972697
let fmtLoc (mOpt: Range.range option) =
26982698
match mOpt with
2699-
| None -> ("NONE", (0, 0), (0, 0))
2700-
| Some m -> (Project16.cleanFileName m.FileName, (m.StartLine, m.StartColumn), (m.EndLine, m.EndColumn ))
2699+
| None -> None
2700+
| Some m ->
2701+
let file = Project16.cleanFileName m.FileName
2702+
if file = "??" then None
2703+
else Some (file, (m.StartLine, m.StartColumn), (m.EndLine, m.EndColumn ))
27012704

27022705
let allUsesOfAllSymbols =
27032706
wholeProjectResults.GetAllUsesOfAllSymbols()
27042707
|> Async.RunSynchronously
2705-
|> Array.map (fun su -> su.Symbol.ToString(), fmtLoc su.Symbol.SignatureLocation, fmtLoc su.Symbol.DeclarationLocation, fmtLoc su.Symbol.ImplementationLocation)
2708+
|> Array.choose (fun su ->
2709+
match fmtLoc su.Symbol.SignatureLocation, fmtLoc su.Symbol.DeclarationLocation, fmtLoc su.Symbol.ImplementationLocation with
2710+
| Some a, Some b, Some c -> Some (su.Symbol.ToString(), a, b, c)
2711+
| _ -> None)
27062712

27072713
allUsesOfAllSymbols |> shouldEqual
2708-
[|("ClassAttribute", ("??", (226, 9), (226, 23)),("??", (226, 9), (226, 23)), ("??", (226, 9), (226, 23)));
2709-
("ClassAttribute", ("??", (226, 9), (226, 23)),("??", (226, 9), (226, 23)), ("??", (226, 9), (226, 23)));
2710-
("member .ctor", ("??", (230, 8), (230, 11)), ("??", (230, 8), (230, 11)),("??", (244, 9), (244, 23)));
2711-
("ClassAttribute", ("??", (226, 9), (226, 23)),("??", (226, 9), (226, 23)), ("??", (226, 9), (226, 23)));
2712-
("ClassAttribute", ("??", (226, 9), (226, 23)),("??", (226, 9), (226, 23)), ("??", (226, 9), (226, 23)));
2713-
("member .ctor", ("??", (230, 8), (230, 11)), ("??", (230, 8), (230, 11)),("??", (244, 9), (244, 23)));
2714-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2715-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2716-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2717-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2718-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2719-
("field Field1", ("sig1", (16, 10), (16, 16)),("sig1", (16, 10), (16, 16)), ("file1", (13, 10), (13, 16)));
2714+
[|("field Field1", ("sig1", (16, 10), (16, 16)),("sig1", (16, 10), (16, 16)), ("file1", (13, 10), (13, 16)));
27202715
("field Field2", ("sig1", (16, 24), (16, 30)),("sig1", (16, 24), (16, 30)), ("file1", (13, 24), (13, 30)));
2721-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
27222716
("Case1", ("sig1", (17, 8), (17, 13)), ("sig1", (17, 8), (17, 13)),("file1", (14, 8), (14, 13)));
27232717
("Case2", ("sig1", (17, 16), (17, 21)), ("sig1", (17, 16), (17, 21)),("file1", (14, 16), (14, 21)));
27242718
("C", ("sig1", (4, 5), (4, 6)), ("sig1", (4, 5), (4, 6)),("file1", (4, 5), (4, 6)));
2725-
("unit", ("??", (22, 8), (22, 12)), ("??", (22, 8), (22, 12)),("??", (22, 8), (22, 12)));
27262719
("C", ("sig1", (4, 5), (4, 6)), ("sig1", (4, 5), (4, 6)),("file1", (4, 5), (4, 6)));
27272720
("member .ctor", ("sig1", (5, 4), (5, 7)), ("sig1", (5, 4), (5, 7)),("file1", (4, 5), (4, 6)));
2728-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
27292721
("member get_PC", ("sig1", (6, 11), (6, 13)), ("sig1", (6, 11), (6, 13)),("file1", (5, 13), (5, 15)));
27302722
("D", ("sig1", (8, 14), (8, 15)), ("sig1", (8, 14), (8, 15)),("file1", (7, 4), (7, 5)));
2731-
("unit", ("??", (22, 8), (22, 12)), ("??", (22, 8), (22, 12)),("??", (22, 8), (22, 12)));
27322723
("D", ("sig1", (8, 14), (8, 15)), ("sig1", (8, 14), (8, 15)),("file1", (7, 4), (7, 5)));
27332724
("member .ctor", ("sig1", (9, 4), (9, 7)), ("sig1", (9, 4), (9, 7)),("file1", (7, 4), (7, 5)));
2734-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
27352725
("member get_PD", ("sig1", (10, 11), (10, 13)),("sig1", (10, 11), (10, 13)), ("file1", (8, 13), (8, 15)));
27362726
("E", ("sig1", (12, 14), (12, 15)), ("sig1", (12, 14), (12, 15)),("file1", (10, 4), (10, 5)));
2737-
("unit", ("??", (22, 8), (22, 12)), ("??", (22, 8), (22, 12)),("??", (22, 8), (22, 12)));
27382727
("E", ("sig1", (12, 14), (12, 15)), ("sig1", (12, 14), (12, 15)),("file1", (10, 4), (10, 5)));
27392728
("member .ctor", ("sig1", (13, 4), (13, 7)), ("sig1", (13, 4), (13, 7)),("file1", (10, 4), (10, 5)));
2740-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
27412729
("member get_PE", ("sig1", (14, 11), (14, 13)),("sig1", (14, 11), (14, 13)), ("file1", (11, 13), (11, 15)));
27422730
("F", ("sig1", (16, 4), (16, 5)), ("sig1", (16, 4), (16, 5)),("file1", (13, 4), (13, 5)));
27432731
("G", ("sig1", (17, 4), (17, 5)), ("sig1", (17, 4), (17, 5)),("file1", (14, 4), (14, 5)));
27442732
("Impl", ("sig1", (2, 7), (2, 11)), ("sig1", (2, 7), (2, 11)),("file1", (2, 7), (2, 11)));
2745-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2746-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2747-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2748-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
2749-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
27502733
("field Field1", ("sig1", (16, 10), (16, 16)),("file1", (13, 10), (13, 16)), ("file1", (13, 10), (13, 16)));
27512734
("field Field2", ("sig1", (16, 24), (16, 30)),("file1", (13, 24), (13, 30)), ("file1", (13, 24), (13, 30)));
2752-
("int", ("??", (69, 9), (69, 12)), ("??", (69, 9), (69, 12)),("??", (69, 9), (69, 12)));
27532735
("Case1", ("sig1", (17, 8), (17, 13)), ("file1", (14, 8), (14, 13)),("file1", (14, 8), (14, 13)));
27542736
("Case2", ("sig1", (17, 16), (17, 21)), ("file1", (14, 16), (14, 21)),("file1", (14, 16), (14, 21)));
27552737
("C", ("sig1", (4, 5), (4, 6)), ("file1", (4, 5), (4, 6)),("file1", (4, 5), (4, 6)));

0 commit comments

Comments
 (0)