diff --git a/build/Helix/CopyVisualTreeMasters.ps1 b/build/Helix/CopyVisualTreeVerificationFiles.ps1 similarity index 100% rename from build/Helix/CopyVisualTreeMasters.ps1 rename to build/Helix/CopyVisualTreeVerificationFiles.ps1 diff --git a/build/Helix/PrepareHelixPayload.ps1 b/build/Helix/PrepareHelixPayload.ps1 index 4a505bc11d..59282f87e2 100644 --- a/build/Helix/PrepareHelixPayload.ps1 +++ b/build/Helix/PrepareHelixPayload.ps1 @@ -69,4 +69,4 @@ Copy-Item "build\helix\runtests.cmd" $payloadDir Copy-Item "build\helix\InstallTestAppDependencies.ps1" "$payloadDir" Copy-Item "build\Helix\EnsureMachineState.ps1" "$payloadDir" Copy-Item "version.props" "$payloadDir" -Copy-Item "build\Helix\CopyVisualTreeMasters.ps1" "$payloadDir" +Copy-Item "build\Helix\CopyVisualTreeVerificationFiles.ps1" "$payloadDir" diff --git a/build/Helix/ProcessHelixFiles.ps1 b/build/Helix/ProcessHelixFiles.ps1 index 04c74feae8..dcacc01c3e 100644 --- a/build/Helix/ProcessHelixFiles.ps1 +++ b/build/Helix/ProcessHelixFiles.ps1 @@ -8,7 +8,7 @@ Param( ) $helixLinkFile = "$OutputFolder\LinksToHelixTestFiles.html" -$visualTreeMasterFolder = "$OutputFolder\VisualTreeMasters" +$visualTreeVerificationFolder = "$OutputFolder\UpdatedVisualTreeVerificationFiles" $accessTokenParam = "" if($HelixAccessToken) @@ -71,9 +71,9 @@ foreach ($testRun in $testRuns.value) $screenShots = $files | where { $_.Name.EndsWith(".jpg") } $dumps = $files | where { $_.Name.EndsWith(".dmp") } - $visualTreeMasters = $files | where { $_.Name.EndsWith(".xml") -And (-Not $_.Name.Contains('testResults')) } + $visualTreeVerificationFiles = $files | where { $_.Name.EndsWith(".xml") -And (-Not $_.Name.Contains('testResults')) } $pgcFiles = $files | where { $_.Name.EndsWith(".pgc") } - if ($screenShots.Count + $dumps.Count + $visualTreeMasters.Count + $pgcFiles.Count -gt 0) + if ($screenShots.Count + $dumps.Count + $visualTreeVerificationFiles.Count + $pgcFiles.Count -gt 0) { if(-Not $isTestRunNameShown) { @@ -83,19 +83,20 @@ foreach ($testRun in $testRuns.value) Out-File -FilePath $helixLinkFile -Append -InputObject "

$helixWorkItemName

" Generate-File-Links $screenShots "Screenshots" Generate-File-Links $dumps "CrashDumps" - Generate-File-Links $visualTreeMasters "VisualTreeMasters" + Generate-File-Links $visualTreeVerificationFiles "visualTreeVerificationFiles" Generate-File-Links $pgcFiles "PGC files" - $misc = $files | where { ($screenShots -NotContains $_) -And ($dumps -NotContains $_) -And ($visualTreeMasters -NotContains $_) -And ($pgcFiles -NotContains $_) } + $misc = $files | where { ($screenShots -NotContains $_) -And ($dumps -NotContains $_) -And ($visualTreeVerificationFiles -NotContains $_) -And ($pgcFiles -NotContains $_) } Generate-File-Links $misc "Misc" - if( -Not (Test-Path $visualTreeMasterFolder) ) + if( -Not (Test-Path $visualTreeVerificationFolder) ) { - New-Item $visualTreeMasterFolder -ItemType Directory + New-Item $visualTreeVerificationFolder -ItemType Directory } - foreach($masterFile in $visualTreeMasters) + foreach($verificationFile in $visualTreeVerificationFiles) { - $destination = "$visualTreeMasterFolder\$($masterFile.Name)" - Write-Host "Copying $($masterFile.Name) to $destination" + + $destination = "$visualTreeVerificationFolder\$($verificationFile.Name)" + Write-Host "Copying $($verificationFile.Name) to $destination" $link = "$($masterFile.Link)$accessTokenParam" $webClient.DownloadFile($link, $destination) } @@ -123,12 +124,12 @@ foreach ($testRun in $testRuns.value) } } -if(Test-Path $visualTreeMasterFolder) +if(Test-Path $visualTreeVerificationFolder) { - Write-Host "Merge duplicated master files..." - $masterFiles = Get-ChildItem $visualTreeMasterFolder + Write-Host "Merge duplicated verification files..." + $verificationFiles = Get-ChildItem $visualTreeVerificationFolder $prefixList = @() - foreach($file in $masterFiles) + foreach($file in $verificationFiles) { $prefix = $file.BaseName.Split('-')[0] if($prefixList -NotContains $prefix) @@ -140,17 +141,17 @@ if(Test-Path $visualTreeMasterFolder) foreach($prefix in $prefixList) { $filesToDelete = @() - $versionedMasters = $masterFiles | Where { $_.BaseName.StartsWith("$prefix-") } | Sort-Object -Property Name -Descending - if($versionedMasters.Count > 1) + $versionedVerificationFiles = $verificationFiles | Where { $_.BaseName.StartsWith("$prefix-") } | Sort-Object -Property Name -Descending + if($versionedVerificationFiles.Count > 1) { - for ($i=0; $i -lt $versionedMasters.Length-1; $i++) + for ($i=0; $i -lt $versionedVerificationFiles.Length-1; $i++) { - $v1 = Get-Content $versionedMasters[$i].FullName - $v2 = Get-Content $versionedMasters[$i+1].FullName + $v1 = Get-Content $versionedVerificationFiles[$i].FullName + $v2 = Get-Content $versionedVerificationFiles[$i+1].FullName $diff = Compare-Object $v1 $v2 if($diff.Length -eq 0) { - $filesToDelete += $versionedMasters[$i] + $filesToDelete += $versionedVerificationFiles[$i] } } $filesToDelete | ForEach-Object { @@ -159,7 +160,7 @@ if(Test-Path $visualTreeMasterFolder) } } - Write-Host "Renaming $($versionedMasters[-1].Name) to $prefix.xml" - Move-Item $versionedMasters[-1].FullName "$visualTreeMasterFolder\$prefix.xml" -Force + Write-Host "Renaming $($versionedVerificationFiles[-1].Name) to $prefix.xml" + Move-Item $versionedVerificationFiles[-1].FullName "$visualTreeVerificationFolder\$prefix.xml" -Force } } diff --git a/build/Helix/runtests.cmd b/build/Helix/runtests.cmd index 0e58fd2555..e30ff26d00 100644 --- a/build/Helix/runtests.cmd +++ b/build/Helix/runtests.cmd @@ -88,7 +88,7 @@ move te.wtl te_rerun_multiple.wtl copy /y te_rerun_multiple.wtl %HELIX_WORKITEM_UPLOAD_ROOT% copy /y WexLogFileOutput\*.jpg %HELIX_WORKITEM_UPLOAD_ROOT% -powershell -ExecutionPolicy Bypass .\CopyVisualTreeMasters.ps1 +powershell -ExecutionPolicy Bypass .\CopyVisualTreeVerificationFiles.ps1 :SkipReruns diff --git a/dev/AutoSuggestBox/APITests/AutoSuggestBoxTests.cs b/dev/AutoSuggestBox/APITests/AutoSuggestBoxTests.cs index c0f6859262..c9bb66811f 100644 --- a/dev/AutoSuggestBox/APITests/AutoSuggestBoxTests.cs +++ b/dev/AutoSuggestBox/APITests/AutoSuggestBoxTests.cs @@ -66,7 +66,7 @@ public void VerifyAutoSuggestBoxCornerRadius() public void VerifyVisualTree() { var autoSuggestBox = SetupAutoSuggestBox(); - VisualTreeTestHelper.VerifyVisualTree(root: autoSuggestBox, masterFilePrefix: "AutoSuggestBox"); + VisualTreeTestHelper.VerifyVisualTree(root: autoSuggestBox, verificationFileNamePrefix: "AutoSuggestBox"); } private AutoSuggestBox SetupAutoSuggestBox() diff --git a/dev/CalendarView/APITests/CalendarViewTests.cs b/dev/CalendarView/APITests/CalendarViewTests.cs index 0498846f07..98d7de962b 100644 --- a/dev/CalendarView/APITests/CalendarViewTests.cs +++ b/dev/CalendarView/APITests/CalendarViewTests.cs @@ -36,7 +36,7 @@ public void VerifyVisualTree() }); TestUtilities.SetAsVisualTreeRoot(calendarView); - VisualTreeTestHelper.VerifyVisualTree(root: calendarView, masterFilePrefix: "CalendarView"); + VisualTreeTestHelper.VerifyVisualTree(root: calendarView, verificationFileNamePrefix: "CalendarView"); } } } diff --git a/dev/ColorPicker/APITests/ColorPickerTests.cs b/dev/ColorPicker/APITests/ColorPickerTests.cs index c93632308f..d4a9e93cb0 100644 --- a/dev/ColorPicker/APITests/ColorPickerTests.cs +++ b/dev/ColorPicker/APITests/ColorPickerTests.cs @@ -278,7 +278,7 @@ public void VerifyVisualTree() }); TestUtilities.SetAsVisualTreeRoot(colorPicker); - VisualTreeTestHelper.VerifyVisualTree(root: colorPicker, masterFilePrefix: "ColorPicker"); + VisualTreeTestHelper.VerifyVisualTree(root: colorPicker, verificationFileNamePrefix: "ColorPicker"); } // This takes a FrameworkElement parameter so you can pass in either a ColorPicker or a ColorSpectrum. diff --git a/dev/ComboBox/APITests/ComboBoxTests.cs b/dev/ComboBox/APITests/ComboBoxTests.cs index 3f3d30485a..86dcc49968 100644 --- a/dev/ComboBox/APITests/ComboBoxTests.cs +++ b/dev/ComboBox/APITests/ComboBoxTests.cs @@ -101,7 +101,7 @@ public void VerifyVisualTree() }); IdleSynchronizer.Wait(); - VisualTreeTestHelper.VerifyVisualTree(root: comboBox, masterFilePrefix: "ComboBox"); + VisualTreeTestHelper.VerifyVisualTree(root: comboBox, verificationFileNamePrefix: "ComboBox"); } private ComboBox SetupComboBox(bool useContent = true) diff --git a/dev/CommonStyles/APITests/CommonStylesTests.cs b/dev/CommonStyles/APITests/CommonStylesTests.cs index 72184a73b5..b68f7e3e5f 100644 --- a/dev/CommonStyles/APITests/CommonStylesTests.cs +++ b/dev/CommonStyles/APITests/CommonStylesTests.cs @@ -119,7 +119,7 @@ public void VerifyVisualTreeForControlsInCommonStyles() try { Log.Comment($"Verify visual tree for {control}"); - VisualTreeTestHelper.VerifyVisualTree(xaml: XamlStringForControl(control), masterFilePrefix: control); + VisualTreeTestHelper.VerifyVisualTree(xaml: XamlStringForControl(control), verificationFileNamePrefix: control); } catch (Exception e) { @@ -175,7 +175,7 @@ public void VerifyVisualTreeForCommandBarOverflowMenu() var visualTreeDumperFilter = new VisualTreeDumper.DefaultFilter(); visualTreeDumperFilter.PropertyNameAllowedList.Remove("MaxWidth"); visualTreeDumperFilter.PropertyNameAllowedList.Remove("MaxHeight"); - VisualTreeTestHelper.VerifyVisualTree(root: overflowContent, masterFilePrefix: "CommandBarOverflowMenu", filter: visualTreeDumperFilter); + VisualTreeTestHelper.VerifyVisualTree(root: overflowContent, verificationFileNamePrefix: "CommandBarOverflowMenu", filter: visualTreeDumperFilter); } private string XamlStringForControl(string controlName) @@ -213,7 +213,7 @@ public void VerifyVisualTreeForAppBarAndAppBarToggleButton() "; VisualTreeTestHelper.VerifyVisualTree(xaml: xaml, - masterFilePrefix: "VerifyVisualTreeForAppBarAndAppBarToggleButton"); + verificationFileNamePrefix: "VerifyVisualTreeForAppBarAndAppBarToggleButton"); } [TestMethod] @@ -227,7 +227,7 @@ public void VerifyVisualTreeExampleLoadAndVerifyForAllThemes() var xaml = @" "; VisualTreeTestHelper.VerifyVisualTree(xaml: xaml, - masterFilePrefix: "VerifyVisualTreeExampleLoadAndVerifyForAllThemes", + verificationFileNamePrefix: "VerifyVisualTreeExampleLoadAndVerifyForAllThemes", theme: Theme.All); } @@ -247,7 +247,7 @@ public void VerifyVisualTreeExampleLoadAndVerifyForDarkThemeWithCustomName() (root as FrameworkElement).RequestedTheme = ElementTheme.Dark; }); VisualTreeTestHelper.VerifyVisualTree(root: root, - masterFilePrefix: "VerifyVisualTreeExampleLoadAndVerifyForDarkThemeWithCustomName"); + verificationFileNamePrefix: "VerifyVisualTreeExampleLoadAndVerifyForDarkThemeWithCustomName"); } [TestMethod] @@ -262,7 +262,7 @@ public void VerifyVisualTreeExampleForLightTheme() "; UIElement root = VisualTreeTestHelper.SetupVisualTree(xaml); VisualTreeTestHelper.VerifyVisualTree(root: root, - masterFilePrefix: "VerifyVisualTreeExampleForLightTheme", + verificationFileNamePrefix: "VerifyVisualTreeExampleForLightTheme", theme: Theme.Light); } @@ -280,7 +280,7 @@ public void VerifyVisualTreeExampleWithCustomerFilter() "; VisualTreeTestHelper.VerifyVisualTree(xaml: xaml, - masterFilePrefix: "VerifyVisualTreeExampleWithCustomerFilter", + verificationFileNamePrefix: "VerifyVisualTreeExampleWithCustomerFilter", filter: new CustomizedFilter()); } @@ -298,7 +298,7 @@ public void VerifyVisualTreeExampleWithCustomerPropertyValueTranslator() "; VisualTreeTestHelper.VerifyVisualTree(xaml: xaml, - masterFilePrefix: "VerifyVisualTreeExampleWithCustomerPropertyValueTranslator", + verificationFileNamePrefix: "VerifyVisualTreeExampleWithCustomerPropertyValueTranslator", translator: new CustomizedTranslator()); } diff --git a/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs b/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs index 43ad0c5244..a6a42cb77c 100644 --- a/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs +++ b/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs @@ -158,13 +158,13 @@ public void VerifyVisualTree() { using(VisualTreeVerifier visualTreeVerifier = new VisualTreeVerifier()) { - // Generate a basic NavigationView master file for all the pane display modes + // Generate a basic NavigationView verification file for all the pane display modes foreach (var paneDisplayMode in Enum.GetValues(typeof(NavigationViewPaneDisplayMode))) { var filePrefix = "NavigationView" + paneDisplayMode; NavigationViewPaneDisplayMode displayMode = (NavigationViewPaneDisplayMode)paneDisplayMode; - // We can skip generating a master file for Left mode since Auto is achieving the same result. + // We can skip generating a verification file for Left mode since Auto is achieving the same result. if (displayMode == NavigationViewPaneDisplayMode.Left) { continue; @@ -172,20 +172,20 @@ public void VerifyVisualTree() Log.Comment($"Verify visual tree for NavigationViewPaneDisplayMode: {paneDisplayMode}"); var navigationView = SetupNavigationView(displayMode); - visualTreeVerifier.VerifyVisualTreeNoException(root: navigationView, masterFilePrefix: filePrefix); + visualTreeVerifier.VerifyVisualTreeNoException(root: navigationView, verificationFileNamePrefix: filePrefix); } Log.Comment($"Verify visual tree for NavigationViewScrolling"); var leftNavViewScrolling = SetupNavigationViewScrolling(NavigationViewPaneDisplayMode.Left); - visualTreeVerifier.VerifyVisualTreeNoException(root: leftNavViewScrolling, masterFilePrefix: "NavigationViewScrolling"); + visualTreeVerifier.VerifyVisualTreeNoException(root: leftNavViewScrolling, verificationFileNamePrefix: "NavigationViewScrolling"); Log.Comment($"Verify visual tree for NavigationViewLeftPaneContent"); var leftNavViewPaneContent = SetupNavigationViewPaneContent(NavigationViewPaneDisplayMode.Left); - visualTreeVerifier.VerifyVisualTreeNoException(root: leftNavViewPaneContent, masterFilePrefix: "NavigationViewLeftPaneContent"); + visualTreeVerifier.VerifyVisualTreeNoException(root: leftNavViewPaneContent, verificationFileNamePrefix: "NavigationViewLeftPaneContent"); Log.Comment($"Verify visual tree for NavigationViewTopPaneContent"); var topNavViewPaneContent = SetupNavigationViewPaneContent(NavigationViewPaneDisplayMode.Top); - visualTreeVerifier.VerifyVisualTreeNoException(root: topNavViewPaneContent, masterFilePrefix: "NavigationViewTopPaneContent"); + visualTreeVerifier.VerifyVisualTreeNoException(root: topNavViewPaneContent, verificationFileNamePrefix: "NavigationViewTopPaneContent"); } } @@ -650,7 +650,7 @@ public void VerifyVerifyHeaderContentMarginOnMinimalNav() VerifyVerifyHeaderContentMargin(NavigationViewPaneDisplayMode.LeftMinimal, "VerifyVerifyHeaderContentMarginOnMinimalNav"); } - private void VerifyVerifyHeaderContentMargin(NavigationViewPaneDisplayMode paneDisplayMode, string masterFilePrefix) + private void VerifyVerifyHeaderContentMargin(NavigationViewPaneDisplayMode paneDisplayMode, string verificationFileNamePrefix) { UIElement headerContent = null; @@ -668,7 +668,7 @@ private void VerifyVerifyHeaderContentMargin(NavigationViewPaneDisplayMode paneD VisualTreeTestHelper.VerifyVisualTree( root: headerContent, - masterFilePrefix: masterFilePrefix); + verificationFileNamePrefix: verificationFileNamePrefix); } [TestMethod] diff --git a/dev/TreeView/APITests/TreeViewTests.cs b/dev/TreeView/APITests/TreeViewTests.cs index 7db3c342ca..0665fc745f 100644 --- a/dev/TreeView/APITests/TreeViewTests.cs +++ b/dev/TreeView/APITests/TreeViewTests.cs @@ -499,7 +499,7 @@ public void VerifyVisualTree() }); TestUtilities.SetAsVisualTreeRoot(treeView); - VisualTreeTestHelper.VerifyVisualTree(root: treeView, masterFilePrefix: "TreeView"); + VisualTreeTestHelper.VerifyVisualTree(root: treeView, verificationFileNamePrefix: "TreeView"); } [TestMethod] diff --git a/docs/developer_guide.md b/docs/developer_guide.md index dd2be9293a..eb58404324 100644 --- a/docs/developer_guide.md +++ b/docs/developer_guide.md @@ -191,8 +191,8 @@ checks in order to pass on all versions. #### Visual tree verification tests -##### Update visual tree masters -Visual tree dumps are stored [here](https://github.com/microsoft/microsoft-ui-xaml/tree/master/test/MUXControlsTestApp/master) and we use them as the baseline (master) for visual tree verifications. If you make UI changes, visual tree verification tests may fail since the new dump no longer matches with masters. The master files need to be updated to include your latest changes. Visual verification test automatically captures the new visual tree and uploads the dump to test pipeline artifacts. Here are the steps to replace existing masters with the new ones. +##### Update visual tree verification files +Visual tree dumps are stored [here](https://github.com/microsoft/microsoft-ui-xaml/tree/master/test/MUXControlsTestApp/verification) and we use them as the baseline for visual tree verifications. If you make UI changes, visual tree verification tests may fail since the new dump no longer matches with previous verification files. The verification files need to be updated to include your latest changes. Visual verification test automatically captures the new visual tree and uploads the dump to test pipeline artifacts. Here are the steps to replace existing verification files with the new ones. 1. Find your test run. @@ -200,7 +200,7 @@ Visual tree dumps are stored [here](https://github.com/microsoft/microsoft-ui-xa ![test fail page2](images/test_fail_page2.png) -2. Download new masters. +2. Download new verification files. ![drop folder](images/test_pipeline_drop.png) @@ -208,7 +208,7 @@ Visual tree dumps are stored [here](https://github.com/microsoft/microsoft-ui-xa 3. Diff & replace - Diff the [old](https://github.com/microsoft/microsoft-ui-xaml/tree/master/test/MUXControlsTestApp/master) and new masters, make sure the changes are intended, replace the files and commit your changes. + Diff the [old](https://github.com/microsoft/microsoft-ui-xaml/tree/master/test/MUXControlsTestApp/verification) and new verification files, make sure the changes are intended, replace the files and commit your changes. ##### Create new visual tree tests 1. Write new test @@ -217,19 +217,19 @@ Visual tree dumps are stored [here](https://github.com/microsoft/microsoft-ui-xa 2. Run the test locally - Run the test locally and make sure everything looks right. The test will fail, which is expected since the test is new and there's no master to compare against. A new master file should be generated in your Pictures folder (The test app doesn't have write access to other arbitrary folders ☹). + Run the test locally and make sure everything looks right. The test will fail, which is expected since the test is new and there's no verification file to compare against. A new verification file should be generated in your Pictures folder (The test app doesn't have write access to other arbitrary folders ☹). 3. Queue a test run in pipeline - Local test run only gives you the visual tree dump for your host OS version. Some controls have different visual behaviors on different versions. To get master files for all supported OS versions, you'll need to start a test run in test pipeline. + Local test run only gives you the visual tree dump for your host OS version. Some controls have different visual behaviors on different versions. To get verification files for all supported OS versions, you'll need to start a test run in test pipeline. Go to the [build page](https://dev.azure.com/ms/microsoft-ui-xaml/_build?definitionId=21) and select `WinUI-Public-MUX-PR` pipeline. Click the `Queue` button on top right corner, update `Branch/tag` TextBlock to be your working branch then click on `Run`. Outside contributors may not have permission to do this, just open a PR and one of our team members will queue a test run for you. -4. Get the new master files. +4. Get the new verification files. - The new masters will be uploaded to pipeline artifacts folder when test finishes. Continue the steps in `Update visual tree masters` section above to download and commit the new files. + The new verification files will be uploaded to pipeline artifacts folder when test finishes. Continue the steps in `Update visual tree verification files` section above to download and commit the new files. @@ -237,5 +237,4 @@ Visual tree dumps are stored [here](https://github.com/microsoft/microsoft-ui-xa This project collects usage data and sends it to Microsoft to help improve our products and services. Note however that no data collection is performed -when using your private builds. - \ No newline at end of file +when using your private builds. \ No newline at end of file diff --git a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems index 66073ba573..322597f433 100644 --- a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems +++ b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems @@ -287,7 +287,7 @@ - + diff --git a/test/MUXControlsTestApp/VisualTreeTestHelper.cs b/test/MUXControlsTestApp/VisualTreeTestHelper.cs index 1a0a8a527b..36cd6df842 100644 --- a/test/MUXControlsTestApp/VisualTreeTestHelper.cs +++ b/test/MUXControlsTestApp/VisualTreeTestHelper.cs @@ -58,11 +58,11 @@ public class VisualTreeVerifier: IDisposable { public bool hasFailed = false; - public void VerifyVisualTreeNoException(string xaml, string masterFilePrefix, Theme theme = Theme.None, IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null) + public void VerifyVisualTreeNoException(string xaml, string verificationFileNamePrefix, Theme theme = Theme.None, IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null) { try { - VisualTreeTestHelper.VerifyVisualTree(xaml, masterFilePrefix, theme, translator, filter, logger); + VisualTreeTestHelper.VerifyVisualTree(xaml, verificationFileNamePrefix, theme, translator, filter, logger); } catch (Exception e) { @@ -71,11 +71,11 @@ public void VerifyVisualTreeNoException(string xaml, string masterFilePrefix, Th } } - public void VerifyVisualTreeNoException(UIElement root, string masterFilePrefix, Theme theme = Theme.None, IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null) + public void VerifyVisualTreeNoException(UIElement root, string verificationFileNamePrefix, Theme theme = Theme.None, IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null) { try { - VisualTreeTestHelper.VerifyVisualTree(root, masterFilePrefix, theme, translator, filter, logger); + VisualTreeTestHelper.VerifyVisualTree(root, verificationFileNamePrefix, theme, translator, filter, logger); } catch (Exception e) { @@ -97,10 +97,10 @@ public void Dispose() public class VisualTreeTestHelper { - // Log MasterFile to MusicLibrary or LocalFolder. By default(AlwaysLogMasterFile=false), It logs the master files to LocalFolder. - // You can change the setting by set AlwaysLogMasterFile = true. After you run the tests and test case fails, the master files are put into MusicLibrary. - // Finally you can copy master files to master/ directory and check in with code. - public static bool AlwaysLogMasterFile = true; + // Log VerificationFile to MusicLibrary or LocalFolder. By default(AlwaysLogVerificationFile=false), It logs the verification files to LocalFolder. + // You can change the setting by set AlwaysLogVerificationFile = true. After you run the tests and test case fails, the verification files are put into MusicLibrary. + // Finally you can copy verification files to verification/ directory and check in with code. + public static bool AlwaysLogVisualVerificationFiles = true; public static void ChangeRequestedTheme(UIElement root, ElementTheme theme) { @@ -140,20 +140,20 @@ public static string DumpVisualTree(DependencyObject root, IPropertyValueTransla return content; } - public static void VerifyVisualTree(string xaml, string masterFilePrefix, Theme theme = Theme.None, IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null) + public static void VerifyVisualTree(string xaml, string verificationFileNamePrefix, Theme theme = Theme.None, IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null) { var root = SetupVisualTree(xaml); - VerifyVisualTree(root, masterFilePrefix, theme, translator, filter, logger); + VerifyVisualTree(root, verificationFileNamePrefix, theme, translator, filter, logger); } - public static void VerifyVisualTree(UIElement root, string masterFilePrefix, Theme theme = Theme.None, IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null) + public static void VerifyVisualTree(UIElement root, string verificationFileNamePrefix, Theme theme = Theme.None, IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null) { VisualTreeLog.LogInfo("VerifyVisualTree for theme " + theme.ToString()); - TestExecution helper = new TestExecution(translator, filter, logger, AlwaysLogMasterFile); + TestExecution helper = new TestExecution(translator, filter, logger, AlwaysLogVisualVerificationFiles); if (theme == Theme.None) { - helper.DumpAndVerifyVisualTree(root, masterFilePrefix); + helper.DumpAndVerifyVisualTree(root, verificationFileNamePrefix); } else { @@ -177,7 +177,7 @@ public static void VerifyVisualTree(UIElement root, string masterFilePrefix, The VisualTreeLog.LogInfo("Change RequestedTheme to " + themeName); ChangeRequestedTheme(root, requestedTheme); - helper.DumpAndVerifyVisualTree(root, masterFilePrefix + "_" + themeName, "DumpAndVerifyVisualTree for " + themeName); + helper.DumpAndVerifyVisualTree(root, verificationFileNamePrefix + "_" + themeName, "DumpAndVerifyVisualTree for " + themeName); } } if (helper.HasError()) @@ -192,14 +192,14 @@ private class TestExecution private IFilter _filter; private IVisualTreeLogger _logger; private StringBuilder _testResult; - private bool _shouldLogMasterFile; + private bool _shouldLogVerificationFile; - public TestExecution(IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null, bool shouldLogMasterFile = true) + public TestExecution(IPropertyValueTranslator translator = null, IFilter filter = null, IVisualTreeLogger logger = null, bool shouldLogVerificationFile = true) { _translator = translator; _filter = filter; _logger = logger; - _shouldLogMasterFile = shouldLogMasterFile; + _shouldLogVerificationFile = shouldLogVerificationFile; _testResult = new StringBuilder(); } @@ -213,35 +213,35 @@ public string GetTestResult() return _testResult.ToString(); } - public void DumpAndVerifyVisualTree(UIElement root, string masterFilePrefix, string messageOnError = null) + public void DumpAndVerifyVisualTree(UIElement root, string verificationFileNamePrefix, string messageOnError = null) { - VisualTreeLog.LogDebugInfo("DumpVisualTreeAndCompareWithMaster with masterFilePrefix " + masterFilePrefix); + VisualTreeLog.LogDebugInfo("DumpVisualTreeAndCompareWithverification with verificationFileNamePrefix " + verificationFileNamePrefix); string expectedContent = ""; string content = DumpVisualTree(root, _translator, _filter, _logger); - MasterFileStorage storage = new MasterFileStorage(!_shouldLogMasterFile, masterFilePrefix); - string bestMatchedMasterFileName = storage.BestMatchedMasterFileName; - string expectedMasterFileName = storage.ExpectedMasterFileName; + VerificationFileStorage storage = new VerificationFileStorage(!_shouldLogVerificationFile, verificationFileNamePrefix); + string bestMatchedVerificationFileName = storage.BestMatchedVerificationFileName; + string expectedVerificationFileName = storage.ExpectedVerificationFileName; - VisualTreeLog.LogDebugInfo("Target master file: " + expectedMasterFileName); - VisualTreeLog.LogDebugInfo("Best matched master file: " + bestMatchedMasterFileName); + VisualTreeLog.LogDebugInfo("Target verification file: " + expectedVerificationFileName); + VisualTreeLog.LogDebugInfo("Best matched verification file: " + bestMatchedVerificationFileName); - if (!string.IsNullOrEmpty(bestMatchedMasterFileName)) + if (!string.IsNullOrEmpty(bestMatchedVerificationFileName)) { - expectedContent = MasterFileStorage.GetMasterFileContent(bestMatchedMasterFileName); + expectedContent = VerificationFileStorage.GetVerificationFileContent(bestMatchedVerificationFileName); } string result = new VisualTreeOutputCompare(content, expectedContent).ToString(); if (!string.IsNullOrEmpty(result)) { - storage.LogMasterFile(expectedMasterFileName, content); - storage.LogMasterFile(expectedMasterFileName + ".orig", expectedContent); + storage.LogVerificationFile(expectedVerificationFileName, content); + storage.LogVerificationFile(expectedVerificationFileName + ".orig", expectedContent); if (!string.IsNullOrEmpty(messageOnError)) { _testResult.AppendLine(messageOnError); - _testResult.AppendLine(string.Format("{0}.xml and {0}.orig.xaml is logged", expectedMasterFileName)); + _testResult.AppendLine(string.Format("{0}.xml and {0}.orig.xaml is logged", expectedVerificationFileName)); } _testResult.AppendLine(result); } @@ -249,51 +249,51 @@ public void DumpAndVerifyVisualTree(UIElement root, string masterFilePrefix, str } } - class MasterFileStorage + class VerificationFileStorage { private StorageFolder _storage; public string StorageLocation { get; private set; } /* - master file searching rule: If running os is RS5, the api version = 7, then first file to check is if {masterFileNamePrefix}-7.xml exists, - if not, try {masterFileNamePrefix}-6.xml... {masterFileNamePrefix}-2.xml, and finally {masterFileNamePrefix}.xml. If all files doesn't exist, return null. - ExpectedMasterFileName: masterFileNamePrefix+running os API version, eg: {masterFileNamePrefix}-7.xml - BestMatchedMasterFileName: the master file name matched by the searching rule. + verification file searching rule: If running os is RS5, the api version = 7, then first file to check is if {verificationFileNamePrefix}-7.xml exists, + if not, try {verificationFileNamePrefix}-6.xml... {verificationFileNamePrefix}-2.xml, and finally {verificationFileNamePrefix}.xml. If all files doesn't exist, return null. + ExpectedVerificationFileName: verificationFileNamePrefix+running os API version, eg: {verificationFileNamePrefix}-7.xml + BestMatchedVerificationFileName: the verification file name matched by the searching rule. */ - public string ExpectedMasterFileName { get; private set; } - public string BestMatchedMasterFileName { get; private set; } + public string ExpectedVerificationFileName { get; private set; } + public string BestMatchedVerificationFileName { get; private set; } - public MasterFileStorage(bool useLocalStorage, string masterFileNamePrefix) + public VerificationFileStorage(bool useLocalStorage, string verificationFileNamePrefix) { _storage = useLocalStorage ? ApplicationData.Current.LocalFolder : KnownFolders.PicturesLibrary; - ExpectedMasterFileName = GetExpectedMasterFileName(masterFileNamePrefix); - BestMatchedMasterFileName = SearchBestMatchedMasterFileName(masterFileNamePrefix); + ExpectedVerificationFileName = GetExpectedVerificationFileName(verificationFileNamePrefix); + BestMatchedVerificationFileName = SearchBestMatchedVerificationFileName(verificationFileNamePrefix); StorageLocation = useLocalStorage ? ApplicationData.Current.LocalFolder.Path : "PictureLibrary"; } - public void LogMasterFile(string fileName, string content) + public void LogVerificationFile(string fileName, string content) { - LogMasterFile(_storage, fileName, content); + LogVerificationFile(_storage, fileName, content); } - private string GetExpectedMasterFileName(string fileNamePrefix) + private string GetExpectedVerificationFileName(string fileNamePrefix) { return string.Format("{0}-{1}.xml", fileNamePrefix, PlatformConfiguration.GetCurrentAPIVersion()); } - private string SearchBestMatchedMasterFileName(string fileNamePrefix) + private string SearchBestMatchedVerificationFileName(string fileNamePrefix) { for (ushort version = PlatformConfiguration.GetCurrentAPIVersion(); version >= 2; version--) { string fileName = string.Format("{0}-{1}.xml", fileNamePrefix, version); - if (MasterFileStorage.IsMasterFilePresent(fileName)) + if (VerificationFileStorage.IsVerificationFilePresent(fileName)) { return fileName; } } { string fileName = fileNamePrefix + ".xml"; - if (MasterFileStorage.IsMasterFilePresent(fileName)) + if (VerificationFileStorage.IsVerificationFilePresent(fileName)) { return fileName; } @@ -301,16 +301,16 @@ private string SearchBestMatchedMasterFileName(string fileNamePrefix) return null; } - public static string GetMasterFileContent(string fileName) + public static string GetVerificationFileContent(string fileName) { - return GetMasterFileContentAsync(fileName).Result; + return GetVerificationFileContentAsync(fileName).Result; } - public static bool IsMasterFilePresent(string fileName) + public static bool IsVerificationFilePresent(string fileName) { try { - GetMasterFileContentAsync(fileName).Wait(); + GetVerificationFileContentAsync(fileName).Wait(); return true; } catch (AggregateException ae) @@ -323,21 +323,21 @@ public static bool IsMasterFilePresent(string fileName) } } - public static void LogMasterFile(StorageFolder storageFolder, string fileName, string content) + public static void LogVerificationFile(StorageFolder storageFolder, string fileName, string content) { - LogMasterFileAsync(storageFolder, fileName, content).Wait(); + LogVerificationFileAsync(storageFolder, fileName, content).Wait(); } - private static readonly string MasterFileFullPathPrefix = "ms-appx:///master/"; + private static readonly string VerificationFileFullPathPrefix = "ms-appx:///verification/"; - private static async Task GetMasterFileContentAsync(string fileName) + private static async Task GetVerificationFileContentAsync(string fileName) { - Uri uri = new Uri(MasterFileFullPathPrefix + fileName); + Uri uri = new Uri(VerificationFileFullPathPrefix + fileName); var file = await StorageFile.GetFileFromApplicationUriAsync(uri); return await FileIO.ReadTextAsync(file); } - private static async Task LogMasterFileAsync(StorageFolder storageFolder, string fileName, string content) + private static async Task LogVerificationFileAsync(StorageFolder storageFolder, string fileName, string content) { var file = await storageFolder.CreateFileAsync(fileName, CreationCollisionOption.ReplaceExisting); await FileIO.WriteTextAsync(file, content); diff --git a/test/MUXControlsTestApp/master/AppBarButton-6.xml b/test/MUXControlsTestApp/verification/AppBarButton-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/AppBarButton-6.xml rename to test/MUXControlsTestApp/verification/AppBarButton-6.xml diff --git a/test/MUXControlsTestApp/master/AppBarButton-7.xml b/test/MUXControlsTestApp/verification/AppBarButton-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/AppBarButton-7.xml rename to test/MUXControlsTestApp/verification/AppBarButton-7.xml diff --git a/test/MUXControlsTestApp/master/AppBarButton.xml b/test/MUXControlsTestApp/verification/AppBarButton.xml similarity index 100% rename from test/MUXControlsTestApp/master/AppBarButton.xml rename to test/MUXControlsTestApp/verification/AppBarButton.xml diff --git a/test/MUXControlsTestApp/master/AppBarToggleButton-6.xml b/test/MUXControlsTestApp/verification/AppBarToggleButton-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/AppBarToggleButton-6.xml rename to test/MUXControlsTestApp/verification/AppBarToggleButton-6.xml diff --git a/test/MUXControlsTestApp/master/AppBarToggleButton-7.xml b/test/MUXControlsTestApp/verification/AppBarToggleButton-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/AppBarToggleButton-7.xml rename to test/MUXControlsTestApp/verification/AppBarToggleButton-7.xml diff --git a/test/MUXControlsTestApp/master/AppBarToggleButton.xml b/test/MUXControlsTestApp/verification/AppBarToggleButton.xml similarity index 100% rename from test/MUXControlsTestApp/master/AppBarToggleButton.xml rename to test/MUXControlsTestApp/verification/AppBarToggleButton.xml diff --git a/test/MUXControlsTestApp/master/AutoSuggestBox-5.xml b/test/MUXControlsTestApp/verification/AutoSuggestBox-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/AutoSuggestBox-5.xml rename to test/MUXControlsTestApp/verification/AutoSuggestBox-5.xml diff --git a/test/MUXControlsTestApp/master/AutoSuggestBox-6.xml b/test/MUXControlsTestApp/verification/AutoSuggestBox-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/AutoSuggestBox-6.xml rename to test/MUXControlsTestApp/verification/AutoSuggestBox-6.xml diff --git a/test/MUXControlsTestApp/master/AutoSuggestBox-7.xml b/test/MUXControlsTestApp/verification/AutoSuggestBox-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/AutoSuggestBox-7.xml rename to test/MUXControlsTestApp/verification/AutoSuggestBox-7.xml diff --git a/test/MUXControlsTestApp/master/AutoSuggestBox-8.xml b/test/MUXControlsTestApp/verification/AutoSuggestBox-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/AutoSuggestBox-8.xml rename to test/MUXControlsTestApp/verification/AutoSuggestBox-8.xml diff --git a/test/MUXControlsTestApp/master/AutoSuggestBox.xml b/test/MUXControlsTestApp/verification/AutoSuggestBox.xml similarity index 100% rename from test/MUXControlsTestApp/master/AutoSuggestBox.xml rename to test/MUXControlsTestApp/verification/AutoSuggestBox.xml diff --git a/test/MUXControlsTestApp/master/Button-7.xml b/test/MUXControlsTestApp/verification/Button-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/Button-7.xml rename to test/MUXControlsTestApp/verification/Button-7.xml diff --git a/test/MUXControlsTestApp/master/Button.xml b/test/MUXControlsTestApp/verification/Button.xml similarity index 100% rename from test/MUXControlsTestApp/master/Button.xml rename to test/MUXControlsTestApp/verification/Button.xml diff --git a/test/MUXControlsTestApp/master/CalendarView-7.xml b/test/MUXControlsTestApp/verification/CalendarView-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/CalendarView-7.xml rename to test/MUXControlsTestApp/verification/CalendarView-7.xml diff --git a/test/MUXControlsTestApp/master/CalendarView.xml b/test/MUXControlsTestApp/verification/CalendarView.xml similarity index 100% rename from test/MUXControlsTestApp/master/CalendarView.xml rename to test/MUXControlsTestApp/verification/CalendarView.xml diff --git a/test/MUXControlsTestApp/master/CheckBox-7.xml b/test/MUXControlsTestApp/verification/CheckBox-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/CheckBox-7.xml rename to test/MUXControlsTestApp/verification/CheckBox-7.xml diff --git a/test/MUXControlsTestApp/master/CheckBox.xml b/test/MUXControlsTestApp/verification/CheckBox.xml similarity index 100% rename from test/MUXControlsTestApp/master/CheckBox.xml rename to test/MUXControlsTestApp/verification/CheckBox.xml diff --git a/test/MUXControlsTestApp/master/ColorPicker-7.xml b/test/MUXControlsTestApp/verification/ColorPicker-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/ColorPicker-7.xml rename to test/MUXControlsTestApp/verification/ColorPicker-7.xml diff --git a/test/MUXControlsTestApp/master/ColorPicker.xml b/test/MUXControlsTestApp/verification/ColorPicker.xml similarity index 100% rename from test/MUXControlsTestApp/master/ColorPicker.xml rename to test/MUXControlsTestApp/verification/ColorPicker.xml diff --git a/test/MUXControlsTestApp/master/ComboBox-7.xml b/test/MUXControlsTestApp/verification/ComboBox-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/ComboBox-7.xml rename to test/MUXControlsTestApp/verification/ComboBox-7.xml diff --git a/test/MUXControlsTestApp/master/ComboBox.xml b/test/MUXControlsTestApp/verification/ComboBox.xml similarity index 100% rename from test/MUXControlsTestApp/master/ComboBox.xml rename to test/MUXControlsTestApp/verification/ComboBox.xml diff --git a/test/MUXControlsTestApp/master/ComboBoxItem-7.xml b/test/MUXControlsTestApp/verification/ComboBoxItem-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/ComboBoxItem-7.xml rename to test/MUXControlsTestApp/verification/ComboBoxItem-7.xml diff --git a/test/MUXControlsTestApp/master/CommandBar-6.xml b/test/MUXControlsTestApp/verification/CommandBar-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/CommandBar-6.xml rename to test/MUXControlsTestApp/verification/CommandBar-6.xml diff --git a/test/MUXControlsTestApp/master/CommandBar-7.xml b/test/MUXControlsTestApp/verification/CommandBar-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/CommandBar-7.xml rename to test/MUXControlsTestApp/verification/CommandBar-7.xml diff --git a/test/MUXControlsTestApp/master/CommandBar-8.xml b/test/MUXControlsTestApp/verification/CommandBar-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/CommandBar-8.xml rename to test/MUXControlsTestApp/verification/CommandBar-8.xml diff --git a/test/MUXControlsTestApp/master/CommandBar.xml b/test/MUXControlsTestApp/verification/CommandBar.xml similarity index 100% rename from test/MUXControlsTestApp/master/CommandBar.xml rename to test/MUXControlsTestApp/verification/CommandBar.xml diff --git a/test/MUXControlsTestApp/master/CommandBarOverflowMenu-6.xml b/test/MUXControlsTestApp/verification/CommandBarOverflowMenu-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/CommandBarOverflowMenu-6.xml rename to test/MUXControlsTestApp/verification/CommandBarOverflowMenu-6.xml diff --git a/test/MUXControlsTestApp/master/CommandBarOverflowMenu-7.xml b/test/MUXControlsTestApp/verification/CommandBarOverflowMenu-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/CommandBarOverflowMenu-7.xml rename to test/MUXControlsTestApp/verification/CommandBarOverflowMenu-7.xml diff --git a/test/MUXControlsTestApp/master/CommandBarOverflowMenu-8.xml b/test/MUXControlsTestApp/verification/CommandBarOverflowMenu-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/CommandBarOverflowMenu-8.xml rename to test/MUXControlsTestApp/verification/CommandBarOverflowMenu-8.xml diff --git a/test/MUXControlsTestApp/master/CommandBarOverflowMenu.xml b/test/MUXControlsTestApp/verification/CommandBarOverflowMenu.xml similarity index 100% rename from test/MUXControlsTestApp/master/CommandBarOverflowMenu.xml rename to test/MUXControlsTestApp/verification/CommandBarOverflowMenu.xml diff --git a/test/MUXControlsTestApp/master/ContentDialog-5.xml b/test/MUXControlsTestApp/verification/ContentDialog-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/ContentDialog-5.xml rename to test/MUXControlsTestApp/verification/ContentDialog-5.xml diff --git a/test/MUXControlsTestApp/master/ContentDialog-7.xml b/test/MUXControlsTestApp/verification/ContentDialog-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/ContentDialog-7.xml rename to test/MUXControlsTestApp/verification/ContentDialog-7.xml diff --git a/test/MUXControlsTestApp/master/ContentDialog.xml b/test/MUXControlsTestApp/verification/ContentDialog.xml similarity index 100% rename from test/MUXControlsTestApp/master/ContentDialog.xml rename to test/MUXControlsTestApp/verification/ContentDialog.xml diff --git a/test/MUXControlsTestApp/master/DatePicker-7.xml b/test/MUXControlsTestApp/verification/DatePicker-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/DatePicker-7.xml rename to test/MUXControlsTestApp/verification/DatePicker-7.xml diff --git a/test/MUXControlsTestApp/master/DatePicker.xml b/test/MUXControlsTestApp/verification/DatePicker.xml similarity index 100% rename from test/MUXControlsTestApp/master/DatePicker.xml rename to test/MUXControlsTestApp/verification/DatePicker.xml diff --git a/test/MUXControlsTestApp/master/FlipView-7.xml b/test/MUXControlsTestApp/verification/FlipView-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/FlipView-7.xml rename to test/MUXControlsTestApp/verification/FlipView-7.xml diff --git a/test/MUXControlsTestApp/master/FlipView.xml b/test/MUXControlsTestApp/verification/FlipView.xml similarity index 100% rename from test/MUXControlsTestApp/master/FlipView.xml rename to test/MUXControlsTestApp/verification/FlipView.xml diff --git a/test/MUXControlsTestApp/master/ListViewItem-5.xml b/test/MUXControlsTestApp/verification/ListViewItem-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/ListViewItem-5.xml rename to test/MUXControlsTestApp/verification/ListViewItem-5.xml diff --git a/test/MUXControlsTestApp/master/ListViewItem-7.xml b/test/MUXControlsTestApp/verification/ListViewItem-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/ListViewItem-7.xml rename to test/MUXControlsTestApp/verification/ListViewItem-7.xml diff --git a/test/MUXControlsTestApp/master/ListViewItem.xml b/test/MUXControlsTestApp/verification/ListViewItem.xml similarity index 100% rename from test/MUXControlsTestApp/master/ListViewItem.xml rename to test/MUXControlsTestApp/verification/ListViewItem.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewAuto-5.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewAuto-5.xml rename to test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewAuto-6.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewAuto-6.xml rename to test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewAuto-7.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewAuto-7.xml rename to test/MUXControlsTestApp/verification/NavigationViewAuto-7.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewAuto-8.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewAuto-8.xml rename to test/MUXControlsTestApp/verification/NavigationViewAuto-8.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewAuto.xml b/test/MUXControlsTestApp/verification/NavigationViewAuto.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewAuto.xml rename to test/MUXControlsTestApp/verification/NavigationViewAuto.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftCompact-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftCompact-5.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftCompact-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftCompact-6.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftCompact-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftCompact-7.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftCompact-7.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftCompact-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftCompact-8.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftCompact-8.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftCompact.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftCompact.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftCompact.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftCompact.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftMinimal-5.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftMinimal-6.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftMinimal-7.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-7.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftMinimal-8.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-8.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftMinimal.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftMinimal.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftMinimal.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-5.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-5.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-6.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-6.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-7.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-8.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml b/test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml rename to test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewScrolling-5.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewScrolling-5.xml rename to test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewScrolling-6.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewScrolling-6.xml rename to test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewScrolling-7.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewScrolling-7.xml rename to test/MUXControlsTestApp/verification/NavigationViewScrolling-7.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewScrolling-8.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewScrolling-8.xml rename to test/MUXControlsTestApp/verification/NavigationViewScrolling-8.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewScrolling.xml b/test/MUXControlsTestApp/verification/NavigationViewScrolling.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewScrolling.xml rename to test/MUXControlsTestApp/verification/NavigationViewScrolling.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTop-5.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTop-5.xml rename to test/MUXControlsTestApp/verification/NavigationViewTop-5.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTop-6.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTop-6.xml rename to test/MUXControlsTestApp/verification/NavigationViewTop-6.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTop-7.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTop-7.xml rename to test/MUXControlsTestApp/verification/NavigationViewTop-7.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTop-8.xml b/test/MUXControlsTestApp/verification/NavigationViewTop-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTop-8.xml rename to test/MUXControlsTestApp/verification/NavigationViewTop-8.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTop.xml b/test/MUXControlsTestApp/verification/NavigationViewTop.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTop.xml rename to test/MUXControlsTestApp/verification/NavigationViewTop.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-5.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTopPaneContent-5.xml rename to test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-5.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-6.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-6.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTopPaneContent-6.xml rename to test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-6.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml rename to test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-7.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml rename to test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-8.xml diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml b/test/MUXControlsTestApp/verification/NavigationViewTopPaneContent.xml similarity index 100% rename from test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml rename to test/MUXControlsTestApp/verification/NavigationViewTopPaneContent.xml diff --git a/test/MUXControlsTestApp/master/PasswordBox-5.xml b/test/MUXControlsTestApp/verification/PasswordBox-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/PasswordBox-5.xml rename to test/MUXControlsTestApp/verification/PasswordBox-5.xml diff --git a/test/MUXControlsTestApp/master/PasswordBox-7.xml b/test/MUXControlsTestApp/verification/PasswordBox-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/PasswordBox-7.xml rename to test/MUXControlsTestApp/verification/PasswordBox-7.xml diff --git a/test/MUXControlsTestApp/master/PasswordBox.xml b/test/MUXControlsTestApp/verification/PasswordBox.xml similarity index 100% rename from test/MUXControlsTestApp/master/PasswordBox.xml rename to test/MUXControlsTestApp/verification/PasswordBox.xml diff --git a/test/MUXControlsTestApp/master/Pivot-7.xml b/test/MUXControlsTestApp/verification/Pivot-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/Pivot-7.xml rename to test/MUXControlsTestApp/verification/Pivot-7.xml diff --git a/test/MUXControlsTestApp/master/Pivot.xml b/test/MUXControlsTestApp/verification/Pivot.xml similarity index 100% rename from test/MUXControlsTestApp/master/Pivot.xml rename to test/MUXControlsTestApp/verification/Pivot.xml diff --git a/test/MUXControlsTestApp/master/PivotItem-7.xml b/test/MUXControlsTestApp/verification/PivotItem-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/PivotItem-7.xml rename to test/MUXControlsTestApp/verification/PivotItem-7.xml diff --git a/test/MUXControlsTestApp/master/PivotItem.xml b/test/MUXControlsTestApp/verification/PivotItem.xml similarity index 100% rename from test/MUXControlsTestApp/master/PivotItem.xml rename to test/MUXControlsTestApp/verification/PivotItem.xml diff --git a/test/MUXControlsTestApp/master/RichEditBox-5.xml b/test/MUXControlsTestApp/verification/RichEditBox-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/RichEditBox-5.xml rename to test/MUXControlsTestApp/verification/RichEditBox-5.xml diff --git a/test/MUXControlsTestApp/master/RichEditBox-7.xml b/test/MUXControlsTestApp/verification/RichEditBox-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/RichEditBox-7.xml rename to test/MUXControlsTestApp/verification/RichEditBox-7.xml diff --git a/test/MUXControlsTestApp/master/RichEditBox.xml b/test/MUXControlsTestApp/verification/RichEditBox.xml similarity index 100% rename from test/MUXControlsTestApp/master/RichEditBox.xml rename to test/MUXControlsTestApp/verification/RichEditBox.xml diff --git a/test/MUXControlsTestApp/master/Slider-7.xml b/test/MUXControlsTestApp/verification/Slider-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/Slider-7.xml rename to test/MUXControlsTestApp/verification/Slider-7.xml diff --git a/test/MUXControlsTestApp/master/Slider.xml b/test/MUXControlsTestApp/verification/Slider.xml similarity index 100% rename from test/MUXControlsTestApp/master/Slider.xml rename to test/MUXControlsTestApp/verification/Slider.xml diff --git a/test/MUXControlsTestApp/master/SplitView-7.xml b/test/MUXControlsTestApp/verification/SplitView-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/SplitView-7.xml rename to test/MUXControlsTestApp/verification/SplitView-7.xml diff --git a/test/MUXControlsTestApp/master/SplitView.xml b/test/MUXControlsTestApp/verification/SplitView.xml similarity index 100% rename from test/MUXControlsTestApp/master/SplitView.xml rename to test/MUXControlsTestApp/verification/SplitView.xml diff --git a/test/MUXControlsTestApp/master/TextBox-5.xml b/test/MUXControlsTestApp/verification/TextBox-5.xml similarity index 100% rename from test/MUXControlsTestApp/master/TextBox-5.xml rename to test/MUXControlsTestApp/verification/TextBox-5.xml diff --git a/test/MUXControlsTestApp/master/TextBox-7.xml b/test/MUXControlsTestApp/verification/TextBox-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/TextBox-7.xml rename to test/MUXControlsTestApp/verification/TextBox-7.xml diff --git a/test/MUXControlsTestApp/master/TextBox.xml b/test/MUXControlsTestApp/verification/TextBox.xml similarity index 100% rename from test/MUXControlsTestApp/master/TextBox.xml rename to test/MUXControlsTestApp/verification/TextBox.xml diff --git a/test/MUXControlsTestApp/master/TimePicker-7.xml b/test/MUXControlsTestApp/verification/TimePicker-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/TimePicker-7.xml rename to test/MUXControlsTestApp/verification/TimePicker-7.xml diff --git a/test/MUXControlsTestApp/master/TimePicker.xml b/test/MUXControlsTestApp/verification/TimePicker.xml similarity index 100% rename from test/MUXControlsTestApp/master/TimePicker.xml rename to test/MUXControlsTestApp/verification/TimePicker.xml diff --git a/test/MUXControlsTestApp/master/ToggleButton-7.xml b/test/MUXControlsTestApp/verification/ToggleButton-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/ToggleButton-7.xml rename to test/MUXControlsTestApp/verification/ToggleButton-7.xml diff --git a/test/MUXControlsTestApp/master/ToggleButton.xml b/test/MUXControlsTestApp/verification/ToggleButton.xml similarity index 100% rename from test/MUXControlsTestApp/master/ToggleButton.xml rename to test/MUXControlsTestApp/verification/ToggleButton.xml diff --git a/test/MUXControlsTestApp/master/ToggleSwitch-7.xml b/test/MUXControlsTestApp/verification/ToggleSwitch-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/ToggleSwitch-7.xml rename to test/MUXControlsTestApp/verification/ToggleSwitch-7.xml diff --git a/test/MUXControlsTestApp/master/ToggleSwitch.xml b/test/MUXControlsTestApp/verification/ToggleSwitch.xml similarity index 100% rename from test/MUXControlsTestApp/master/ToggleSwitch.xml rename to test/MUXControlsTestApp/verification/ToggleSwitch.xml diff --git a/test/MUXControlsTestApp/master/ToolTip-7.xml b/test/MUXControlsTestApp/verification/ToolTip-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/ToolTip-7.xml rename to test/MUXControlsTestApp/verification/ToolTip-7.xml diff --git a/test/MUXControlsTestApp/master/ToolTip.xml b/test/MUXControlsTestApp/verification/ToolTip.xml similarity index 100% rename from test/MUXControlsTestApp/master/ToolTip.xml rename to test/MUXControlsTestApp/verification/ToolTip.xml diff --git a/test/MUXControlsTestApp/master/TreeView-7.xml b/test/MUXControlsTestApp/verification/TreeView-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/TreeView-7.xml rename to test/MUXControlsTestApp/verification/TreeView-7.xml diff --git a/test/MUXControlsTestApp/master/TreeView.xml b/test/MUXControlsTestApp/verification/TreeView.xml similarity index 100% rename from test/MUXControlsTestApp/master/TreeView.xml rename to test/MUXControlsTestApp/verification/TreeView.xml diff --git a/test/MUXControlsTestApp/master/VerifyVerifyHeaderContentMarginOnMinimalNav-7.xml b/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnMinimalNav-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVerifyHeaderContentMarginOnMinimalNav-7.xml rename to test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnMinimalNav-7.xml diff --git a/test/MUXControlsTestApp/master/VerifyVerifyHeaderContentMarginOnMinimalNav.xml b/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnMinimalNav.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVerifyHeaderContentMarginOnMinimalNav.xml rename to test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnMinimalNav.xml diff --git a/test/MUXControlsTestApp/master/VerifyVerifyHeaderContentMarginOnTopNav-7.xml b/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnTopNav-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVerifyHeaderContentMarginOnTopNav-7.xml rename to test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnTopNav-7.xml diff --git a/test/MUXControlsTestApp/master/VerifyVerifyHeaderContentMarginOnTopNav.xml b/test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnTopNav.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVerifyHeaderContentMarginOnTopNav.xml rename to test/MUXControlsTestApp/verification/VerifyVerifyHeaderContentMarginOnTopNav.xml diff --git a/test/MUXControlsTestApp/master/VerifyVisualTreeExampleForLightTheme_Light-7.xml b/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleForLightTheme_Light-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVisualTreeExampleForLightTheme_Light-7.xml rename to test/MUXControlsTestApp/verification/VerifyVisualTreeExampleForLightTheme_Light-7.xml diff --git a/test/MUXControlsTestApp/master/VerifyVisualTreeExampleLoadAndVerifyForAllThemes_Dark-7.xml b/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleLoadAndVerifyForAllThemes_Dark-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVisualTreeExampleLoadAndVerifyForAllThemes_Dark-7.xml rename to test/MUXControlsTestApp/verification/VerifyVisualTreeExampleLoadAndVerifyForAllThemes_Dark-7.xml diff --git a/test/MUXControlsTestApp/master/VerifyVisualTreeExampleLoadAndVerifyForAllThemes_Light-7.xml b/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleLoadAndVerifyForAllThemes_Light-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVisualTreeExampleLoadAndVerifyForAllThemes_Light-7.xml rename to test/MUXControlsTestApp/verification/VerifyVisualTreeExampleLoadAndVerifyForAllThemes_Light-7.xml diff --git a/test/MUXControlsTestApp/master/VerifyVisualTreeExampleLoadAndVerifyForDarkThemeWithCustomName-7.xml b/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleLoadAndVerifyForDarkThemeWithCustomName-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVisualTreeExampleLoadAndVerifyForDarkThemeWithCustomName-7.xml rename to test/MUXControlsTestApp/verification/VerifyVisualTreeExampleLoadAndVerifyForDarkThemeWithCustomName-7.xml diff --git a/test/MUXControlsTestApp/master/VerifyVisualTreeExampleWithCustomerFilter-7.xml b/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleWithCustomerFilter-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVisualTreeExampleWithCustomerFilter-7.xml rename to test/MUXControlsTestApp/verification/VerifyVisualTreeExampleWithCustomerFilter-7.xml diff --git a/test/MUXControlsTestApp/master/VerifyVisualTreeExampleWithCustomerPropertyValueTranslator-7.xml b/test/MUXControlsTestApp/verification/VerifyVisualTreeExampleWithCustomerPropertyValueTranslator-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVisualTreeExampleWithCustomerPropertyValueTranslator-7.xml rename to test/MUXControlsTestApp/verification/VerifyVisualTreeExampleWithCustomerPropertyValueTranslator-7.xml diff --git a/test/MUXControlsTestApp/master/VerifyVisualTreeForAppBarAndAppBarToggleButton-7.xml b/test/MUXControlsTestApp/verification/VerifyVisualTreeForAppBarAndAppBarToggleButton-7.xml similarity index 100% rename from test/MUXControlsTestApp/master/VerifyVisualTreeForAppBarAndAppBarToggleButton-7.xml rename to test/MUXControlsTestApp/verification/VerifyVisualTreeForAppBarAndAppBarToggleButton-7.xml