@@ -94,11 +94,11 @@ public void RunMultipleTestAssembliesWithoutTestAdapterPath(RunnerInfo runnerInf
9494 {
9595 SetTestEnvironment ( _testEnvironment , runnerInfo ) ;
9696
97- var assemblyPaths = BuildMultipleAssemblyPath ( "SimpleTestProject.dll" ) ;
97+ var assemblyPath = GetAssetFullPath ( "SimpleTestProject.dll" ) ;
9898 var xunitAssemblyPath = _testEnvironment . GetTestAsset ( "XUTestProject.dll" ) ;
9999
100- assemblyPaths = string . Join ( " " , assemblyPaths , xunitAssemblyPath . AddDoubleQuote ( ) ) ;
101- InvokeVsTestForExecution ( assemblyPaths , testAdapterPath : string . Empty , FrameworkArgValue , string . Empty ) ;
100+ assemblyPath = string . Join ( " " , assemblyPath . AddDoubleQuote ( ) , xunitAssemblyPath . AddDoubleQuote ( ) ) ;
101+ InvokeVsTestForExecution ( assemblyPath , testAdapterPath : string . Empty , FrameworkArgValue , string . Empty ) ;
102102
103103 ValidateSummaryStatus ( 2 , 2 , 1 ) ;
104104 ExitCodeEquals ( 1 ) ; // failing tests
@@ -143,7 +143,7 @@ public void TestSessionTimeOutTests(RunnerInfo runnerInfo)
143143 SetTestEnvironment ( _testEnvironment , runnerInfo ) ;
144144
145145 var assemblyPaths =
146- BuildMultipleAssemblyPath ( "SimpleTestProject3.dll" ) ;
146+ GetAssetFullPath ( "SimpleTestProject3.dll" ) ;
147147 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
148148 arguments = string . Concat ( arguments , " /TestCaseFilter:TestSessionTimeoutTest" ) ;
149149
@@ -163,7 +163,7 @@ public void TestPlatformShouldBeCompatibleWithOldTestHost(RunnerInfo runnerInfo)
163163 {
164164 SetTestEnvironment ( _testEnvironment , runnerInfo ) ;
165165
166- var assemblyPaths = BuildMultipleAssemblyPath ( "SampleProjectWithOldTestHost.dll" ) ;
166+ var assemblyPaths = GetAssetFullPath ( "SampleProjectWithOldTestHost.dll" ) ;
167167 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
168168
169169 InvokeVsTest ( arguments ) ;
@@ -179,7 +179,7 @@ public void WorkingDirectoryIsSourceDirectory(RunnerInfo runnerInfo)
179179 {
180180 SetTestEnvironment ( _testEnvironment , runnerInfo ) ;
181181
182- var assemblyPaths = BuildMultipleAssemblyPath ( "SimpleTestProject3.dll" ) ;
182+ var assemblyPaths = GetAssetFullPath ( "SimpleTestProject3.dll" ) ;
183183 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
184184 arguments = string . Concat ( arguments , " /tests:WorkingDirectoryTest" ) ;
185185
@@ -206,7 +206,7 @@ public void StackOverflowExceptionShouldBeLoggedToConsoleAndDiagLogFile(RunnerIn
206206 var diagLogFilePath = Path . Combine ( TempDirectory . Path , $ "std_error_log_{ Guid . NewGuid ( ) } .txt") ;
207207 File . Delete ( diagLogFilePath ) ;
208208
209- var assemblyPaths = BuildMultipleAssemblyPath ( "SimpleTestProject3.dll" ) ;
209+ var assemblyPaths = GetAssetFullPath ( "SimpleTestProject3.dll" ) ;
210210 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
211211 arguments = string . Concat ( arguments , " /testcasefilter:ExitWithStackoverFlow" ) ;
212212 arguments = string . Concat ( arguments , $ " /diag:{ diagLogFilePath } ") ;
@@ -236,7 +236,7 @@ public void UnhandleExceptionExceptionShouldBeLoggedToDiagLogFile(RunnerInfo run
236236 File . Delete ( diagLogFilePath ) ;
237237
238238 var assemblyPaths =
239- BuildMultipleAssemblyPath ( "SimpleTestProject3.dll" ) ;
239+ GetAssetFullPath ( "SimpleTestProject3.dll" ) ;
240240 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
241241 arguments = string . Concat ( arguments , " /testcasefilter:ExitwithUnhandleException" ) ;
242242 arguments = string . Concat ( arguments , $ " /diag:{ diagLogFilePath } ") ;
@@ -282,7 +282,7 @@ public void NoIncompatibleSourcesWarningShouldBeDisplayedInTheConsoleWhenGivenSi
282282
283283 var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.6.2 framework and X86 platform. SimpleTestProjectx86 would use Framework .NETFramework,Version=v4.6.2 and Platform X86" ;
284284 var assemblyPaths =
285- BuildMultipleAssemblyPath ( "SimpleTestProjectx86.dll" ) ;
285+ GetAssetFullPath ( "SimpleTestProjectx86.dll" ) ;
286286 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
287287
288288 InvokeVsTest ( arguments + " /diag:logs\\ " ) ;
@@ -302,7 +302,7 @@ public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsoleOnlyWhenRunni
302302
303303 var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.6.2 framework and X86 platform. SimpleTestProject2.dll would use Framework .NETFramework,Version=v4.6.2 and Platform X64" ;
304304 var assemblyPaths =
305- BuildMultipleAssemblyPath ( "SimpleTestProject2.dll" ) ;
305+ GetAssetFullPath ( "SimpleTestProject2.dll" ) ;
306306 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
307307
308308 InvokeVsTest ( arguments ) ;
@@ -330,7 +330,7 @@ public void ExitCodeShouldReturnOneWhenTreatNoTestsAsErrorParameterSetToTrueAndN
330330 {
331331 SetTestEnvironment ( _testEnvironment , runnerInfo ) ;
332332
333- var assemblyPaths = BuildMultipleAssemblyPath ( "SimpleTestProject2.dll" ) ;
333+ var assemblyPaths = GetAssetFullPath ( "SimpleTestProject2.dll" ) ;
334334
335335 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
336336
@@ -350,7 +350,7 @@ public void ExitCodeShouldReturnZeroWhenTreatNoTestsAsErrorParameterSetToFalseAn
350350 {
351351 SetTestEnvironment ( _testEnvironment , runnerInfo ) ;
352352
353- var assemblyPaths = BuildMultipleAssemblyPath ( "SimpleTestProject2.dll" ) ;
353+ var assemblyPaths = GetAssetFullPath ( "SimpleTestProject2.dll" ) ;
354354 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
355355
356356 // Setting /TestCaseFilter to the test name, which does not exists in the assembly, so we will have 0 tests executed
@@ -369,7 +369,7 @@ public void ExitCodeShouldNotDependOnTreatNoTestsAsErrorTrueValueWhenThereAreAny
369369 {
370370 SetTestEnvironment ( _testEnvironment , runnerInfo ) ;
371371
372- var assemblyPaths = BuildMultipleAssemblyPath ( "SimpleTestProject2.dll" ) ;
372+ var assemblyPaths = GetAssetFullPath ( "SimpleTestProject2.dll" ) ;
373373
374374 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
375375
@@ -387,7 +387,7 @@ public void ExitCodeShouldNotDependOnFailTreatNoTestsAsErrorFalseValueWhenThereA
387387 {
388388 SetTestEnvironment ( _testEnvironment , runnerInfo ) ;
389389
390- var assemblyPaths = BuildMultipleAssemblyPath ( "SimpleTestProject2.dll" ) ;
390+ var assemblyPaths = GetAssetFullPath ( "SimpleTestProject2.dll" ) ;
391391 var arguments = PrepareArguments ( assemblyPaths , GetTestAdapterPath ( ) , string . Empty , FrameworkArgValue , runnerInfo . InIsolationValue , resultsDirectory : TempDirectory . Path ) ;
392392
393393 arguments = string . Concat ( arguments , " -- RunConfiguration.TreatNoTestsAsError=false" ) ;
0 commit comments