Skip to content
This repository was archived by the owner on Nov 9, 2018. It is now read-only.

Commit de4bd3c

Browse files
rynowakrynowak
committed
CR feedback bro
1 parent 684fdf9 commit de4bd3c

File tree

4 files changed

+35
-36
lines changed

4 files changed

+35
-36
lines changed

‎src/Microsoft.Framework.TestHost/DIA/IDiaSymbol.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,42 +1228,42 @@ uint ordinal
12281228
get;
12291229
}
12301230

1231-
//void get_dataBytes([In] uint cbData, out uint pcbData, out byte pbData);
1231+
void get_dataBytes([In] uint cbData, out uint pcbData, out byte pbData);
12321232

1233-
//void findChildren([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
1233+
void findChildren([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
12341234

1235-
//void findChildrenEx([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
1235+
void findChildrenEx([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
12361236

1237-
//void findChildrenExByAddr([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [In] uint isect, [In] uint offset, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
1237+
void findChildrenExByAddr([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [In] uint isect, [In] uint offset, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
12381238

1239-
//void findChildrenExByVA([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [In] ulong va, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
1239+
void findChildrenExByVA([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [In] ulong va, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
12401240

1241-
//void findChildrenExByRVA([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [In] uint rva, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
1241+
void findChildrenExByRVA([In] SymTagEnum symTag, [MarshalAs(UnmanagedType.LPWStr)] [In] string name, [In] uint compareFlags, [In] uint rva, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
12421242

1243-
//void get_types([In] uint cTypes, out uint pcTypes, [MarshalAs(UnmanagedType.Interface)] out IDiaSymbol pTypes);
1243+
void get_types([In] uint cTypes, out uint pcTypes, [MarshalAs(UnmanagedType.Interface)] out IDiaSymbol pTypes);
12441244

1245-
//void get_typeIds([In] uint cTypeIds, out uint pcTypeIds, out uint pdwTypeIds);
1245+
void get_typeIds([In] uint cTypeIds, out uint pcTypeIds, out uint pdwTypeIds);
12461246

1247-
//void get_undecoratedNameEx([In] uint undecorateOptions, [MarshalAs(UnmanagedType.BStr)] out string name);
1247+
void get_undecoratedNameEx([In] uint undecorateOptions, [MarshalAs(UnmanagedType.BStr)] out string name);
12481248

1249-
//void get_numericProperties([In] uint cnt, out uint pcnt, out uint pProperties);
1249+
void get_numericProperties([In] uint cnt, out uint pcnt, out uint pProperties);
12501250

1251-
//void get_modifierValues([In] uint cnt, out uint pcnt, out ushort pModifiers);
1251+
void get_modifierValues([In] uint cnt, out uint pcnt, out ushort pModifiers);
12521252

1253-
//void findInlineFramesByAddr([In] uint isect, [In] uint offset, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
1253+
void findInlineFramesByAddr([In] uint isect, [In] uint offset, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
12541254

1255-
//void findInlineFramesByRVA([In] uint rva, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
1255+
void findInlineFramesByRVA([In] uint rva, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
12561256

1257-
//void findInlineFramesByVA([In] ulong va, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
1257+
void findInlineFramesByVA([In] ulong va, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumSymbols ppResult);
12581258

1259-
//void findInlineeLines([MarshalAs(UnmanagedType.Interface)] out IDiaEnumLineNumbers ppResult);
1259+
void findInlineeLines([MarshalAs(UnmanagedType.Interface)] out IDiaEnumLineNumbers ppResult);
12601260

1261-
//void findInlineeLinesByAddr([In] uint isect, [In] uint offset, [In] uint length, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumLineNumbers ppResult);
1261+
void findInlineeLinesByAddr([In] uint isect, [In] uint offset, [In] uint length, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumLineNumbers ppResult);
12621262

1263-
//void findInlineeLinesByRVA([In] uint rva, [In] uint length, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumLineNumbers ppResult);
1263+
void findInlineeLinesByRVA([In] uint rva, [In] uint length, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumLineNumbers ppResult);
12641264

1265-
//void findInlineeLinesByVA([In] ulong va, [In] uint length, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumLineNumbers ppResult);
1265+
void findInlineeLinesByVA([In] ulong va, [In] uint length, [MarshalAs(UnmanagedType.Interface)] out IDiaEnumLineNumbers ppResult);
12661266

1267-
//void getSrcLineOnTypeDefn([MarshalAs(UnmanagedType.Interface)] out IDiaLineNumber ppResult);
1267+
void getSrcLineOnTypeDefn([MarshalAs(UnmanagedType.Interface)] out IDiaLineNumber ppResult);
12681268
}
12691269
}

‎src/Microsoft.Framework.TestHost/DIA/IEnumUnknown.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
namespace dia2
88
{
9-
[Guid("00000100-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
10-
[ComImport]
11-
public interface IEnumUnknown
12-
{
13-
void RemoteNext([In] uint celt, [MarshalAs(UnmanagedType.IUnknown)] out object rgelt, out uint pceltFetched);
9+
[Guid("00000100-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
10+
[ComImport]
11+
public interface IEnumUnknown
12+
{
13+
void RemoteNext([In] uint celt, [MarshalAs(UnmanagedType.IUnknown)] out object rgelt, out uint pceltFetched);
1414

15-
void Skip([In] uint celt);
15+
void Skip([In] uint celt);
1616

17-
void Reset();
17+
void Reset();
1818

19-
void Clone([MarshalAs(UnmanagedType.Interface)] out IEnumUnknown ppenum);
20-
}
19+
void Clone([MarshalAs(UnmanagedType.Interface)] out IEnumUnknown ppenum);
20+
}
2121
}

‎src/Microsoft.Framework.TestHost/Program.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Threading.Tasks;
88
using Microsoft.Framework.Runtime;
99
using Microsoft.Framework.Runtime.Common.CommandLine;
10-
using Microsoft.Framework.TestAdapter;
1110

1211
namespace Microsoft.Framework.TestHost
1312
{
@@ -100,9 +99,6 @@ private async Task ExecuteTests(int port, string projectPath, IList<string> test
10099
return;
101100
}
102101

103-
var testServices = TestServices.CreateTestServices(_services, project);
104-
testServices.Add(typeof(ITestExecutionSink), new TestExecutionSink(channel));
105-
106102
var args = new List<string>()
107103
{
108104
"test",
@@ -120,6 +116,7 @@ private async Task ExecuteTests(int port, string projectPath, IList<string> test
120116

121117
try
122118
{
119+
var testServices = TestServices.CreateTestServices(_services, project, channel);
123120
await ProjectCommand.Execute(testServices, project, args.ToArray());
124121
}
125122
catch
@@ -162,13 +159,11 @@ private async Task DiscoverTests(int port, string projectPath)
162159
return;
163160
}
164161

165-
var testServices = TestServices.CreateTestServices(_services, project);
166-
testServices.Add(typeof(ITestDiscoverySink), new TestDiscoverySink(channel));
167-
168162
var args = new string[] { "test", "--list", "--designtime" };
169163

170164
try
171165
{
166+
var testServices = TestServices.CreateTestServices(_services, project, channel);
172167
await ProjectCommand.Execute(testServices, project, args);
173168
}
174169
catch

‎src/Microsoft.Framework.TestHost/TestServices.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ internal static class TestServices
1616
{
1717
public static ServiceProvider CreateTestServices(
1818
IServiceProvider applicationServices,
19-
Project project)
19+
Project project,
20+
ReportingChannel channel)
2021
{
2122
var services = new ServiceProvider(applicationServices);
2223

@@ -32,6 +33,9 @@ public static ServiceProvider CreateTestServices(
3233
typeof(ISourceInformationProvider),
3334
new SourceInformationProvider(projectReference, new NullLogger()));
3435

36+
services.Add(typeof(ITestDiscoverySink), new TestDiscoverySink(channel));
37+
services.Add(typeof(ITestExecutionSink), new TestExecutionSink(channel));
38+
3539
return services;
3640
}
3741

0 commit comments

Comments
 (0)