Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 d9c2e0a1 编写于 作者: C CyrusNajmabadi
浏览文件
操作

Merge branch 'indexAllocations' into taskEnumerable

上级 04fec0bb e15b7790
隐藏空白更改
内联 并排
Showing with 55 addition and 90 deletion
src/Workspaces/CoreTest/FindAllDeclarationsTests.cs
浏览文件 @ d9c2e0a1
......@@ -82,7 +82,8 @@ public partial class FindAllDeclarationsTests : TestBase
InlineData("TestCase", true, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new[] { "TestCase1.TestCase", "TestCase2.TestCase" }),
InlineData("TestCase", false, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new[] { "TestCase1.TestCase", "TestCase2.TestCase" }),
InlineData("TestCase1.TestCase", true, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new string[0]),]
public static async Task FindDeclarationsAsync_Test(string searchTerm, bool ignoreCase, WorkspaceKind workspaceKind, string[] expectedResults)
public async Task FindDeclarationsAsync_Test(string searchTerm, bool ignoreCase, WorkspaceKind workspaceKind, string[] expectedResults)
{
var project = GetProject(workspaceKind);
var declarations = await SymbolFinder.FindDeclarationsAsync(project, searchTerm, ignoreCase).ConfigureAwait(false);
......@@ -90,7 +91,7 @@ public static async Task FindDeclarationsAsync_Test(string searchTerm, bool igno
}
[Fact]
public static async Task FindDeclarationsAsync_Test_NullProject()
public async Task FindDeclarationsAsync_Test_NullProject()
{
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
......@@ -99,7 +100,7 @@ public static async Task FindDeclarationsAsync_Test_NullProject()
}
[Fact]
public static async Task FindDeclarationsAsync_Test_NullString()
public async Task FindDeclarationsAsync_Test_NullString()
{
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
......@@ -109,7 +110,7 @@ public static async Task FindDeclarationsAsync_Test_NullString()
}
[Fact]
public static async Task FindDeclarationsAsync_Test_Cancellation()
public async Task FindDeclarationsAsync_Test_Cancellation()
{
await Assert.ThrowsAsync<TaskCanceledException>(async () =>
{
......@@ -121,7 +122,7 @@ public static async Task FindDeclarationsAsync_Test_Cancellation()
}
[Fact, WorkItem(1094411, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1094411")]
public static async Task FindDeclarationsAsync_Metadata()
public async Task FindDeclarationsAsync_Metadata()
{
var solution = CreateSolution();
var csharpId = ProjectId.CreateNewId();
......@@ -142,7 +143,7 @@ public static async Task FindDeclarationsAsync_Metadata()
}
[Fact, WorkItem(6616, "https://github.com/dotnet/roslyn/issues/6616")]
public static async Task FindDeclarationsAsync_PreviousSubmission()
public async Task FindDeclarationsAsync_PreviousSubmission()
{
var solution = CreateSolution();
......@@ -246,7 +247,8 @@ public class Inner
InlineData("TestCase", true, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new[] { "TestCase1.TestCase", "TestCase2.TestCase" }),
InlineData("TestCase", false, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new[] { "TestCase1.TestCase", "TestCase2.TestCase" }),
InlineData("TestCase1.TestCase", true, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new string[0]),]
public static async Task FindSourceDeclarationsAsync_Project_Test(string searchTerm, bool ignoreCase, WorkspaceKind workspaceKind, string[] expectedResults)
public async Task FindSourceDeclarationsAsync_Project_Test(string searchTerm, bool ignoreCase, WorkspaceKind workspaceKind, string[] expectedResults)
{
var project = GetProject(workspaceKind);
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(project, searchTerm, ignoreCase).ConfigureAwait(false);
......@@ -254,7 +256,7 @@ public static async Task FindSourceDeclarationsAsync_Project_Test(string searchT
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Project_Test_NullProject()
public async Task FindSourceDeclarationsAsync_Project_Test_NullProject()
{
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
......@@ -263,7 +265,7 @@ public static async Task FindSourceDeclarationsAsync_Project_Test_NullProject()
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Project_Test_NullString()
public async Task FindSourceDeclarationsAsync_Project_Test_NullString()
{
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
......@@ -273,7 +275,7 @@ public static async Task FindSourceDeclarationsAsync_Project_Test_NullString()
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Project_Test_Cancellation()
public async Task FindSourceDeclarationsAsync_Project_Test_Cancellation()
{
await Assert.ThrowsAsync<TaskCanceledException>(async () =>
{
......@@ -353,7 +355,8 @@ public static async Task FindSourceDeclarationsAsync_Project_Test_Cancellation()
InlineData("TestCase", true, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new[] { "TestCase1.TestCase", "TestCase2.TestCase" }),
InlineData("TestCase", false, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new[] { "TestCase1.TestCase", "TestCase2.TestCase" }),
InlineData("TestCase1.TestCase", true, WorkspaceKind.TwoNamespacesWithIdenticalClasses, new string[0]),]
public static async Task FindSourceDeclarationsAsync_Solution_Test(string searchTerm, bool ignoreCase, WorkspaceKind workspaceKind, string[] expectedResults)
public async Task FindSourceDeclarationsAsync_Solution_Test(string searchTerm, bool ignoreCase, WorkspaceKind workspaceKind, string[] expectedResults)
{
var solution = GetSolution(workspaceKind);
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(solution, searchTerm, ignoreCase).ConfigureAwait(false);
......@@ -361,7 +364,7 @@ public static async Task FindSourceDeclarationsAsync_Solution_Test(string search
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Solution_Test_NullProject()
public async Task FindSourceDeclarationsAsync_Solution_Test_NullProject()
{
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
......@@ -370,7 +373,7 @@ public static async Task FindSourceDeclarationsAsync_Solution_Test_NullProject()
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Solution_Test_NullString()
public async Task FindSourceDeclarationsAsync_Solution_Test_NullString()
{
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
......@@ -380,22 +383,14 @@ public static async Task FindSourceDeclarationsAsync_Solution_Test_NullString()
}
[Fact]
public static void FindSourceDeclarationsAsync_Solution_Test_Cancellation()
public async Task FindSourceDeclarationsAsync_Solution_Test_Cancellation()
{
Assert.Throws<AggregateException>(() =>
await Assert.ThrowsAsync<OperationCanceledException>(async () =>
{
try
{
var cts = new CancellationTokenSource();
var solution = GetSolution(WorkspaceKind.SingleClass);
cts.Cancel();
var declarations = SymbolFinder.FindSourceDeclarationsAsync(solution, "Test", true, SymbolFilter.All, cts.Token).Result;
}
catch (AggregateException ex)
{
VerifyInnerExceptionIsType<OperationCanceledException>(ex);
throw;
}
var cts = new CancellationTokenSource();
var solution = GetSolution(WorkspaceKind.SingleClass);
cts.Cancel();
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(solution, "Test", true, SymbolFilter.All, cts.Token);
});
}
......@@ -413,7 +408,8 @@ public static void FindSourceDeclarationsAsync_Solution_Test_Cancellation()
InlineData(WorkspaceKind.TwoProjectsEachWithASingleClassWithSingleField, new[] { "TestCases", "TestCases.TestCase", "TestCases.TestCase.TestField" }),
InlineData(WorkspaceKind.NestedClass, new[] { "TestCases", "TestCases.TestCase", "TestCases.TestCase.InnerTestCase" }),
InlineData(WorkspaceKind.TwoNamespacesWithIdenticalClasses, new[] { "TestCase1", "TestCase1.TestCase", "TestCase2.TestCase", "TestCase2" }),]
public static async Task FindSourceDeclarationsAsync_Project_Func_Test(WorkspaceKind workspaceKind, string[] expectedResults)
public async Task FindSourceDeclarationsAsync_Project_Func_Test(WorkspaceKind workspaceKind, string[] expectedResults)
{
var project = GetProject(workspaceKind);
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(project, str => str.Contains("Test")).ConfigureAwait(false);
......@@ -421,7 +417,7 @@ public static async Task FindSourceDeclarationsAsync_Project_Func_Test(Workspace
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Project_Func_Test_AlwaysTruePredicate()
public async Task FindSourceDeclarationsAsync_Project_Func_Test_AlwaysTruePredicate()
{
var project = GetProject(WorkspaceKind.SingleClass);
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(project, str => true).ConfigureAwait(false);
......@@ -429,7 +425,7 @@ public static async Task FindSourceDeclarationsAsync_Project_Func_Test_AlwaysTru
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Project_Func_Test_AlwaysFalsePredicate()
public async Task FindSourceDeclarationsAsync_Project_Func_Test_AlwaysFalsePredicate()
{
var project = GetProject(WorkspaceKind.SingleClass);
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(project, str => false).ConfigureAwait(false);
......@@ -437,49 +433,33 @@ public static async Task FindSourceDeclarationsAsync_Project_Func_Test_AlwaysFal
}
[Fact]
public static void FindSourceDeclarationsAsync_Project_Func_Test_NullProject()
public async Task FindSourceDeclarationsAsync_Project_Func_Test_NullProject()
{
Assert.Throws<AggregateException>(() =>
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
try
{
var declarations = SymbolFinder.FindSourceDeclarationsAsync((Project)null, str => str.Contains("Test")).Result;
}
catch (AggregateException ex)
{
VerifyInnerExceptionArgumentNull(ex, "project");
throw;
}
var declarations = await SymbolFinder.FindSourceDeclarationsAsync((Project)null, str => str.Contains("Test"));
});
}
[Fact]
public static void FindSourceDeclarationsAsync_Project_Func_Test_NullPredicate()
public async Task FindSourceDeclarationsAsync_Project_Func_Test_NullPredicate()
{
Assert.Throws<ArgumentNullException>(() =>
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
var project = GetProject(WorkspaceKind.SingleClass);
var declarations = SymbolFinder.FindSourceDeclarationsAsync(project, null).Result;
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(project, null);
});
}
[Fact]
public static void FindSourceDeclarationsAsync_Project_Func_Test_Cancellation()
public async Task FindSourceDeclarationsAsync_Project_Func_Test_Cancellation()
{
Assert.Throws<AggregateException>(() =>
await Assert.ThrowsAsync<OperationCanceledException>(async () =>
{
try
{
var cts = new CancellationTokenSource();
var project = GetProject(WorkspaceKind.SingleClass);
cts.Cancel();
var declarations = SymbolFinder.FindSourceDeclarationsAsync(project, str => str.Contains("Test"), SymbolFilter.All, cts.Token).Result;
}
catch (AggregateException ex)
{
VerifyInnerExceptionIsType<OperationCanceledException>(ex);
throw;
}
var cts = new CancellationTokenSource();
var project = GetProject(WorkspaceKind.SingleClass);
cts.Cancel();
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(project, str => str.Contains("Test"), SymbolFilter.All, cts.Token);
});
}
......@@ -497,7 +477,8 @@ public static void FindSourceDeclarationsAsync_Project_Func_Test_Cancellation()
InlineData(WorkspaceKind.TwoProjectsEachWithASingleClassWithSingleField, new[] { "TestCases", "TestCases.TestCase", "TestCases.TestCase.TestField", "TestCases", "TestCases.TestCase", "TestCases.TestCase.TestField" }),
InlineData(WorkspaceKind.NestedClass, new[] { "TestCases", "TestCases.TestCase", "TestCases.TestCase.InnerTestCase" }),
InlineData(WorkspaceKind.TwoNamespacesWithIdenticalClasses, new[] { "TestCase1", "TestCase1.TestCase", "TestCase2.TestCase", "TestCase2" }),]
public static async Task FindSourceDeclarationsAsync_Solution_Func_Test(WorkspaceKind workspaceKind, string[] expectedResult)
public async Task FindSourceDeclarationsAsync_Solution_Func_Test(WorkspaceKind workspaceKind, string[] expectedResult)
{
var solution = GetSolution(workspaceKind);
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(solution, str => str.Contains("Test")).ConfigureAwait(false);
......@@ -505,7 +486,7 @@ public static async Task FindSourceDeclarationsAsync_Solution_Func_Test(Workspac
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Solution_Func_Test_AlwaysTruePredicate()
public async Task FindSourceDeclarationsAsync_Solution_Func_Test_AlwaysTruePredicate()
{
var solution = GetSolution(WorkspaceKind.SingleClass);
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(solution, str => true).ConfigureAwait(false);
......@@ -513,7 +494,7 @@ public static async Task FindSourceDeclarationsAsync_Solution_Func_Test_AlwaysTr
}
[Fact]
public static async Task FindSourceDeclarationsAsync_Solution_Func_Test_AlwaysFalsePredicate()
public async Task FindSourceDeclarationsAsync_Solution_Func_Test_AlwaysFalsePredicate()
{
var solution = GetSolution(WorkspaceKind.SingleClass);
var declarations = await SymbolFinder.FindSourceDeclarationsAsync(solution, str => false).ConfigureAwait(false);
......@@ -521,54 +502,38 @@ public static async Task FindSourceDeclarationsAsync_Solution_Func_Test_AlwaysFa
}
[Fact]
public static void FindSourceDeclarationsAsync_Solution_Func_Test_NullSolution()
public async Task FindSourceDeclarationsAsync_Solution_Func_Test_NullSolution()
{
Assert.Throws<AggregateException>(() =>
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
try
{
var declarations = SymbolFinder.FindSourceDeclarationsAsync((Solution)null, str => str.Contains("Test")).Result;
}
catch (AggregateException ex)
{
VerifyInnerExceptionArgumentNull(ex, "solution");
throw;
}
await SymbolFinder.FindSourceDeclarationsAsync((Solution)null, str => str.Contains("Test"));
});
}
[Fact]
public static void FindSourceDeclarationsAsync_Solution_Func_Test_NullPredicate()
public async Task FindSourceDeclarationsAsync_Solution_Func_Test_NullPredicate()
{
Assert.Throws<ArgumentNullException>(() =>
await Assert.ThrowsAsync<ArgumentNullException>(async () =>
{
var solution = GetSolution(WorkspaceKind.SingleClass);
var declarations = SymbolFinder.FindSourceDeclarationsAsync(solution, null).Result;
await SymbolFinder.FindSourceDeclarationsAsync(solution, null);
});
}
[Fact]
public static void FindSourceDeclarationsAsync_Solution_Func_Test_Cancellation()
public async Task FindSourceDeclarationsAsync_Solution_Func_Test_Cancellation()
{
Assert.Throws<AggregateException>(() =>
await Assert.ThrowsAsync<OperationCanceledException>(async () =>
{
try
{
var cts = new CancellationTokenSource();
var solution = GetSolution(WorkspaceKind.SingleClass);
cts.Cancel();
var declarations = SymbolFinder.FindSourceDeclarationsAsync(solution, str => str.Contains("Test"), SymbolFilter.All, cts.Token).Result;
}
catch (AggregateException ex)
{
VerifyInnerExceptionIsType<OperationCanceledException>(ex);
throw;
}
var cts = new CancellationTokenSource();
var solution = GetSolution(WorkspaceKind.SingleClass);
cts.Cancel();
await SymbolFinder.FindSourceDeclarationsAsync(solution, str => str.Contains("Test"), SymbolFilter.All, cts.Token);
});
}
[Fact]
public static async Task TestSymbolTreeInfoSerialization()
public async Task TestSymbolTreeInfoSerialization()
{
var solution = GetSolution(WorkspaceKind.SingleClass);
var compilation = await solution.Projects.First().GetCompilationAsync();
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或