Skip to content

Commit 483e6a0

Browse files
huichen123huichen123
authored
Change MRT test names (#1223)
* Change MRT test names * rename Helix test
1 parent b861b3a commit 483e6a0

11 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎build/AzurePipelinesTemplates/WindowsAppSDK-RunHelixTests-Job.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,28 +100,28 @@ jobs:
100100
inputs:
101101
targetType: filePath
102102
filePath: $(winUIHelixPipelineScripts)\GenerateHelixWorkItems.ps1
103-
arguments: -TestFilePattern 'mrtcore_test_binaries_$(buildPlatform)\UnitTest\*.dll' -TestBinaryDirectoryPath '$(testPayloadDir)' -OutputProjFile '$(helixWorkItemsDir)\MrtCore-UnitTests.proj' -WorkItemPrefix 'MrtCore.UnitTests.$(buildPlatform).$(buildConfiguration)' -TestNamePrefix 'MrtCore.UnitTests.$(buildPlatform).$(buildConfiguration)'
103+
arguments: -TestFilePattern 'mrtcore_test_binaries_$(buildPlatform)\MrmUnitTest\*.dll' -TestBinaryDirectoryPath '$(testPayloadDir)' -OutputProjFile '$(helixWorkItemsDir)\MrtCore-MrmUnitTests.proj' -WorkItemPrefix 'MrtCore.MrmUnitTests.$(buildPlatform).$(buildConfiguration)' -TestNamePrefix 'MrtCore.MrmUnitTests.$(buildPlatform).$(buildConfiguration)'
104104

105105
- task: powershell@2
106106
displayName: 'Discover MRT Core BaseUnitTests'
107107
inputs:
108108
targetType: filePath
109109
filePath: $(winUIHelixPipelineScripts)\GenerateHelixWorkItems.ps1
110-
arguments: -TestFilePattern 'mrtcore_test_binaries_$(buildPlatform)\BaseUnitTests\*.dll' -TestBinaryDirectoryPath '$(testPayloadDir)' -OutputProjFile '$(helixWorkItemsDir)\MrtCore-BaseUnitTests.proj' -WorkItemPrefix 'MrtCore.BaseUnitTests.$(buildPlatform).$(buildConfiguration)' -TestNamePrefix 'MrtCore.BaseUnitTests.$(buildPlatform).$(buildConfiguration)'
110+
arguments: -TestFilePattern 'mrtcore_test_binaries_$(buildPlatform)\MrmBaseUnitTests\*.dll' -TestBinaryDirectoryPath '$(testPayloadDir)' -OutputProjFile '$(helixWorkItemsDir)\MrtCore-MrmBaseUnitTests.proj' -WorkItemPrefix 'MrtCore.MrmBaseUnitTests.$(buildPlatform).$(buildConfiguration)' -TestNamePrefix 'MrtCore.MrmBaseUnitTests.$(buildPlatform).$(buildConfiguration)'
111111

112112
- task: powershell@2
113113
displayName: 'Discover MRT Core UnpackagedTests'
114114
inputs:
115115
targetType: filePath
116116
filePath: $(winUIHelixPipelineScripts)\GenerateHelixWorkItems.ps1
117-
arguments: -TestFilePattern 'mrtcore_test_binaries_$(buildPlatform)\UnpackagedTests\*.dll' -TestBinaryDirectoryPath '$(testPayloadDir)' -OutputProjFile '$(helixWorkItemsDir)\MrtCore-UnpackagedTests.proj' -WorkItemPrefix 'MrtCore.UnpackagedTests.$(buildPlatform).$(buildConfiguration)' -TestNamePrefix 'MrtCore.UnpackagedTests.$(buildPlatform).$(buildConfiguration)'
117+
arguments: -TestFilePattern 'mrtcore_test_binaries_$(buildPlatform)\MrtCoreUnpackagedTests\*.dll' -TestBinaryDirectoryPath '$(testPayloadDir)' -OutputProjFile '$(helixWorkItemsDir)\MrtCore-MrtCoreUnpackagedTests.proj' -WorkItemPrefix 'MrtCore.MrtCoreUnpackagedTests.$(buildPlatform).$(buildConfiguration)' -TestNamePrefix 'MrtCore.MrtCoreUnpackagedTests.$(buildPlatform).$(buildConfiguration)'
118118

119119
# In Helix, test folders are under subfolders of TAEF. MRTCore UnpackagedTests use reg-free WinRT activation. It requires the winmd file
120120
# under same folder as the executable.
121121
- task: CopyFiles@2
122122
displayName: 'Copy Microsoft.ApplicationModel.Resources.winmd to test root'
123123
inputs:
124-
sourceFolder: $(testPayloadDir)\mrtcore_test_binaries_$(buildPlatform)\UnpackagedTests
124+
sourceFolder: $(testPayloadDir)\mrtcore_test_binaries_$(buildPlatform)\MrtCoreUnpackagedTests
125125
contents: |
126126
Microsoft.ApplicationModel.Resources.winmd
127127
targetFolder: $(testPayloadDir)
@@ -132,7 +132,7 @@ jobs:
132132
# inputs:
133133
# targetType: filePath
134134
# filePath: $(winUIHelixPipelineScripts)\GenerateHelixWorkItems.ps1
135-
# arguments: -TestFilePattern 'mrtcore_test_binaries_x64\ManagedTest\*.dll' -TestBinaryDirectoryPath '$(testPayloadDir)' -OutputProjFile '$(helixWorkItemsDir)\MrtCore-ManagedTest.proj' -WorkItemPrefix 'MrtCore-ManagedTest-$(buildPlatform)-$(buildConfiguration)' -TestNamePrefix 'MrtCore.ManagedTest.$(buildPlatform).$(buildConfiguration)'
135+
# arguments: -TestFilePattern 'mrtcore_test_binaries_x64\MrtCoreManagedTest\*.dll' -TestBinaryDirectoryPath '$(testPayloadDir)' -OutputProjFile '$(helixWorkItemsDir)\MrtCore-MrtCoreManagedTest.proj' -WorkItemPrefix 'MrtCore-MrtCoreManagedTest-$(buildPlatform)-$(buildConfiguration)' -TestNamePrefix 'MrtCore.MrtCoreManagedTest.$(buildPlatform).$(buildConfiguration)'
136136

137137
# Publish the generated test work items (*.proj file) as Pipeline artifact(s).
138138
# This is not required, but it is useful for debugging purposes to see what tests were discovered.

‎build/Helix/RunTestsInHelix.proj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</ItemGroup>
2323

2424
<!-- These files are generated by GenerateHelixWorkItems.ps1 as part of the build pipeline. They are not checked-in to the repo. -->
25-
<Import Project="GeneratedWorkItems\MrtCore-UnitTests.proj"/>
26-
<Import Project="GeneratedWorkItems\MrtCore-BaseUnitTests.proj"/>
27-
<Import Project="GeneratedWorkItems\MrtCore-UnpackagedTests.proj"/>
25+
<Import Project="GeneratedWorkItems\MrtCore-MrmUnitTests.proj"/>
26+
<Import Project="GeneratedWorkItems\MrtCore-MrmBaseUnitTests.proj"/>
27+
<Import Project="GeneratedWorkItems\MrtCore-MrtCoreUnpackagedTests.proj"/>
2828

2929
<!-- Note: It is also possible to directly create work-items for Helix here instead of using the scripts. -->
3030

‎build/build-mrt.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ steps:
131131
condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
132132
inputs:
133133
testSelector: 'testAssemblies'
134-
testAssemblyVer2: '**\ManagedTest.build.appxrecipe'
135-
searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\ManagedTest'
134+
testAssemblyVer2: '**\MrtCoreManagedTest.build.appxrecipe'
135+
searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\MrtCoreManagedTest'
136136
testRunTitle: 'test MRT: ManagedTests - $(buildPlatform)'
137137
platform: '$(buildPlatform)'
138138
configuration: '$(buildConfiguration)'
@@ -142,8 +142,8 @@ steps:
142142
condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
143143
inputs:
144144
testSelector: 'testAssemblies'
145-
testAssemblyVer2: '**\UnitTest.dll'
146-
searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\UnitTest'
145+
testAssemblyVer2: '**\MrmUnitTest.dll'
146+
searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\MrmUnitTest'
147147
testRunTitle: 'test MRT: UnitTests - $(buildPlatform)'
148148
platform: '$(buildPlatform)'
149149
configuration: '$(buildConfiguration)'
@@ -153,8 +153,8 @@ steps:
153153
condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
154154
inputs:
155155
testSelector: 'testAssemblies'
156-
testAssemblyVer2: '**\BaseUnitTests.dll'
157-
searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\BaseUnitTests'
156+
testAssemblyVer2: '**\MrmBaseUnitTests.dll'
157+
searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\MrmBaseUnitTests'
158158
testRunTitle: 'test MRT: BaseUnitTests - $(buildPlatform)'
159159
platform: '$(buildPlatform)'
160160
configuration: '$(buildConfiguration)'
@@ -165,7 +165,7 @@ steps:
165165
inputs:
166166
testSelector: 'testAssemblies'
167167
testAssemblyVer2: '**\MRTCoreUnpackagedTests.dll'
168-
searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\UnpackagedTests'
168+
searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\MrtCoreUnpackagedTests'
169169
testRunTitle: 'test MRT: UnpackagedTests - $(buildPlatform)'
170170
platform: '$(buildPlatform)'
171171
configuration: '$(buildConfiguration)'
@@ -177,10 +177,10 @@ steps:
177177
inputs:
178178
SourceFolder: '${{ parameters.MRTBinariesDirectory }}\Release\$(buildPlatform)'
179179
Contents: |
180-
BaseUnitTests\**
181-
ManagedTest\**
182-
UnitTest\**
183-
UnpackagedTests\**
180+
MrmBaseUnitTests\**
181+
MrmUnitTest\**
182+
MrtCoreManagedTest\**
183+
MrtCoreUnpackagedTests\**
184184
TargetFolder: '$(Agent.TempDirectory)\mrt_testbin\$(buildPlatform)'
185185

186186
- task: PublishBuildArtifacts@1

dev/MRTCore/mrt/Core/unittests/UnitTest.vcxproj renamed to dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
<VCProjectVersion>15.0</VCProjectVersion>
3939
<ProjectGuid>{8CCB01A9-5C32-4000-86C3-3DFF5FFABEF1}</ProjectGuid>
4040
<Keyword>Win32Proj</Keyword>
41-
<RootNamespace>UnitTest</RootNamespace>
41+
<RootNamespace>MrmUnitTest</RootNamespace>
4242
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
4343
<ProjectSubType>NativeUnitTestProject</ProjectSubType>
44-
<ProjectName>UnitTest</ProjectName>
44+
<ProjectName>MrmUnitTest</ProjectName>
4545
</PropertyGroup>
4646
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

dev/MRTCore/mrt/Core/unittests/UnitTest.vcxproj.filters renamed to dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj.filters

File renamed without changes.

dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/UnpackagedTests/UnpackagedTests.csproj renamed to dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/UnpackagedTests/MrtCoreUnpackagedTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<None Include="resources.pri.standalone">
6464
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6565
</None>
66-
<None Include="UnpackagedTests.runsettings">
66+
<None Include="MrtCoreUnpackagedTests.runsettings">
6767
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6868
</None>
6969
</ItemGroup>
@@ -84,11 +84,11 @@
8484
<!-- The powershell command below updates the TestAdaptersPaths path in the runsettings file, in order to allow the test to run in VS Test Explorer. -->
8585
<PropertyGroup>
8686
<PostBuildEvent>copy /Y "$(OutputPath)..\Microsoft.ApplicationModel.Resources\Microsoft.Internal.FrameworkUdk.dll" "$(OutputPath)Microsoft.Internal.FrameworkUdk.dll"
87-
powershell -command "$file = gi $(OutputPath)UnpackagedTests.runsettings; $x = [xml](gc $file); $x.RunSettings.RunConfiguration.TestAdaptersPaths = '$(OutputPath)'; $x.Save($file.Fullname)"
87+
powershell -command "$file = gi $(OutputPath)MrtCoreUnpackagedTests.runsettings; $x = [xml](gc $file); $x.RunSettings.RunConfiguration.TestAdaptersPaths = '$(OutputPath)'; $x.Save($file.Fullname)"
8888
</PostBuildEvent>
8989
</PropertyGroup>
9090
<PropertyGroup>
91-
<RunSettingsFilePath>$(OutputPath)UnpackagedTests.runsettings</RunSettingsFilePath>
91+
<RunSettingsFilePath>$(OutputPath)MrtCoreUnpackagedTests.runsettings</RunSettingsFilePath>
9292
</PropertyGroup>
9393
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9494
Other similar extension points exist, see Microsoft.Common.targets.

dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/UnpackagedTests/UnpackagedTests.runsettings renamed to dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/UnpackagedTests/MrtCoreUnpackagedTests.runsettings

File renamed without changes.

dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/unittests/ManagedTest.csproj renamed to dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/unittests/MrtCoreManagedTest.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ProjectGuid>{ED418091-1095-4873-80E5-2F36C9E763DC}</ProjectGuid>
88
<OutputType>AppContainerExe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>ManagedTest</RootNamespace>
11-
<AssemblyName>CoreMrtManagedTest</AssemblyName>
10+
<RootNamespace>MrtCoreManagedTest</RootNamespace>
11+
<AssemblyName>MrtCoreManagedTest</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
1414
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>

‎dev/MRTCore/mrt/MrtCore.sln‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ VisualStudioVersion = 16.0.29318.209
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRM", "Core\src\MRM.vcxproj", "{CF03CC8D-FFF1-4CDC-B773-D219AD4E6F76}"
77
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "Core\UnitTests\UnitTest.vcxproj", "{8CCB01A9-5C32-4000-86C3-3DFF5FFABEF1}"
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MrmUnitTest", "Core\UnitTests\MrmUnitTest.vcxproj", "{8CCB01A9-5C32-4000-86C3-3DFF5FFABEF1}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedTest", "Microsoft.ApplicationModel.Resources\unittests\ManagedTest.csproj", "{ED418091-1095-4873-80E5-2F36C9E763DC}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrtCoreManagedTest", "Microsoft.ApplicationModel.Resources\unittests\MrtCoreManagedTest.csproj", "{ED418091-1095-4873-80E5-2F36C9E763DC}"
1111
EndProject
1212
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ApplicationModel.Resources", "Microsoft.ApplicationModel.Resources\src\Microsoft.ApplicationModel.Resources.vcxproj", "{9B3B03BC-1BC0-43EA-B3FF-D5214F3CF5CF}"
1313
EndProject
1414
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrmmin", "mrm\mrmmin\mrmmin.vcxproj", "{AB199369-87E7-44B4-AE83-7CF5C068EFEB}"
1515
EndProject
1616
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrmex", "mrm\mrmex\mrmex.vcxproj", "{C3DBE42D-246E-45F1-8B66-8A8556C0784B}"
1717
EndProject
18-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseUnitTests", "mrm\UnitTests\BaseUnitTests.vcxproj", "{81A9F38A-2982-444B-9A57-3D56A5BD756E}"
18+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MrmBaseUnitTests", "mrm\UnitTests\MrmBaseUnitTests.vcxproj", "{81A9F38A-2982-444B-9A57-3D56A5BD756E}"
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationModel.Resources.Projection", "Microsoft.ApplicationModel.Resources\projection\Microsoft.ApplicationModel.Resources.Projection.csproj", "{42876BA9-25BB-46E7-9EE1-CA5FDF703C72}"
2121
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnpackagedTests", "Microsoft.ApplicationModel.Resources\UnpackagedTests\UnpackagedTests.csproj", "{3C618444-4B80-492E-8972-BFAEF8700A52}"
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MrtCoreUnpackagedTests", "Microsoft.ApplicationModel.Resources\UnpackagedTests\MrtCoreUnpackagedTests.csproj", "{3C618444-4B80-492E-8972-BFAEF8700A52}"
2323
EndProject
2424
Global
2525
GlobalSection(SolutionConfigurationPlatforms) = preSolution

dev/MRTCore/mrt/mrm/UnitTests/BaseUnitTests.vcxproj renamed to dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</ItemGroup>
3737
<PropertyGroup Label="Globals">
3838
<ProjectGuid>{81A9F38A-2982-444B-9A57-3D56A5BD756E}</ProjectGuid>
39-
<RootNamespace>BaseUnitTests</RootNamespace>
39+
<RootNamespace>MrmBaseUnitTests</RootNamespace>
4040
<UseUnicrt>true</UseUnicrt>
4141
<UseStl>true</UseStl>
4242
<StlVersion>StlVerCurrent</StlVersion>

0 commit comments

Comments
 (0)