fix more tests

tests/OmniSharp.Tests/FindImplementationFacts.cs

@@ -71,7 +71,7 @@ public class SomeClass : Base$Class {}";
  private async Task<IEnumerable<ISymbol>> 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));

tests/OmniSharp.Tests/FindReferencesFacts.cs

@@ -233,7 +233,7 @@ private async Task<QuickFixResponse> FindUsages(string source, bool excludeDefin
  private async Task<QuickFixResponse> FindUsages(Dictionary<string, string> 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);

tests/OmniSharp.Tests/FindSymbolsFacts.cs

@@ -186,14 +186,14 @@ private string NestedMethod() {}
  private async Task<QuickFixResponse> 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<QuickFixResponse> 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);
  }

tests/OmniSharp.Tests/GoToFileFacts.cs

@@ -17,7 +17,7 @@ public void ReturnsAListOfAllWorkspaceFiles()
  var workspace = TestHelpers.CreateSimpleWorkspace(new Dictionary<string, string> {
  { "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<string, string>());
- 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());

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"));

tests/OmniSharp.Tests/IntellisenseFacts.cs

@@ -196,7 +196,7 @@ private void ContainsCompletions(IEnumerable<string> completions, params string[
  private async Task<IEnumerable<AutoCompleteResponse>> 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)
  {

tests/OmniSharp.Tests/NavigateUpDownFacts.cs

@@ -726,7 +726,7 @@ private async Task<NavigateResponse> 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,

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);

tests/OmniSharp.Tests/RenameFacts.cs

@@ -12,7 +12,7 @@ public class RenameFacts
  private async Task<RenameResponse> 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,

tests/OmniSharp.Tests/SignatureHelpFacts.cs

@@ -371,7 +371,7 @@ private async Task<SignatureHelp> 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);
  }
  }

tests/OmniSharp.Tests/TestHelpers.cs

@@ -139,7 +139,6 @@ public static OmnisharpWorkspace CreateSimpleWorkspace(string source, string fil
  public static OmnisharpWorkspace CreateSimpleWorkspace(Dictionary<string, string> sourceFiles)
  {
  var workspace = Startup.CreateWorkspace();
- workspace.Options.WithChangedOption(FormattingOptions.TabSize, LanguageNames.CSharp, 4);
  AddProjectToWorkspace(workspace, "project.json", new[] { "dnx451", "dnxcore50" }, sourceFiles);
  return workspace;
  }

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);