Skip to content

Commit 9b01fb9

Browse files
author
Maddie Clayton
authored
Merge pull request #8482 from refortie/add-in-new-enums
[LogicApp] Expose new enum types
2 parents 3b1ea3c + a1da376 commit 9b01fb9

27 files changed

+1973
-1013
lines changed

‎src/LogicApp/LogicApp.Test/Resources/SampleLiquidMap.liquid

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{% if user %}
2+
Hello, {{ user.firstname }}
3+
{% else %}
4+
Hello World!
5+
{% endif %}

‎src/LogicApp/LogicApp.Test/Resources/SampleXslt2Map.xslt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<xsl:stylesheet
2+
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
3+
version="2.0">
4+
<xsl:template match="@*|node()">
5+
<xsl:copy>
6+
<xsl:apply-templates select="@*|node()"/>
7+
</xsl:copy>
8+
</xsl:template>
9+
</xsl:stylesheet>

‎src/LogicApp/LogicApp.Test/Resources/SampleXslt3Map.xslt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
2+
xmlns:xs="http://www.w3.org/2001/XMLSchema">
3+
<xsl:output method="text"/>
4+
<xsl:template match="/">
5+
<xsl:value-of select="company/employee/name"/>
6+
<xsl:variable name="test">
7+
<xsl:text>company/employee/name</xsl:text>
8+
</xsl:variable>
9+
<xsl:evaluate xpath="$test"/>
10+
</xsl:template>
11+
</xsl:stylesheet>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,24 @@ Test New-AzIntegrationAccountMap command
1919
function Test-CreateIntegrationAccountMap
2020
{
2121
$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"
2225
$xslt1MapContent = [IO.File]::ReadAllText($xslt1FilePath)
26+
$xslt2MapContent = [IO.File]::ReadAllText($xslt2FilePath)
27+
$xslt3MapContent = [IO.File]::ReadAllText($xslt3FilePath)
28+
$liquidMapContent = [IO.File]::ReadAllText($liquidFilePath)
2329

2430
$resourceGroup = TestSetup-CreateResourceGroup
2531
$integrationAccountName = "IA-" + (getAssetname)
2632

2733
$integrationAccountMapName1 = "XSLT-" + (getAssetname)
2834
$integrationAccountMapName2 = "XSLT-" + (getAssetname)
2935
$integrationAccountMapName3 = "XSLT-" + (getAssetname)
36+
$integrationAccountXslt2MapName = "XSLT2-" + (getAssetname)
37+
$integrationAccountXslt3MapName = "XSLT3-" + (getAssetname)
38+
$integrationAccountLiquidMapName = "Liquid-" + (getAssetname)
39+
$integrationAccountLiquidMapName2 = "Liquid2-" + (getAssetname)
3040

3141
$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
3242

@@ -38,6 +48,15 @@ function Test-CreateIntegrationAccountMap
3848

3949
$integrationAccountMap3 = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountMapName3 -MapFilePath $xslt1FilePath -MapType "Xslt" -ContentType "application/xml"
4050
Assert-AreEqual $integrationAccountMapName3 $integrationAccountMap3.Name
51+
52+
$integrationAccountXslt2Map = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountXslt2MapName -MapDefinition $xslt2MapContent -MapType "Xslt20"
53+
Assert-AreEqual $integrationAccountXslt2MapName $integrationAccountXslt2Map.Name
54+
$integrationAccountXslt3Map = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountXslt3MapName -MapDefinition $xslt3MapContent -MapType "Xslt30"
55+
Assert-AreEqual $integrationAccountXslt3MapName $integrationAccountXslt3Map.Name
56+
$integrationAccountLiquidMap = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountLiquidMapName -MapDefinition $liquidMapContent -MapType "Liquid"
57+
Assert-AreEqual $integrationAccountLiquidMapName $integrationAccountLiquidMap.Name
58+
$integrationAccountLiquidMap2 = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountLiquidMapName2 -MapDefinition $liquidMapContent -MapType "liquid"
59+
Assert-AreEqual $integrationAccountLiquidMapName2 $integrationAccountLiquidMap2.Name
4160

4261
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
4362
}

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,22 @@ function Test-CreateIntegrationAccount
2121
$resourceGroup = TestSetup-CreateResourceGroup
2222
$integrationAccountName = "IA-" + (getAssetname)
2323
$location = Get-Location "Microsoft.Logic" "integrationAccounts"
24-
24+
2525
$integrationAccountNameBasic = "IA-Basic-" + (getAssetname)
26-
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameBasic -Location $location -Sku "Basic"
26+
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameBasic -Location $location -Sku "Basic"
2727
Assert-AreEqual $integrationAccountNameBasic $integrationAccount.Name
28-
28+
2929
$integrationAccountNameStandard = "IA-Standard-" + (getAssetname)
30-
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard -Location $location -Sku "Standard"
30+
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard -Location $location -Sku "Standard"
3131
Assert-AreEqual $integrationAccountNameStandard $integrationAccount.Name
32-
32+
33+
$integrationAccountNameStandard2 = "IA-Standard2-" + (getAssetname)
34+
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard2 -Location $location -Sku "standard"
35+
Assert-AreEqual $integrationAccountNameStandard2 $integrationAccount.Name
36+
3337
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameBasic -Force
3438
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard -Force
39+
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard2 -Force
3540
}
3641

3742
<#
@@ -53,7 +58,7 @@ function Test-GetIntegrationAccount
5358
$integrationAccounts = Get-AzIntegrationAccount
5459
Assert-True { $integrationAccounts.Count -gt 0 }
5560

56-
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
61+
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
5762
}
5863

5964
<#
@@ -68,7 +73,7 @@ function Test-RemoveIntegrationAccount
6873

6974
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Location $location -Sku "Standard"
7075
Assert-AreEqual $integrationAccountName $integrationAccount.Name
71-
76+
7277
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
7378
}
7479

@@ -97,7 +102,7 @@ function Test-UpdateIntegrationAccount
97102

98103
$updatedIntegrationAccount = Set-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Location $location -Force
99104
Assert-AreEqual $updatedIntegrationAccount.Name $integrationAccount.Name
100-
105+
101106
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
102107
}
103108

@@ -122,6 +127,6 @@ function Test-GetIntegrationAccountCallbackUrl
122127

123128
$callbackUrl1 = Get-AzIntegrationAccountCallbackUrl -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName
124129
Assert-NotNull $callbackUrl1
125-
130+
126131
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
127132
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ function Test-CreateAndRemoveLogicApp
4040
$parameterFilePath = Join-Path $TestOutputRoot "Resources" "TestSimpleWorkflowParameter.json"
4141
$definition = [IO.File]::ReadAllText((Join-Path $TestOutputRoot "Resources" "TestSimpleWorkflowDefinition.json"))
4242

43-
$workflowName = getAssetname
43+
$workflowName = getAssetname
4444
$workflow = New-AzLogicApp -ResourceGroupName $resourceGroup.ResourceGroupName -Name $workflowName -Definition $definition -ParameterFilePath $parameterFilePath -Location $location
4545

46-
Assert-NotNull $workflow
46+
Assert-NotNull $workflow
4747
Assert-NotNull $workflow.Definition
4848
Assert-NotNull $workflow.Parameters
4949
Assert-AreEqual $workflowName $workflow.Name
5050
Remove-AzLogicApp -ResourceGroupName $resourceGroup.ResourceGroupName -Name $WorkflowName -Force
5151

5252
#Case3 : Create using Piped input
53-
$workflowName = getAssetname
53+
$workflowName = getAssetname
5454
$workflow = $resourceGroup | New-AzLogicApp -Name $workflowName -Location $location -DefinitionFilePath $definitionFilePath -ParameterFilePath $parameterFilePath
5555

5656
Assert-NotNull $workflow

0 commit comments

Comments
 (0)