microsoft · kaadhina · Jun 1, 2016 · Jun 1, 2016 · Jun 1, 2016 · Jun 1, 2016
diff --git a/Tasks/DeployVisualStudioTestAgent/Strings/resources.resjson/en-US/resources.resjson b/Tasks/DeployVisualStudioTestAgent/Strings/resources.resjson/en-US/resources.resjson
@@ -7,7 +7,7 @@
   "loc.group.displayName.agentConfiguration": "Agent Configuration",
   "loc.group.displayName.advanced": "Advanced",
   "loc.input.label.testMachineGroup": "Machines",
-  "loc.input.help.testMachineGroup": "Provide a comma separated list of machine IP addresses or FQDNs along with ports. Port is defaulted based on the selected protocol. `Eg: dbserver.fabrikam.com,dbserver_int.fabrikam.com:5986,192.168.12.34:5986` Or provide output variable of other tasks. `Eg: $(variableName)` Or provide a Machine Group Name.",
+  "loc.input.help.testMachineGroup": "Provide a comma separated list of machine IP addresses or FQDNs along with ports. Port is defaulted based on the selected protocol. Eg: `dbserver.fabrikam.com,dbserver_int.fabrikam.com:5986,192.168.12.34:5986` Or provide output variable of other tasks. Eg: `$(variableName)` Or provide a Machine Group Name.",
   "loc.input.label.adminUserName": "Admin Login",
   "loc.input.help.adminUserName": "Administrator login for the target machines.",
   "loc.input.label.adminPassword": "Admin Password",

diff --git a/Tasks/DeployVisualStudioTestAgent/task.json b/Tasks/DeployVisualStudioTestAgent/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 28
+        "Patch": 29
     },
     "demands": [
 
@@ -43,7 +43,7 @@
             "label": "Machines",
             "defaultValue": "",
             "required": true,
-            "helpMarkDown": "Provide a comma separated list of machine IP addresses or FQDNs along with ports. Port is defaulted based on the selected protocol. `Eg: dbserver.fabrikam.com,dbserver_int.fabrikam.com:5986,192.168.12.34:5986` Or provide output variable of other tasks. `Eg: $(variableName)` Or provide a Machine Group Name.",
+            "helpMarkDown": "Provide a comma separated list of machine IP addresses or FQDNs along with ports. Port is defaulted based on the selected protocol. Eg: `dbserver.fabrikam.com,dbserver_int.fabrikam.com:5986,192.168.12.34:5986` Or provide output variable of other tasks. Eg: `$(variableName)` Or provide a Machine Group Name.",
             "groupName": "testMachineGroups"
         },
         {

diff --git a/Tasks/DeployVisualStudioTestAgent/task.loc.json b/Tasks/DeployVisualStudioTestAgent/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 28
+    "Patch": 29
   },
   "demands": [],
   "minimumAgentVersion": "1.97.0",

diff --git a/Tasks/RunDistributedTests/Strings/resources.resjson/en-US/resources.resjson b/Tasks/RunDistributedTests/Strings/resources.resjson/en-US/resources.resjson
@@ -7,9 +7,9 @@
   "loc.group.displayName.executionOptions": "Execution Options",
   "loc.group.displayName.reportingOptions": "Reporting Options",
   "loc.input.label.testMachineGroup": "Machines",
-  "loc.input.help.testMachineGroup": "Provide a comma separated list of machine IP addresses or FQDNs. `Eg: dbserver.fabrikam.com or 192.168.12.34` Or provide output variable of other tasks. `Eg: $(variableName)` Or provide a Machine Group Name",
+  "loc.input.help.testMachineGroup": "Provide a comma separated list of machine IP addresses or FQDNs. Eg: `dbserver.fabrikam.com or 192.168.12.34` Or provide output variable of other tasks. Eg: `$(variableName)` Or provide a Machine Group Name",
   "loc.input.label.dropLocation": "Test Drop Location",
-  "loc.input.help.dropLocation": "Location where the test binaries have been dropped in the agent machine(s) as part of the 'Windows Machine File Copy' or 'Azure File Copy` task. System Environment Variables can also be used in location string. e.g., `%systemdrive%\\Tests`, `%temp%\\DropLocation` etc.",
+  "loc.input.help.dropLocation": "Location where the test binaries have been dropped in the agent machine(s) as part of the 'Windows Machine File Copy' or 'Azure File Copy' task. System Environment Variables can also be used in location string. e.g., `%systemdrive%\\Tests`, `%temp%\\DropLocation` etc.",
   "loc.input.label.testSelection": "Test Selection",
   "loc.input.help.testSelection": "Select the way you want to run tests : using Test Assemblies or using Test Plan.",
   "loc.input.label.testPlan": "Test Plan",

diff --git a/Tasks/RunDistributedTests/task.json b/Tasks/RunDistributedTests/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 37
+        "Patch": 38
     },
     "demands": [
     ],
@@ -42,7 +42,7 @@
             "label": "Machines",
             "defaultValue": "",
             "required": true,
-            "helpMarkDown": "Provide a comma separated list of machine IP addresses or FQDNs. `Eg: dbserver.fabrikam.com or 192.168.12.34` Or provide output variable of other tasks. `Eg: $(variableName)` Or provide a Machine Group Name",
+            "helpMarkDown": "Provide a comma separated list of machine IP addresses or FQDNs. Eg: `dbserver.fabrikam.com or 192.168.12.34` Or provide output variable of other tasks. Eg: `$(variableName)` Or provide a Machine Group Name",
             "groupName": "setupOptions"
         },
         {
@@ -51,7 +51,7 @@
             "label": "Test Drop Location",
             "defaultValue": "",
             "required": true,
-            "helpMarkDown": "Location where the test binaries have been dropped in the agent machine(s) as part of the 'Windows Machine File Copy' or 'Azure File Copy` task. System Environment Variables can also be used in location string. e.g., `%systemdrive%\\Tests`, `%temp%\\DropLocation` etc.",
+            "helpMarkDown": "Location where the test binaries have been dropped in the agent machine(s) as part of the 'Windows Machine File Copy' or 'Azure File Copy' task. System Environment Variables can also be used in location string. e.g., `%systemdrive%\\Tests`, `%temp%\\DropLocation` etc.",
             "groupName": "setupOptions"
         },
         {

diff --git a/Tasks/RunDistributedTests/task.loc.json b/Tasks/RunDistributedTests/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 37
+    "Patch": 38
   },
   "demands": [],
   "minimumAgentVersion": "1.95.0",

diff --git a/Tasks/VsTest/Helpers.ps1 b/Tasks/VsTest/Helpers.ps1
@@ -133,3 +133,53 @@ function Locate-VSVersion()
 	}
 	return $version
 }
+
+function GetResultsLocation {
+	[cmdletbinding()]
+	[OutputType([System.String])]
+	param(		
+		[string]$runSettingsFilePath		
+	)
+
+    # If this is a runsettings file then try to get the custom results location from it
+
+    if(!(CheckIfDirectory $runSettingsFilePath) -And (CheckIfRunsettings $runSettingsFilePath))
+    {
+        $runSettingsForTestResults = [System.Xml.XmlDocument](Get-Content $runSettingsFilePath)
+        $resultsDirElement = $runSettingsForTestResults.SelectNodes("//RunSettings/RunConfiguration/ResultsDirectory")
+
+        if($resultsDirElement -And $resultsDirElement.Count -ne 0)
+        {
+            $customLocation = $runSettingsForTestResults.RunSettings.RunConfiguration.ResultsDirectory       
+            if([io.path]::IsPathRooted($customLocation))
+            {
+                return $customLocation
+            }
+            else
+            {
+                # Resutls directory is relative to the location of runsettings
+                return [io.path]::GetFullPath([io.path]::Combine([io.path]::GetDirectoryName($runSettingsFilePath), $customLocation))
+            }
+        }        
+    }
+
+    return $null
+}
+
+function CheckIfRunsettings($runSettingsFilePath)
+{
+    if(([string]::Compare([io.path]::GetExtension($runSettingsFilePath), ".runsettings", $True) -eq 0) -Or ([string]::Compare([io.path]::GetExtension($runSettingsFilePath), ".tmp", $True) -eq 0))
+    {
+        return $true
+    }
+    return $false
+}
+
+function CheckIfDirectory($filePath)
+{
+    if(Test-Path $filePath -pathtype container)
+    {
+        return $true
+    }
+    return $false
+}
diff --git a/Tasks/VsTest/VSTest.ps1 b/Tasks/VsTest/VSTest.ps1
@@ -94,7 +94,6 @@ try
         $artifactsDirectory = Get-TaskVariable -Context $distributedTaskContext -Name "System.ArtifactsDirectory" -Global $FALSE
 
         $workingDirectory = $artifactsDirectory
-        $testResultsDirectory = $workingDirectory + [System.IO.Path]::DirectorySeparatorChar + "TestResults"
 
         if($runInParallel -eq "True")
         {
@@ -108,6 +107,17 @@ try
 
         $defaultCpuCount = "0"    
         $runSettingsFileWithParallel = [string](SetupRunSettingsFileForParallel $runInParallel $runSettingsFile $defaultCpuCount)
+
+        #If there is settings file and no override parameters, try to get the custom resutls location
+        if(![System.String]::IsNullOrWhiteSpace($runSettingsFileWithParallel) -and !$overrideTestrunParameters)
+        {
+            $testResultsDirectory = GetResultsLocation $runSettingsFileWithParallel 
+        }
+        if(!$testResultsDirectory)
+        {
+            $testResultsDirectory = $workingDirectory + [System.IO.Path]::DirectorySeparatorChar + "TestResults"
+        } 
+        Write-Verbose "Test results directory: $testResultsDirectory"
 
         Invoke-VSTest -TestAssemblies $testAssemblyFiles -VSTestVersion $vsTestVersion -TestFiltercriteria $testFiltercriteria -RunSettingsFile $runSettingsFileWithParallel -PathtoCustomTestAdapters $pathtoCustomTestAdapters -CodeCoverageEnabled $codeCoverage -OverrideTestrunParameters $overrideTestrunParameters -OtherConsoleOptions $otherConsoleOptions -WorkingFolder $workingDirectory -TestResultsFolder $testResultsDirectory -SourcesDirectory $sourcesDirectory
 

diff --git a/Tasks/VsTest/task.json b/Tasks/VsTest/task.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 37
+    "Patch": 38
   },
   "demands": [
     "vstest"

diff --git a/Tasks/VsTest/task.loc.json b/Tasks/VsTest/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 37
+    "Patch": 38
   },
   "demands": [
     "vstest"

diff --git a/Tests/L0/VsTest/DefaultTestResultsDirectoryIsUsedIfOverrideParamsAreUsed.ps1 b/Tests/L0/VsTest/DefaultTestResultsDirectoryIsUsedIfOverrideParamsAreUsed.ps1
@@ -0,0 +1,34 @@
+[cmdletbinding()]
+param()
+
+. $PSScriptRoot\..\..\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\..\..\Tasks\VsTest\Helpers.ps1
+
+Register-Mock Get-TaskVariable { "c:\testSource" }
+Register-Mock Convert-String { $true }
+Register-Mock Find-Files { $true }
+Register-Mock CmdletHasMember { $true }
+Register-Mock Publish-TestResults { $true }
+Register-Mock Invoke-VSTest { $true }
+
+
+$input = @{
+'vsTestVersion'='14.0'
+'testAssembly'='asd.dll'
+'testFiltercriteria'=''
+'runSettingsFile'='asd'
+'codeCoverageEnabled'='false'
+'pathtoCustomTestAdapters'=''
+'overrideTestrunParameters'='asd'
+'otherConsoleOptions'=''
+'testRunTitle'=''
+'platform'=''
+'configuration'=''
+'publishRunAttachments'='true'
+'runInParallel'='false'
+}
+& $PSScriptRoot\..\..\..\Tasks\VsTest\VSTest.ps1 @input
+
+Assert-WasCalled Invoke-VSTest -ParametersEvaluator {
+	$TestResultsFolder -eq 'c:\testSource\TestResults'
+}
diff --git a/Tests/L0/VsTest/DefaultTestResultsDirectoryIsUsedIfnorunsettings.ps1 b/Tests/L0/VsTest/DefaultTestResultsDirectoryIsUsedIfnorunsettings.ps1
@@ -0,0 +1,34 @@
+[cmdletbinding()]
+param()
+
+. $PSScriptRoot\..\..\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\..\..\Tasks\VsTest\Helpers.ps1
+
+Register-Mock Get-TaskVariable { "c:\testSource" }
+Register-Mock Convert-String { $true }
+Register-Mock Find-Files { $true }
+Register-Mock CmdletHasMember { $true }
+Register-Mock Publish-TestResults { $true }
+Register-Mock Invoke-VSTest { $true }
+
+
+$input = @{
+'vsTestVersion'='14.0'
+'testAssembly'='asd.dll'
+'testFiltercriteria'=''
+'runSettingsFile'=''
+'codeCoverageEnabled'='false'
+'pathtoCustomTestAdapters'=''
+'overrideTestrunParameters'='asd'
+'otherConsoleOptions'=''
+'testRunTitle'=''
+'platform'=''
+'configuration'=''
+'publishRunAttachments'='true'
+'runInParallel'='false'
+}
+& $PSScriptRoot\..\..\..\Tasks\VsTest\VSTest.ps1 @input
+
+Assert-WasCalled Invoke-VSTest -ParametersEvaluator {
+	$TestResultsFolder -eq 'c:\testSource\TestResults'
+}
diff --git a/Tests/L0/VsTest/GetResultsLocationReturnsNullForDirectory.ps1 b/Tests/L0/VsTest/GetResultsLocationReturnsNullForDirectory.ps1
@@ -0,0 +1,12 @@
+[cmdletbinding()]
+param()
+
+. $PSScriptRoot\..\..\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\..\..\Tasks\VsTest\Helpers.ps1
+
+$tempDirName = [System.Guid]::NewGuid().ToString() + '.runsettings'
+$tempDir = New-Item -Type Directory -Name $tempDirName
+
+$resultsLocation = GetResultsLocation $tempDirName
+
+Assert-AreEqual $null $resultsLocation 
diff --git a/Tests/L0/VsTest/GetResultsLocationReturnsNullForRunsettingsWithoutResultsDirectory.ps1 b/Tests/L0/VsTest/GetResultsLocationReturnsNullForRunsettingsWithoutResultsDirectory.ps1
@@ -0,0 +1,20 @@
+[cmdletbinding()]
+param()
+
+. $PSScriptRoot\..\..\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\..\..\Tasks\VsTest\Helpers.ps1
+
+$temprunsettingsfile = [io.path]::ChangeExtension([io.path]::GetTempFileName(),"runsettings")
+$runsettings = @('<RunSettings><RunConfiguration>
+</RunConfiguration></RunSettings>
+')
+Set-Content -Value $runsettings -Path $temprunsettingsfile
+
+$resultsLocation = GetResultsLocation $temprunsettingsfile
+
+Assert-AreEqual $null $resultsLocation 
+
+
+if(Test-Path $temprunsettingsfile){
+	Remove-Item $temprunsettingsfile
+}
diff --git a/Tests/L0/VsTest/GetResultsLocationReturnsPathForTmpFile.ps1 b/Tests/L0/VsTest/GetResultsLocationReturnsPathForTmpFile.ps1
@@ -0,0 +1,21 @@
+[cmdletbinding()]
+param()
+
+. $PSScriptRoot\..\..\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\..\..\Tasks\VsTest\Helpers.ps1
+
+$temprunsettingsfile = [io.path]::GetTempFileName()
+$runsettings = @('<RunSettings><RunConfiguration>
+<ResultsDirectory>C:\myResultsFolder</ResultsDirectory> 
+</RunConfiguration></RunSettings>
+')
+Set-Content -Value $runsettings -Path $temprunsettingsfile
+
+$resultsLocation = GetResultsLocation $temprunsettingsfile
+
+Assert-AreEqual 'C:\myResultsFolder' $resultsLocation 
+
+
+if(Test-Path $temprunsettingsfile){
+	Remove-Item $temprunsettingsfile
+}
diff --git a/Tests/L0/VsTest/GetResultsLocationReturnsPathFromRunsettings.ps1 b/Tests/L0/VsTest/GetResultsLocationReturnsPathFromRunsettings.ps1
@@ -0,0 +1,21 @@
+[cmdletbinding()]
+param()
+
+. $PSScriptRoot\..\..\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\..\..\Tasks\VsTest\Helpers.ps1
+
+$temprunsettingsfile = [io.path]::ChangeExtension([io.path]::GetTempFileName(),"runsettings")
+$runsettings = @('<RunSettings><RunConfiguration>
+<ResultsDirectory>C:\myResultsFolder</ResultsDirectory> 
+</RunConfiguration></RunSettings>
+')
+Set-Content -Value $runsettings -Path $temprunsettingsfile
+
+$resultsLocation = GetResultsLocation $temprunsettingsfile
+
+Assert-AreEqual 'C:\myResultsFolder' $resultsLocation 
+
+
+if(Test-Path $temprunsettingsfile){
+	Remove-Item $temprunsettingsfile
+}
diff --git a/Tests/L0/VsTest/GetResultsLocationReturnsPathFromRunsettingsForRelativePaths.ps1 b/Tests/L0/VsTest/GetResultsLocationReturnsPathFromRunsettingsForRelativePaths.ps1
@@ -0,0 +1,22 @@
+[cmdletbinding()]
+param()
+
+. $PSScriptRoot\..\..\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\..\..\Tasks\VsTest\Helpers.ps1
+
+$tempsettingsfile = [io.path]::ChangeExtension([io.path]::GetTempFileName(),"runsettings")
+$runsettings = @('<RunSettings><RunConfiguration>
+<ResultsDirectory>.\myResultsFolder</ResultsDirectory> 
+</RunConfiguration></RunSettings>
+')
+Set-Content -Value $runsettings -Path $tempsettingsfile
+
+$resultsLocation = GetResultsLocation $tempsettingsfile
+
+$expectedLocation = [io.path]::Combine([io.path]::GetDirectoryName($tempsettingsfile), "myResultsFolder")
+Assert-AreEqual $expectedLocation $resultsLocation 
+
+
+if(Test-Path $tempsettingsfile){
+	Remove-Item $tempsettingsfile
+}
diff --git a/Tests/L0/VsTest/GetResultsReturnsNullForTestsettings.ps1 b/Tests/L0/VsTest/GetResultsReturnsNullForTestsettings.ps1
@@ -0,0 +1,9 @@
+[cmdletbinding()]
+param()
+
+. $PSScriptRoot\..\..\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\..\..\Tasks\VsTest\Helpers.ps1
+
+$resultsLocation = GetResultsLocation "C:\asdf.testsettings"
+
+Assert-AreEqual $null $resultsLocation