Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9a23b8c

Browse files
committed
Fixes for a handful of IDE unit tests (changeset 1384280)
1 parente8d7469 commit9a23b8c

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

‎vsintegration/src/unittests/Tests.LanguageService.Completion.fs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4559,10 +4559,8 @@ let x = query { for bbbb in abbbbc(*D0*) do
45594559
// (ItemName, isUnique, isPrefix)
45604560
// isUnique=true means it will be selected on ctrl-space invocation
45614561
// isPrefix=true means it will be selected, instead of just outlined
4562-
AssertEqual(Some("choose",false,true), Match"c")
4563-
AssertEqual(Some("collect",false,true), Match"co")
4564-
AssertEqual(Some("concat",true,true), Match"con")
4565-
AssertEqual(Some("Cons",true,true), Match"cons")
4562+
AssertEqual(Some("empty",false,true), Match"e")
4563+
AssertEqual(Some("empty",true,true), Match"em")
45664564

45674565
[<Test>]
45684566
memberpublicthis.``BestMatch.Bug5131``()=

‎vsintegration/src/unittests/Tests.LanguageService.ErrorList.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ but here has type
468468
// dummy Type Provider exposes a parametric type (N1.T) that takes 2 static params (string * int)
469469
// but here as you can see it's give (string)
470470
letfileContent="""type foo = N1.T< const "Hello World">"""
471-
letexpectedStr="The static parameter 'ParamIgnored' of the provided type 'T' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. 'T<ParamIgnored=...>'."
471+
letexpectedStr="The static parameter 'ParamIgnored' of the provided typeor method'T' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. 'T<ParamIgnored=...>'."
472472

473473
this.VerifyErrorListContainedExpectedString(fileContent,expectedStr,
474474
addtlRefAssy=[System.IO.Path.Combine(System.Environment.CurrentDirectory,@"UnitTestsResources\MockTypeProviders\DummyProviderForLanguageServiceTesting.dll")])

‎vsintegration/src/unittests/Tests.LanguageService.QuickInfo.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2902,7 +2902,7 @@ query."
29022902
Ex1(value(*Marker6*) = v) -> ()
29032903
29042904
//Static parameters of type providers
2905-
let provType = N1.T<Param1(*Marker7*)="hello", ParamIgnored(*Marker8*)=10>
2905+
type provType = N1.T<Param1(*Marker7*)="hello", ParamIgnored(*Marker8*)=10>
29062906
"""
29072907

29082908
this.AssertQuickInfoContainsAtStartOfMarker(fileContent,"(*Marker1*)","x1 param!")

‎vsintegration/src/unittests/Tests.LanguageService.Squiggles.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ type X() =
364364
fileContents="type foo = N1.T<",
365365
marker="N1",
366366
expectedSquiggle=(Microsoft.VisualStudio.FSharp.LanguageService.Severity.Error,
367-
"The static parameter 'Param1' of the provided type 'T' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. 'T<Param1=...>'."),
367+
"The static parameter 'Param1' of the provided typeor method'T' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. 'T<Param1=...>'."),
368368
addtlRefAssy=[System.IO.Path.Combine(System.Environment.CurrentDirectory,@"UnitTestsResources\MockTypeProviders\DummyProviderForLanguageServiceTesting.dll")])
369369

370370
[<Test>]
@@ -375,7 +375,7 @@ type X() =
375375
fileContents="type foo = N1.T<\"foo\",",
376376
marker="N1",
377377
expectedSquiggle=(Microsoft.VisualStudio.FSharp.LanguageService.Severity.Error,
378-
"The static parameter 'ParamIgnored' of the provided type 'T' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. 'T<ParamIgnored=...>'."),
378+
"The static parameter 'ParamIgnored' of the provided typeor method'T' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. 'T<ParamIgnored=...>'."),
379379
addtlRefAssy=[System.IO.Path.Combine(System.Environment.CurrentDirectory,@"UnitTestsResources\MockTypeProviders\DummyProviderForLanguageServiceTesting.dll")])
380380

381381
[<Test>]

‎vsintegration/src/unittests/Tests.ProjectSystem.References.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ type References() =
449449
letexpectedFsprojRegex=@"<Reference Include=""Test"">"
450450
+@"\s*<HintPath>Test.exe</HintPath>"// in this directory
451451
+@"\s*</Reference>"
452-
this.MakeProjectAndDo(["bar.fs"],[],"",null,(fun project->
452+
this.MakeProjectAndDo(["bar.fs"],[],"","v4.5",(fun project->
453453
letexeCopy= Path.Combine(project.ProjectFolder,"Test.exe")
454454
File.Copy(exe, exeCopy,true)
455455
Assert.IsTrue(File.Exists exeCopy,"failed to build exe")
@@ -486,7 +486,7 @@ type References() =
486486
letexpectedFsprojRegex=@"<Reference Include=""Test"">"
487487
+@"\s*<HintPath>\.\.\\.*?</HintPath>"// the point is, some path start with "..\", since both projects are rooted somewhere in the temp directory (where unit tests create them)
488488
+@"\s*</Reference>"
489-
this.MakeProjectAndDo(["bar.fs"],[],"",null,(fun project->
489+
this.MakeProjectAndDo(["bar.fs"],[],"","v4.5",(fun project->
490490
letselectorData=new VSCOMPONENTSELECTORDATA(``type``= VSCOMPONENTTYPE.VSCOMPONENTTYPE_File, bstrFile= exe)
491491
letrefContainer= GetReferenceContainerNode(project)
492492
refContainer.AddReferenceFromSelectorData(selectorData)|> Assert.IsNotNull

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp