Skip to content

Commit 02d473c

Browse files
author
Omar Tawfik
committed
Fix tests
1 parent 517ce91 commit 02d473c

31 files changed

+86
-46
lines changed

‎packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<package id="Microsoft.VisualStudio.Shell.Design" version="14.3.25407" targetFramework="net46" />
3636
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net46" />
3737
<package id="Microsoft.VisualStudio.Language.StandardClassification" version="14.3.25407" targetFramework="net46" />
38+
<package id="Microsoft.VisualStudio.Language.Intellisense" version="14.3.25407" targetFramework="net46" />
3839
<package id="Microsoft.VisualStudio.Designer.Interfaces" version="1.1.4322" />
3940
<package id="Roslyn.Microsoft.VisualStudio.ComponentModelHost" version="0.0.2" targetFramework="net46" />
4041
<package id="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal" version="14.0.25420" targetFramework="net46" />

‎vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,32 +65,43 @@
6565
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces">
6666
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.VisualStudio.CommonIDE" />
6968
<Reference Include="Microsoft.VisualStudio.Text.Internal, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7069
<HintPath>$(FSharpSourcesRoot)\..\packages\RoslynDependencies.Microsoft.VisualStudio.Text.Internal.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Internal.dll</HintPath>
70+
<Private>True</Private>
7171
</Reference>
7272
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7373
<HintPath>$(FSharpSourcesRoot)\..\packages\RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor.$(RoslynVSPackagesVersion)\lib\net46\Microsoft.VisualStudio.Platform.VSEditor.dll</HintPath>
74+
<Private>True</Private>
75+
</Reference>
76+
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor.Interop, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
77+
<HintPath>$(FSharpSourcesRoot)\..\packages\RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor.$(RoslynVSPackagesVersion)\lib\net46\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll</HintPath>
78+
<Private>True</Private>
7479
</Reference>
7580
<Reference Include="Microsoft.VisualStudio.Diagnostics.Measurement" />
7681
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
7782
<Reference Include="Microsoft.VisualStudio.Threading, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7883
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
84+
<Private>True</Private>
7985
</Reference>
8086
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
8187
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
88+
<Private>True</Private>
8289
</Reference>
8390
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
8491
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
92+
<Private>True</Private>
8593
</Reference>
8694
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
8795
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
96+
<Private>True</Private>
8897
</Reference>
8998
<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
9099
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
100+
<Private>True</Private>
91101
</Reference>
92102
<Reference Include="Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
93103
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll</HintPath>
104+
<Private>True</Private>
94105
</Reference>
95106
<Reference Include="nunit.framework">
96107
<Private>True</Private>

‎vsintegration/tests/unittests/DocumentDiagnosticAnalyzerTests.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ type DocumentDiagnosticAnalyzerTests() =
3434
}
3535

3636
member private this.VerifyNoErrors(fileContents: string) =
37-
let errors = FSharpDocumentDiagnosticAnalyzer.GetDiagnostics(filePath, SourceText.From(fileContents), options, true)
37+
let errors = FSharpDocumentDiagnosticAnalyzer.GetDiagnostics(filePath, SourceText.From(fileContents), 0, options, true)
3838
Assert.AreEqual(0, errors.Length, "There should be no errors generated")
3939

4040
member private this.VerifyErrorAtMarker(fileContents: string, expectedMarker: string, ?expectedMessage: string) =
41-
let errors = FSharpDocumentDiagnosticAnalyzer.GetDiagnostics(filePath, SourceText.From(fileContents), options, true) |>
41+
let errors = FSharpDocumentDiagnosticAnalyzer.GetDiagnostics(filePath, SourceText.From(fileContents), 0, options, true) |>
4242
Seq.filter(fun e -> e.Severity = DiagnosticSeverity.Error) |> Seq.toArray
4343
Assert.AreEqual(1, errors.Length, "There should be exactly one error generated")
4444
let actualError = errors.[0]
@@ -51,7 +51,7 @@ type DocumentDiagnosticAnalyzerTests() =
5151
Assert.AreEqual(expectedEnd, actualError.Location.SourceSpan.End, "Error end positions should match")
5252

5353
member private this.VerifyDiagnosticBetweenMarkers(fileContents: string, expectedMessage: string, expectedSeverity: DiagnosticSeverity) =
54-
let errors = FSharpDocumentDiagnosticAnalyzer.GetDiagnostics(filePath, SourceText.From(fileContents), options, true) |>
54+
let errors = FSharpDocumentDiagnosticAnalyzer.GetDiagnostics(filePath, SourceText.From(fileContents), 0, options, true) |>
5555
Seq.filter(fun e -> e.Severity = expectedSeverity) |> Seq.toArray
5656
Assert.AreEqual(1, errors.Length, "There should be exactly one error generated")
5757
let actualError = errors.[0]

‎vsintegration/tests/unittests/Tests.Build.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type FauxHostObject() =
5353
interface ITaskHost
5454
// no members
5555

56-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
56+
[<TestFixture>]
5757
type Build() =
5858
(* Asserts ----------------------------------------------------------------------------- *)
5959
let AssertEqual expected actual =

‎vsintegration/tests/unittests/Tests.InternalCollections.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open NUnit.Framework
88
open Internal.Utilities.Collections
99

1010

11-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
11+
[<TestFixture>]
1212
type MruCache =
1313
new() = { }
1414

@@ -113,7 +113,7 @@ type MruCache =
113113
Assert.IsTrue(discarded.Value = ["y";"x";"Apple";"Banana"], "Check6")
114114
#endif
115115

116-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
116+
[<TestFixture>]
117117
type AgedLookup() =
118118
let mutable hold197 : byte [] = null
119119
let mutable hold198 : byte [] = null

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module StandardSettings =
2424
let AC x y = AutoCompleteExpected(x,y)
2525
let DC x y = DotCompleteExpected(x,y)
2626

27-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
27+
[<TestFixture>]
2828
type UsingMSBuild() as this =
2929
inherit LanguageServiceBaseTests()
3030

@@ -7701,7 +7701,7 @@ let rec f l =
77017701

77027702

77037703
// Context project system
7704-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
7704+
[<TestFixture>]
77057705
type UsingProjectSystem() =
77067706
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)
77077707

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open UnitTests.TestLib.Utils
1212
open UnitTests.TestLib.LanguageService
1313
open UnitTests.TestLib.ProjectSystem
1414

15-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
15+
[<TestFixture>]
1616
type UsingMSBuild() as this =
1717
inherit LanguageServiceBaseTests()
1818

@@ -910,6 +910,6 @@ but here has type
910910
Assert.AreEqual(1,warnList.Length)
911911

912912
// Context project system
913-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
913+
[<TestFixture>]
914914
type UsingProjectSystem() =
915915
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)

‎vsintegration/tests/unittests/Tests.LanguageService.ErrorRecovery.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ open UnitTests.TestLib.Utils
1212
open UnitTests.TestLib.LanguageService
1313
open UnitTests.TestLib.ProjectSystem
1414

15-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
15+
[<TestFixture>]
1616
type UsingMSBuild() =
1717
inherit LanguageServiceBaseTests()
1818

@@ -266,6 +266,6 @@ type UsingMSBuild() =
266266

267267

268268
// Context project system
269-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
269+
[<TestFixture>]
270270
type UsingProjectSystem() =
271271
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)

‎vsintegration/tests/unittests/Tests.LanguageService.F1Keyword.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ open UnitTests.TestLib.Utils
1111
open UnitTests.TestLib.LanguageService
1212
open UnitTests.TestLib.ProjectSystem
1313

14-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
14+
[<TestFixture>]
1515
type UsingMSBuild() =
1616
inherit LanguageServiceBaseTests()
1717

@@ -372,6 +372,6 @@ type UsingMSBuild() =
372372

373373

374374
// Context project system
375-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
375+
[<TestFixture>]
376376
type UsingProjectSystem() =
377377
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)

‎vsintegration/tests/unittests/Tests.LanguageService.General.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ open UnitTests.TestLib.Utils
1818
open UnitTests.TestLib.LanguageService
1919
open UnitTests.TestLib.ProjectSystem
2020

21-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
21+
[<TestFixture>]
2222
module IFSharpSource =
2323

2424
[<Test>]
@@ -55,7 +55,7 @@ module IFSharpSource =
5555

5656

5757

58-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
58+
[<TestFixture>]
5959
type UsingMSBuild() =
6060
inherit LanguageServiceBaseTests()
6161

@@ -484,7 +484,7 @@ type UsingMSBuild() =
484484

485485

486486
// Context project system
487-
[<Ignore("FSROSLYNTODO: Not ported to Roslyn yet")>][<TestFixture>]
487+
[<TestFixture>]
488488
type UsingProjectSystem() =
489489
inherit UsingMSBuild(VsOpts = LanguageServiceExtension.ProjectSystemTestFlavour)
490490

0 commit comments

Comments
 (0)