Skip to content

Commit b34ebe1

Browse files
author
Maddie Clayton
authored
Merge pull request Azure#8731 from markcowl/fix-n472-test
Fix WindowsPowerShell test automation
2 parents c7b3477 + cbd6f02 commit b34ebe1

File tree

13 files changed

+65
-60
lines changed

13 files changed

+65
-60
lines changed

‎src/ApiManagement/ApiManagement.ServiceManagement.Test/ScenarioTests/ApiManagementTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,14 @@ public void IdentityProviderCrudTest()
174174

175175
[Fact]
176176
[Trait(Category.AcceptanceType, Category.CheckIn)]
177-
public void TenantGitConfigurationCrudTest()
177+
public void TenantGitConfCrudTest()
178178
{
179179
RunPowerShellTest("TenantGitConfiguration-CrudTest");
180180
}
181181

182182
[Fact]
183183
[Trait(Category.AcceptanceType, Category.CheckIn)]
184-
public void TenantAccessConfigurationCrudTest()
184+
public void TenantAccessConfCrudTest()
185185
{
186186
RunPowerShellTest("TenantAccessConfiguration-CrudTest");
187187
}

‎src/ApiManagement/ApiManagement.ServiceManagement.Test/SessionRecords/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests.ApiManagementTests/TenantAccessConfigurationCrudTest.json renamed to ‎src/ApiManagement/ApiManagement.ServiceManagement.Test/SessionRecords/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests.ApiManagementTests/TenantAccessConfCrudTest.json

File renamed without changes.

‎src/ApiManagement/ApiManagement.ServiceManagement.Test/SessionRecords/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests.ApiManagementTests/TenantGitConfigurationCrudTest.json renamed to ‎src/ApiManagement/ApiManagement.ServiceManagement.Test/SessionRecords/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests.ApiManagementTests/TenantGitConfCrudTest.json

File renamed without changes.

‎src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public void TestSimpleNewVmssWithSystemAssignedIdentity()
6666

6767
[Fact]
6868
[Trait(Category.AcceptanceType, Category.CheckIn)]
69+
[Trait(Category.RunType, Category.CoreOnly)]
6970
public void TestSimpleNewVmssImageName()
7071
{
7172
TestRunner.RunTestScript("Test-SimpleNewVmssImageName");

‎src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAgreementTests.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Test New-AzIntegrationAccountAgreement command
1818
#>
1919
function Test-CreateIntegrationAccountAgreementX12
2020
{
21-
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
21+
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
2222
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)
2323

2424
$resourceGroup = TestSetup-CreateResourceGroup
@@ -65,7 +65,7 @@ Test New-AzIntegrationAccountAgreement command
6565
#>
6666
function Test-CreateIntegrationAccountAgreementAS2
6767
{
68-
$agreementAS2FilePath = Join-Path $TestOutputRoot "Resources" "AS2AgreementContent.json"
68+
$agreementAS2FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "AS2AgreementContent.json"
6969
$agreementAS2Content = [IO.File]::ReadAllText($agreementAS2FilePath)
7070

7171
$resourceGroup = TestSetup-CreateResourceGroup
@@ -98,7 +98,7 @@ Test New-AzIntegrationAccountAgreement command
9898
#>
9999
function Test-CreateIntegrationAccountAgreementEdifact
100100
{
101-
$agreementEdifactFilePath = Join-Path $TestOutputRoot "Resources" "EdifactAgreementContent.json"
101+
$agreementEdifactFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "EdifactAgreementContent.json"
102102
$agreementEdifactContent = [IO.File]::ReadAllText($agreementEdifactFilePath)
103103

104104
$resourceGroup = TestSetup-CreateResourceGroup
@@ -132,7 +132,7 @@ Test New-AzIntegrationAccountAgreement command with negative scenario.
132132
#>
133133
function Test-CreateIntegrationAccountAgreementWithFailure
134134
{
135-
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
135+
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
136136
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)
137137

138138
$resourceGroup = TestSetup-CreateResourceGroup
@@ -166,7 +166,7 @@ Test Get-AzIntegrationAccountAgreement command
166166
#>
167167
function Test-GetIntegrationAccountAgreement
168168
{
169-
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
169+
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
170170
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)
171171

172172
Assert-ThrowsContains { Get-AzIntegrationAccountAgreement -ResourceGroupName "Random83da135" -IntegrationAccountName "DoesNotMatter" -AgreementName "DoesNotMatter" } "Resource group 'Random83da135' could not be found."
@@ -202,7 +202,7 @@ Test Remove-AzIntegrationAccountAgreement command
202202
#>
203203
function Test-RemoveIntegrationAccountAgreement
204204
{
205-
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
205+
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
206206
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)
207207

208208
$resourceGroup = TestSetup-CreateResourceGroup
@@ -232,10 +232,10 @@ Test Set-AzIntegrationAccountAgreement command
232232
#>
233233
function Test-UpdateIntegrationAccountAgreement
234234
{
235-
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
235+
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
236236
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)
237237

238-
$agreementAS2FilePath = Join-Path $TestOutputRoot "Resources" "AS2AgreementContent.json"
238+
$agreementAS2FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "AS2AgreementContent.json"
239239
$agreementAS2Content = [IO.File]::ReadAllText($agreementAS2FilePath)
240240

241241
$resourceGroup = TestSetup-CreateResourceGroup
@@ -317,7 +317,7 @@ Test Get-AzIntegrationAccountAgreement command : paging test
317317
#>
318318
function Test-ListIntegrationAccountAgreement
319319
{
320-
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "X12AgreementContent.json"
320+
$agreementX12FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "X12AgreementContent.json"
321321
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)
322322

323323
$resourceGroup = TestSetup-CreateResourceGroup

‎src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountAssemblyTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Test New-AzIntegrationAccountAssembly command
1818
#>
1919
function Test-NewIntegrationAccountAssembly
2020
{
21-
$localAssemblyFilePath = Join-Path $TestOutputRoot "Resources" "SampleAssembly.dll"
21+
$localAssemblyFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleAssembly.dll"
2222
$assemblyContent = [IO.File]::ReadAllBytes($localAssemblyFilePath)
2323
$resourceGroup = TestSetup-CreateResourceGroup
2424
$integrationAccountName = "IA-" + (getAssetname)
@@ -75,7 +75,7 @@ Test Get-AzIntegrationAccountAssembly command
7575
#>
7676
function Test-GetIntegrationAccountAssembly
7777
{
78-
$localAssemblyFilePath = Join-Path $TestOutputRoot "Resources" "SampleAssembly.dll"
78+
$localAssemblyFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleAssembly.dll"
7979
$resourceGroup = TestSetup-CreateResourceGroup
8080
$integrationAccountName = "IA-" + (getAssetname)
8181
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
@@ -116,7 +116,7 @@ Test Remove-AzIntegrationAccountAssembly command
116116
#>
117117
function Test-RemoveIntegrationAccountAssembly
118118
{
119-
$localAssemblyFilePath = Join-Path $TestOutputRoot "Resources" "SampleAssembly.dll"
119+
$localAssemblyFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleAssembly.dll"
120120
$resourceGroup = TestSetup-CreateResourceGroup
121121
$integrationAccountName = "IA-" + (getAssetname)
122122
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
@@ -146,7 +146,7 @@ Test Set-AzIntegrationAccountAssembly command
146146
#>
147147
function Test-SetIntegrationAccountAssembly
148148
{
149-
$localAssemblyFilePath = Join-Path $TestOutputRoot "Resources" "SampleAssembly.dll"
149+
$localAssemblyFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleAssembly.dll"
150150
$assemblyContent = [IO.File]::ReadAllBytes($localAssemblyFilePath)
151151
$resourceGroup = TestSetup-CreateResourceGroup
152152
$integrationAccountName = "IA-" + (getAssetname)

‎src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountBatchConfigurationTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Test New-AzIntegrationAccountBatchConfiguration command
1818
#>
1919
function Test-NewIntegrationAccountBatchConfiguration
2020
{
21-
$batchConfigurationFilePath = Join-Path $TestOutputRoot "Resources" "SampleBatchConfiguration.json"
21+
$batchConfigurationFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleBatchConfiguration.json"
2222
$batchConfigurationContent = [IO.File]::ReadAllText($batchConfigurationFilePath)
2323
$resourceGroup = TestSetup-CreateResourceGroup
2424
$integrationAccountName = "IA-" + (getAssetname)
@@ -74,7 +74,7 @@ Test Get-AzIntegrationAccountBatchConfiguration command
7474
#>
7575
function Test-GetIntegrationAccountBatchConfiguration
7676
{
77-
$batchConfigurationFilePath = Join-Path $TestOutputRoot "Resources" "SampleBatchConfiguration.json"
77+
$batchConfigurationFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleBatchConfiguration.json"
7878
$resourceGroup = TestSetup-CreateResourceGroup
7979
$integrationAccountName = "IA-" + (getAssetname)
8080
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
@@ -115,7 +115,7 @@ Test Remove-AzIntegrationAccountBatchConfiguration command
115115
#>
116116
function Test-RemoveIntegrationAccountBatchConfiguration
117117
{
118-
$batchConfigurationFilePath = Join-Path $TestOutputRoot "Resources" "SampleBatchConfiguration.json"
118+
$batchConfigurationFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleBatchConfiguration.json"
119119
$resourceGroup = TestSetup-CreateResourceGroup
120120
$integrationAccountName = "IA-" + (getAssetname)
121121
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
@@ -145,7 +145,7 @@ Test Set-AzIntegrationAccountBatchConfiguration command
145145
#>
146146
function Test-SetIntegrationAccountBatchConfiguration
147147
{
148-
$batchConfigurationFilePath = Join-Path $TestOutputRoot "Resources" "SampleBatchConfiguration.json"
148+
$batchConfigurationFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleBatchConfiguration.json"
149149
$batchConfigurationContent = [IO.File]::ReadAllText($batchConfigurationFilePath)
150150
$resourceGroup = TestSetup-CreateResourceGroup
151151
$integrationAccountName = "IA-" + (getAssetname)

‎src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountCertificateTests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Test-CreateIntegrationAccountCertificate
2525

2626
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
2727

28-
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
28+
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"
2929

3030
$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath
3131
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name
@@ -65,7 +65,7 @@ function Test-CreateIntegrationAccountCertificatePublicKey
6565

6666
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
6767

68-
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
68+
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"
6969

7070
$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1"
7171
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name
@@ -86,7 +86,7 @@ function Test-UpdateIntegrationAccountCertificate
8686

8787
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
8888

89-
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
89+
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"
9090

9191
$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath
9292
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name
@@ -119,7 +119,7 @@ function Test-GetIntegrationAccountCertificate
119119

120120
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
121121

122-
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
122+
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"
123123

124124
New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath
125125

@@ -145,7 +145,7 @@ function Test-RemoveIntegrationAccountCertificate
145145

146146
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
147147

148-
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"
148+
$certFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "IntegrationAccountCertificate.cer"
149149

150150
New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath
151151

‎src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountMapTests.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Test New-AzIntegrationAccountMap command
1818
#>
1919
function Test-CreateIntegrationAccountMap
2020
{
21-
$xslt1FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
22-
$xslt2FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt2Map.xslt"
23-
$xslt3FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt3Map.xslt"
24-
$liquidFilePath = Join-Path $TestOutputRoot "Resources" "SampleLiquidMap.liquid"
21+
$xslt1FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
22+
$xslt2FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt2Map.xslt"
23+
$xslt3FilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt3Map.xslt"
24+
$liquidFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleLiquidMap.liquid"
2525
$xslt1MapContent = [IO.File]::ReadAllText($xslt1FilePath)
2626
$xslt2MapContent = [IO.File]::ReadAllText($xslt2FilePath)
2727
$xslt3MapContent = [IO.File]::ReadAllText($xslt3FilePath)
@@ -67,7 +67,7 @@ Test Get-AzIntegrationAccountMap command
6767
#>
6868
function Test-GetIntegrationAccountMap
6969
{
70-
$mapFilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
70+
$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
7171
$mapContent = [IO.File]::ReadAllText($mapFilePath)
7272

7373
$resourceGroup = TestSetup-CreateResourceGroup
@@ -96,7 +96,7 @@ Test Remove-AzIntegrationAccountMap command
9696
#>
9797
function Test-RemoveIntegrationAccountMap
9898
{
99-
$mapFilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
99+
$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
100100
$mapContent = [IO.File]::ReadAllText($mapFilePath)
101101

102102
$resourceGroup = TestSetup-CreateResourceGroup
@@ -120,7 +120,7 @@ Test Set-AzIntegrationAccountMap command
120120
#>
121121
function Test-UpdateIntegrationAccountMap
122122
{
123-
$mapFilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
123+
$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
124124
$mapContent = [IO.File]::ReadAllText($mapFilePath)
125125

126126
$resourceGroup = TestSetup-CreateResourceGroup
@@ -148,7 +148,7 @@ Test Get-AzIntegrationAccountMap command : Paging test
148148
#>
149149
function Test-ListIntegrationAccountMap
150150
{
151-
$mapFilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
151+
$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
152152
$mapContent = [IO.File]::ReadAllText($mapFilePath)
153153

154154
$resourceGroup = TestSetup-CreateResourceGroup

‎src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountSchemaTests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Test New-AzIntegrationAccountSchema command
1818
#>
1919
function Test-CreateIntegrationAccountSchema
2020
{
21-
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
21+
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
2222
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)
2323

2424
$resourceGroup = TestSetup-CreateResourceGroup
@@ -48,7 +48,7 @@ Test Get-AzIntegrationAccountSchema command
4848
#>
4949
function Test-GetIntegrationAccountSchema
5050
{
51-
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
51+
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
5252
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)
5353

5454
$resourceGroup = TestSetup-CreateResourceGroup
@@ -77,7 +77,7 @@ Test Remove-AzIntegrationAccountSchema command
7777
#>
7878
function Test-RemoveIntegrationAccountSchema
7979
{
80-
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
80+
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
8181
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)
8282

8383
$resourceGroup = TestSetup-CreateResourceGroup
@@ -101,7 +101,7 @@ Test Set-AzIntegrationAccountSchema command
101101
#>
102102
function Test-UpdateIntegrationAccountSchema
103103
{
104-
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
104+
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
105105
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)
106106

107107
$resourceGroup = TestSetup-CreateResourceGroup
@@ -129,7 +129,7 @@ Test Get-AzIntegrationAccountSchema command : Paging test
129129
#>
130130
function Test-ListIntegrationAccountSchema
131131
{
132-
$schemaFilePath = Join-Path $TestOutputRoot "Resources" "OrderFile.xsd"
132+
$schemaFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "OrderFile.xsd"
133133
$schemaContent = [IO.File]::ReadAllText($schemaFilePath)
134134

135135
$resourceGroup = TestSetup-CreateResourceGroup

0 commit comments

Comments
 (0)