From b9cd0051cab3ef08cb0055d70fae013ebb77c07c Mon Sep 17 00:00:00 2001 From: nosami Date: Tue, 11 Aug 2015 02:12:33 +0100 Subject: [PATCH] fix more tests --- tests/OmniSharp.Tests/FindImplementationFacts.cs | 2 +- tests/OmniSharp.Tests/FindReferencesFacts.cs | 2 +- tests/OmniSharp.Tests/FindSymbolsFacts.cs | 4 ++-- tests/OmniSharp.Tests/GoToFileFacts.cs | 4 ++-- tests/OmniSharp.Tests/HighlightFacts.cs | 16 ++++++++-------- tests/OmniSharp.Tests/IntellisenseFacts.cs | 2 +- tests/OmniSharp.Tests/NavigateUpDownFacts.cs | 2 +- .../OmniSharp.Tests/OmnisharpControllerFacts.cs | 2 +- tests/OmniSharp.Tests/RenameFacts.cs | 2 +- tests/OmniSharp.Tests/SignatureHelpFacts.cs | 2 +- tests/OmniSharp.Tests/TestHelpers.cs | 1 - tests/OmniSharp.Tests/TypeLookupFacts.cs | 4 ++-- 12 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tests/OmniSharp.Tests/FindImplementationFacts.cs b/tests/OmniSharp.Tests/FindImplementationFacts.cs index c14f9200e6..c4fc12c5ea 100644 --- a/tests/OmniSharp.Tests/FindImplementationFacts.cs +++ b/tests/OmniSharp.Tests/FindImplementationFacts.cs @@ -71,7 +71,7 @@ public class SomeClass : Base$Class {}"; private async Task> FindImplementations(string source) { var workspace = TestHelpers.CreateSimpleWorkspace(source); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var request = CreateRequest(source); var bufferFilter = new UpdateBufferFilter(workspace); bufferFilter.OnActionExecuting(TestHelpers.CreateActionExecutingContext(request, controller)); diff --git a/tests/OmniSharp.Tests/FindReferencesFacts.cs b/tests/OmniSharp.Tests/FindReferencesFacts.cs index 859592c114..08f3e82feb 100644 --- a/tests/OmniSharp.Tests/FindReferencesFacts.cs +++ b/tests/OmniSharp.Tests/FindReferencesFacts.cs @@ -233,7 +233,7 @@ private async Task FindUsages(string source, bool excludeDefin private async Task FindUsages(Dictionary sources, string currentFile, bool onlyThisFile, bool excludeDefinition = false) { var workspace = TestHelpers.CreateSimpleWorkspace(sources); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var request = CreateRequest(sources[currentFile], currentFile, excludeDefinition); request.OnlyThisFile = onlyThisFile; var bufferFilter = new UpdateBufferFilter(workspace); diff --git a/tests/OmniSharp.Tests/FindSymbolsFacts.cs b/tests/OmniSharp.Tests/FindSymbolsFacts.cs index ccc75c4dc2..64a67a3f5b 100644 --- a/tests/OmniSharp.Tests/FindSymbolsFacts.cs +++ b/tests/OmniSharp.Tests/FindSymbolsFacts.cs @@ -186,14 +186,14 @@ private string NestedMethod() {} private async Task FindSymbols(string source) { var workspace = TestHelpers.CreateSimpleWorkspace(source); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); return await controller.FindSymbols(); } private async Task FindSymbolsWithFilter(string source, string filter) { var workspace = TestHelpers.CreateSimpleWorkspace(source); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var request = new FindSymbolsRequest { Filter = filter }; return await controller.FindSymbols(request); } diff --git a/tests/OmniSharp.Tests/GoToFileFacts.cs b/tests/OmniSharp.Tests/GoToFileFacts.cs index 2105a998b8..5746ac6f1c 100644 --- a/tests/OmniSharp.Tests/GoToFileFacts.cs +++ b/tests/OmniSharp.Tests/GoToFileFacts.cs @@ -17,7 +17,7 @@ public void ReturnsAListOfAllWorkspaceFiles() var workspace = TestHelpers.CreateSimpleWorkspace(new Dictionary { { "foo.cs", source1 }, { "bar.cs", source2} }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var response = controller.GoToFile(new Request()); Assert.Equal(2, response.QuickFixes.Count()); @@ -29,7 +29,7 @@ public void ReturnsAListOfAllWorkspaceFiles() public void ReturnsEmptyResponseForEmptyWorskpace() { var workspace = TestHelpers.CreateSimpleWorkspace(new Dictionary()); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var response = controller.GoToFile(new Request()); Assert.Equal(0, response.QuickFixes.Count()); diff --git a/tests/OmniSharp.Tests/HighlightFacts.cs b/tests/OmniSharp.Tests/HighlightFacts.cs index be9b810efb..a356ba2eb2 100644 --- a/tests/OmniSharp.Tests/HighlightFacts.cs +++ b/tests/OmniSharp.Tests/HighlightFacts.cs @@ -24,7 +24,7 @@ class C1 { int n = true; } { "a.cs", code } }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var regions = await controller.Highlight(new HighlightRequest() { FileName = "a.cs", Lines = new[] { 4 } }); AssertSyntax(regions.Highlights, code, 3, @@ -54,7 +54,7 @@ class C1 { int n = true; } { "a.cs", code } }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var regions = await controller.Highlight(new HighlightRequest() { FileName = "a.cs" }); AssertSyntax(regions.Highlights, code, 0, @@ -88,7 +88,7 @@ class C1 { "a.cs", code } }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var regions = await controller.Highlight(new HighlightRequest() { FileName = "a.cs" }); AssertSyntax(regions.Highlights, code, 0, @@ -160,7 +160,7 @@ class C1 { int n = true; } { "a.cs", code } }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var regions = await controller.Highlight(new HighlightRequest() { FileName = "a.cs", ExcludeClassifications = new [] { HighlightClassification.Keyword } }); Assert.DoesNotContain(regions.Highlights, x => x.Kind == "keyword"); @@ -181,7 +181,7 @@ class C1 { int n = true; } { "a.cs", code } }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var regions = await controller.Highlight(new HighlightRequest() { FileName = "a.cs", ExcludeClassifications = new [] { HighlightClassification.Punctuation } }); Assert.DoesNotContain(regions.Highlights, x => x.Kind == "punctuation"); @@ -202,7 +202,7 @@ class C1 { int n = true; } { "a.cs", code } }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var regions = await controller.Highlight(new HighlightRequest() { FileName = "a.cs", ExcludeClassifications = new [] { HighlightClassification.Operator } }); Assert.DoesNotContain(regions.Highlights, x => x.Kind == "operator"); @@ -223,7 +223,7 @@ class C1 { int n = true; } { "a.cs", code } }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var regions = await controller.Highlight(new HighlightRequest() { FileName = "a.cs", ExcludeClassifications = new [] { HighlightClassification.Identifier } }); Assert.DoesNotContain(regions.Highlights, x => x.Kind == "identifier"); @@ -244,7 +244,7 @@ class C1 { int n = true; } { "a.cs", code } }); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var regions = await controller.Highlight(new HighlightRequest() { FileName = "a.cs", ExcludeClassifications = new [] { HighlightClassification.Name } }); Assert.DoesNotContain(regions.Highlights, x => x.Kind.EndsWith(" name")); diff --git a/tests/OmniSharp.Tests/IntellisenseFacts.cs b/tests/OmniSharp.Tests/IntellisenseFacts.cs index c6c759b80e..56c9b1365a 100644 --- a/tests/OmniSharp.Tests/IntellisenseFacts.cs +++ b/tests/OmniSharp.Tests/IntellisenseFacts.cs @@ -196,7 +196,7 @@ private void ContainsCompletions(IEnumerable completions, params string[ private async Task> FindCompletionsAsync(string source, AutoCompleteRequest request = null) { var workspace = TestHelpers.CreateSimpleWorkspace(source); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); if (request == null) { diff --git a/tests/OmniSharp.Tests/NavigateUpDownFacts.cs b/tests/OmniSharp.Tests/NavigateUpDownFacts.cs index 662ec98a8c..5200a40c88 100644 --- a/tests/OmniSharp.Tests/NavigateUpDownFacts.cs +++ b/tests/OmniSharp.Tests/NavigateUpDownFacts.cs @@ -726,7 +726,7 @@ private async Task SendRequest(OmnisharpWorkspace workspace, s { var initialCursorLineColumn = TestHelpers.GetLineAndColumnFromDollar(TestHelpers.RemovePercentMarker(fileContent)); var fileContentNoDollarMarker = TestHelpers.RemoveDollarMarker(fileContent); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var request = new Request { Line = initialCursorLineColumn.Line, diff --git a/tests/OmniSharp.Tests/OmnisharpControllerFacts.cs b/tests/OmniSharp.Tests/OmnisharpControllerFacts.cs index e99a94b21a..e8cf184bca 100644 --- a/tests/OmniSharp.Tests/OmnisharpControllerFacts.cs +++ b/tests/OmniSharp.Tests/OmnisharpControllerFacts.cs @@ -10,7 +10,7 @@ public class OmnisharpControllerFacts private void CreateSimpleWorkspace(out OmnisharpWorkspace workspace, out OmnisharpController controller, out DocumentInfo document, string filename, string contents) { workspace = new OmnisharpWorkspace(); - controller = new OmnisharpController(workspace, null); + controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var projectInfo = ProjectInfo.Create(ProjectId.CreateNewId(), VersionStamp.Create(), "ProjectNameVal", "AssemblyNameVal", LanguageNames.CSharp); diff --git a/tests/OmniSharp.Tests/RenameFacts.cs b/tests/OmniSharp.Tests/RenameFacts.cs index 52be41ce0c..fb7424751e 100644 --- a/tests/OmniSharp.Tests/RenameFacts.cs +++ b/tests/OmniSharp.Tests/RenameFacts.cs @@ -12,7 +12,7 @@ public class RenameFacts private async Task SendRequest(OmnisharpWorkspace workspace, string renameTo, string filename, string fileContent, bool wantsTextChanges = false) { var lineColumn = TestHelpers.GetLineAndColumnFromDollar(fileContent); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var request = new RenameRequest { Line = lineColumn.Line, diff --git a/tests/OmniSharp.Tests/SignatureHelpFacts.cs b/tests/OmniSharp.Tests/SignatureHelpFacts.cs index 1c83b93167..9b0bd78bb1 100644 --- a/tests/OmniSharp.Tests/SignatureHelpFacts.cs +++ b/tests/OmniSharp.Tests/SignatureHelpFacts.cs @@ -371,7 +371,7 @@ private async Task GetSignatureHelp(string source) }; var workspace = TestHelpers.CreateSimpleWorkspace(source); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); return await controller.GetSignatureHelp(request); } } diff --git a/tests/OmniSharp.Tests/TestHelpers.cs b/tests/OmniSharp.Tests/TestHelpers.cs index dc747d1ae1..5fdba302e7 100644 --- a/tests/OmniSharp.Tests/TestHelpers.cs +++ b/tests/OmniSharp.Tests/TestHelpers.cs @@ -139,7 +139,6 @@ public static OmnisharpWorkspace CreateSimpleWorkspace(string source, string fil public static OmnisharpWorkspace CreateSimpleWorkspace(Dictionary sourceFiles) { var workspace = Startup.CreateWorkspace(); - workspace.Options.WithChangedOption(FormattingOptions.TabSize, LanguageNames.CSharp, 4); AddProjectToWorkspace(workspace, "project.json", new[] { "dnx451", "dnxcore50" }, sourceFiles); return workspace; } diff --git a/tests/OmniSharp.Tests/TypeLookupFacts.cs b/tests/OmniSharp.Tests/TypeLookupFacts.cs index 94e8010e6d..f1995e435a 100644 --- a/tests/OmniSharp.Tests/TypeLookupFacts.cs +++ b/tests/OmniSharp.Tests/TypeLookupFacts.cs @@ -13,7 +13,7 @@ public async Task OmitsNamespaceForNonRegularCSharpSyntax() var workspace = TestHelpers.CreateCsxWorkspace(source1); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var response = await controller.TypeLookup(new TypeLookupRequest { FileName = "dummy.csx", Line = 1, Column = 8 }); Assert.Equal("Foo", response.Type); @@ -28,7 +28,7 @@ class Foo {} var workspace = TestHelpers.CreateSimpleWorkspace(source1); - var controller = new OmnisharpController(workspace, null); + var controller = new OmnisharpController(workspace, new FakeOmniSharpOptions()); var response = await controller.TypeLookup(new TypeLookupRequest { FileName = "dummy.cs", Line = 2, Column = 20 }); Assert.Equal("Bar.Foo", response.Type);