Merge pull request #5465 from maddieclayton/testfix

Add missing test project in TestMappings

Author: cormacpayne

TestMappings.json

@@ -15,7 +15,8 @@
     ".\\src\\ResourceManager\\AnalysisServices\\Commands.AnalysisServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.AnalysisServices.Test.dll"
   ],
   "src/ResourceManager/ApiManagement/": [
-    ".\\src\\ResourceManager\\ApiManagement\\Commands.ApiManagement.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApiManagement.Test.dll"
+    ".\\src\\ResourceManager\\ApiManagement\\Commands.ApiManagement.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApiManagement.Test.dll",
+    ".\\src\\ResourceManager\\ApiManagement\\Commands.SMAPI.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.dll"
   ],
   "src/ResourceManager/ApplicationInsights/": [
     ".\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApplicationInsights.Test.dll"

src/ResourceManager/ApiManagement/Commands.SMAPI.Test/ScenarioTests/ApiManagementTests.ps1

@@ -164,7 +164,7 @@ function Api-ImportExportWadlTest {
 
     $context = New-AzureRmApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
 
-    $wadlPath = "./Resources/WADLYahoo.xml"
+    $wadlPath = "$TestOutputRoot/Resources/WADLYahoo.xml"
     $path = "wadlapi"
     $wadlApiId = getAssetName
 
@@ -196,7 +196,7 @@ function Api-ImportExportSwaggerTest {
 
     $context = New-AzureRmApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
 
-    $swaggerPath = "./Resources/SwaggerPetStoreV2.json"
+    $swaggerPath = "$TestOutputRoot/Resources/SwaggerPetStoreV2.json"
     $swaggerUrl = "http://petstore.swagger.io/v2/swagger.json"
     $path1 = "swaggerapifromFile"
     $path2 = "swaggerapifromUrl"
@@ -241,7 +241,7 @@ function Api-ImportExportWsdlTest {
 
     $context = New-AzureRmApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
 
-    $wsdlPath1 = "./Resources/Weather.wsdl"
+    $wsdlPath1 = "$TestOutputRoot/Resources/Weather.wsdl"
     $wsdlUrl = "http://www.webservicex.net/stockquote.asmx?WSDL"
     $path1 = "soapapifromFile"
     $path2 = "soapapifromUrl"
@@ -295,7 +295,7 @@ function Api-ImportWsdlToCreateSoapToRestApi {
 
     $context = New-AzureRmApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
 
-    $wsdlPath1 = "./Resources/Weather.wsdl"
+    $wsdlPath1 = "$TestOutputRoot/Resources/Weather.wsdl"
     $path1 = "soapToRestApi"
     $wsdlApiId1 = getAssetName	
     $wsdlServiceName1 = "Weather" # from file Weather.wsdl
@@ -1092,10 +1092,10 @@ function Policy-CrudTest {
 
     # load from file get to pipeline scenarios
 
-    $tenantValidPath = "./Resources/TenantValidPolicy.xml"
-    $productValidPath = "./Resources/ProductValidPolicy.xml"
-    $apiValidPath = "./Resources/ApiValidPolicy.xml"
-    $operationValidPath = "./Resources/OperationValidPolicy.xml"
+    $tenantValidPath = "$TestOutputRoot/Resources/TenantValidPolicy.xml"
+    $productValidPath = "$TestOutputRoot/Resources/ProductValidPolicy.xml"
+    $apiValidPath = "$TestOutputRoot/Resources/ApiValidPolicy.xml"
+    $operationValidPath = "$TestOutputRoot/Resources/OperationValidPolicy.xml"
 
     $context = New-AzureRmApiManagementContext -ResourceGroupName $resourceGroupName -ServiceName $serviceName
 
@@ -1180,9 +1180,9 @@ function Policy-CrudTest {
         $set = Set-AzureRmApiManagementPolicy -Context $context  -Policy $tenantValid -PassThru
         Assert-AreEqual $true $set
 
-        Get-AzureRmApiManagementPolicy -Context $context  -SaveAs 'TenantPolicy.xml' -Force
-        $exists = [System.IO.File]::Exists('TenantPolicy.xml')
-        $policy = gc 'TenantPolicy.xml'
+        Get-AzureRmApiManagementPolicy -Context $context  -SaveAs "$TestOutputRoot/TenantPolicy.xml" -Force
+        $exists = [System.IO.File]::Exists("$TestOutputRoot/TenantPolicy.xml")
+        $policy = gc "$TestOutputRoot/TenantPolicy.xml"
         Assert-True {$policy -like '*<find-and-replace from="aaa" to="BBB" />*'}
     }
     finally {
@@ -1200,9 +1200,9 @@ function Policy-CrudTest {
         $set = Set-AzureRmApiManagementPolicy -Context $context  -Policy $productValid -ProductId $product.ProductId -PassThru
         Assert-AreEqual $true $set
 
-        Get-AzureRmApiManagementPolicy -Context $context  -ProductId $product.ProductId -SaveAs 'ProductPolicy.xml' -Force 
-        $exists = [System.IO.File]::Exists('ProductPolicy.xml')
-        $policy = gc 'ProductPolicy.xml'
+        Get-AzureRmApiManagementPolicy -Context $context  -ProductId $product.ProductId -SaveAs "$TestOutputRoot/ProductPolicy.xml" -Force 
+        $exists = [System.IO.File]::Exists("$TestOutputRoot/ProductPolicy.xml")
+        $policy = gc "$TestOutputRoot/ProductPolicy.xml"
         Assert-True {$policy -like '*<rate-limit calls="5" renewal-period="60" />*'}
     }
     finally {
@@ -1213,7 +1213,7 @@ function Policy-CrudTest {
         Assert-Null $policy
 
         try {
-            rm 'ProductPolicy.xml'
+            rm "$TestOutputRoot/ProductPolicy.xml"
         }
         catch {}
     }
@@ -1225,9 +1225,9 @@ function Policy-CrudTest {
         $set = Set-AzureRmApiManagementPolicy -Context $context  -Policy $apiValid -ApiId $api.ApiId -PassThru
         Assert-AreEqual $true $set
 
-        $policy = Get-AzureRmApiManagementPolicy -Context $context  -ApiId $api.ApiId -SaveAs 'ApiPolicy.xml' -Force
-        $exists = [System.IO.File]::Exists('ApiPolicy.xml')
-        $policy = gc 'ApiPolicy.xml'
+        $policy = Get-AzureRmApiManagementPolicy -Context $context  -ApiId $api.ApiId -SaveAs "$TestOutputRoot/ApiPolicy.xml" -Force
+        $exists = [System.IO.File]::Exists("$TestOutputRoot/ApiPolicy.xml")
+        $policy = gc "$TestOutputRoot/ApiPolicy.xml"
         Assert-True {$policy -like '*<cache-lookup vary-by-developer="false" vary-by-developer-groups="false" downstream-caching-type="none">*'}
     }
     finally {
@@ -1238,7 +1238,7 @@ function Policy-CrudTest {
         Assert-Null $policy
 
         try {
-            rm 'ApiPolicy.xml'
+            rm "$TestOutputRoot/ApiPolicy.xml"
         }
         catch {}
     }
@@ -1253,9 +1253,9 @@ function Policy-CrudTest {
         Assert-AreEqual $true $set
 
         $policy = Get-AzureRmApiManagementPolicy -Context $context  -ApiId $api.ApiId -OperationId $operation.OperationId `
-            -SaveAs 'OperationPolicy.xml' -Force
-        $exists = [System.IO.File]::Exists('OperationPolicy.xml')
-        $policy = gc 'OperationPolicy.xml'
+            -SaveAs "$TestOutputRoot/OperationPolicy.xml" -Force
+        $exists = [System.IO.File]::Exists("$TestOutputRoot/OperationPolicy.xml")
+        $policy = gc "$TestOutputRoot/OperationPolicy.xml"
         Assert-True {$policy -like '*<rewrite-uri template="/resource" />*'}
     }
     finally {
@@ -1266,7 +1266,7 @@ function Policy-CrudTest {
         Assert-Null $policy
 
         try {
-            rm 'OperationPolicy.xml'
+            rm "$TestOutputRoot/OperationPolicy.xml"
         }
         catch {}
     }
@@ -2057,7 +2057,7 @@ function Backend-CrudTest {
         Assert-AreEqual 1 $backend.Properties.Count
         Assert-NotNull $backend.Proxy
         Assert-AreEqual $backend.Proxy.Url "http://12.168.1.1:8080"
-        Assert-NotNull $backend.Proxy.ProxyCredential
+        Assert-NotNull $backend.Proxy.ProxyCredentials
     }
     finally {
         # remove created backend