diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md index ab5454520655..2996296c4b73 100644 --- a/.github/DEVELOPMENT.md +++ b/.github/DEVELOPMENT.md @@ -89,7 +89,6 @@ Use ‘main’ for bug fixes that don’t require API changes. For new features │ ├── samples │ │ ├── Maui.Controls.Sample │ │ ├── Maui.Controls.Sample.Sandbox -│ │ ├── Controls.Sample.UITests ├── Essentials │ ├── samples │ │ ├── Essentials.Sample @@ -101,7 +100,6 @@ Use ‘main’ for bug fixes that don’t require API changes. For new features - *Maui.Controls.Sample*: Full gallery sample with all of the controls and features of .NET MAUI - *Maui.Controls.Sample.Sandbox*: Empty project useful for testing reproductions or use cases -- *Contols.Sample.UITests*: Sample used for the automated UI tests - *Essentials.Sample*: Full gallery demonstrating the library previously known as essentials. These are all the non UI related MAUI APIs. ### Device Test Projects @@ -138,10 +136,23 @@ These are tests used for exercising the UI through accessibility layers to simul ``` ├── Controls -│ ├── samples -│ │ ├── Controls.Sample.UITests │ ├── tests -│ │ ├── Controls.AppiumTests +│ ├── ├── Controls.TestCases.App +│ │ ├── Controls.TestCases.Shared.Tests +``` + +- *Controls.TestCases.App*: .NET MAUI Sample used for the automated UI tests +- *Controls.TestCases.Shared.Tests*: .NET MAUI library used to define the UI tests + +Each platform has a specific UI tests library project where it is possible to add specific tests per platform. + +``` +├── Controls +│ ├── tests +│ │ ├── Controls.TestCases.Android.Tests +│ │ ├── Controls.TestCases.iOS.Tests +│ │ ├── Controls.TestCases.Mac.Tests +│ │ ├── Controls.TestCases.WinUI.Tests ``` ### Unit Test Projects diff --git a/Microsoft.Maui-dev.sln b/Microsoft.Maui-dev.sln index 28eea69f5015..6f63284ea8d6 100644 --- a/Microsoft.Maui-dev.sln +++ b/Microsoft.Maui-dev.sln @@ -203,9 +203,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests.Int EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests.InternalsHiddenAssembly", "src\Controls\tests\Xaml.UnitTests.InternalsHiddenAssembly\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj", "{FB39FACE-BAF2-4F97-A249-E45BA63D77FE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.AppiumTests", "src\Controls\tests\UITests\Controls.AppiumTests.csproj", "{2A0CB35C-ED05-4FCB-91BC-21B288B749B1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Sample.UITests", "src\Controls\samples\Controls.Sample.UITests\Controls.Sample.UITests.csproj", "{07C26A25-08C2-4C52-9574-1C33EC8E7919}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.App", "src\Controls\tests\TestCases\Controls.TestCases.App.csproj", "{07C26A25-08C2-4C52-9574-1C33EC8E7919}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.IntegrationTests", "src\TestUtils\src\Microsoft.Maui.IntegrationTests\Microsoft.Maui.IntegrationTests.csproj", "{A6976D43-B3A4-47AF-89D9-FA388B56B52B}" EndProject @@ -245,7 +243,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGen.UnitTests", "src\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{054C5BAC-3671-4F76-B32E-47CF4E64BB39}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compatibility.Core.UnitTests", "src\Compatibility\Core\tests\Compatibility.UnitTests\Compatibility.Core.UnitTests.csproj", "{1D950CD3-6778-4729-B6D9-446088093F34}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.Core.UnitTests", "src\Compatibility\Core\tests\Compatibility.UnitTests\Compatibility.Core.UnitTests.csproj", "{1D950CD3-6778-4729-B6D9-446088093F34}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Shared.Tests", "src\Controls\tests\TestCases.Shared.Tests\Controls.TestCases.Shared.Tests.csproj", "{C450F8F4-C40F-4C15-978F-F43BA7DEA29D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Android.Tests", "src\Controls\tests\TestCases.Android.Tests\Controls.TestCases.Android.Tests.csproj", "{7042E8FF-472F-4CB5-8AAE-DAD87BA32207}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.iOS.Tests", "src\Controls\tests\TestCases.iOS.Tests\Controls.TestCases.iOS.Tests.csproj", "{5DDA6439-CDE0-4BFE-8BF9-77962BC69ACA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Mac.Tests", "src\Controls\tests\TestCases.Mac.Tests\Controls.TestCases.Mac.Tests.csproj", "{6E1ADE49-680E-4CA3-8FEA-6450802F8250}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.WinUI.Tests", "src\Controls\tests\TestCases.WinUI.Tests\Controls.TestCases.WinUI.Tests.csproj", "{A3E22F99-F380-4005-8483-3ACA6C104220}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -557,10 +565,6 @@ Global {FB39FACE-BAF2-4F97-A249-E45BA63D77FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB39FACE-BAF2-4F97-A249-E45BA63D77FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB39FACE-BAF2-4F97-A249-E45BA63D77FE}.Release|Any CPU.Build.0 = Release|Any CPU - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1}.Release|Any CPU.Build.0 = Release|Any CPU {07C26A25-08C2-4C52-9574-1C33EC8E7919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {07C26A25-08C2-4C52-9574-1C33EC8E7919}.Debug|Any CPU.Build.0 = Debug|Any CPU {07C26A25-08C2-4C52-9574-1C33EC8E7919}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -624,6 +628,26 @@ Global {1D950CD3-6778-4729-B6D9-446088093F34}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D950CD3-6778-4729-B6D9-446088093F34}.Release|Any CPU.ActiveCfg = Release|Any CPU {1D950CD3-6778-4729-B6D9-446088093F34}.Release|Any CPU.Build.0 = Release|Any CPU + {C450F8F4-C40F-4C15-978F-F43BA7DEA29D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C450F8F4-C40F-4C15-978F-F43BA7DEA29D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C450F8F4-C40F-4C15-978F-F43BA7DEA29D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C450F8F4-C40F-4C15-978F-F43BA7DEA29D}.Release|Any CPU.Build.0 = Release|Any CPU + {7042E8FF-472F-4CB5-8AAE-DAD87BA32207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7042E8FF-472F-4CB5-8AAE-DAD87BA32207}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7042E8FF-472F-4CB5-8AAE-DAD87BA32207}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7042E8FF-472F-4CB5-8AAE-DAD87BA32207}.Release|Any CPU.Build.0 = Release|Any CPU + {5DDA6439-CDE0-4BFE-8BF9-77962BC69ACA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DDA6439-CDE0-4BFE-8BF9-77962BC69ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DDA6439-CDE0-4BFE-8BF9-77962BC69ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DDA6439-CDE0-4BFE-8BF9-77962BC69ACA}.Release|Any CPU.Build.0 = Release|Any CPU + {6E1ADE49-680E-4CA3-8FEA-6450802F8250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E1ADE49-680E-4CA3-8FEA-6450802F8250}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E1ADE49-680E-4CA3-8FEA-6450802F8250}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E1ADE49-680E-4CA3-8FEA-6450802F8250}.Release|Any CPU.Build.0 = Release|Any CPU + {A3E22F99-F380-4005-8483-3ACA6C104220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3E22F99-F380-4005-8483-3ACA6C104220}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3E22F99-F380-4005-8483-3ACA6C104220}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3E22F99-F380-4005-8483-3ACA6C104220}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -717,8 +741,7 @@ Global {B5F38A9E-1949-4779-8739-D682B09E0CB3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {B5F38A9E-1949-4779-6666-D682B09E0CB3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {FB39FACE-BAF2-4F97-A249-E45BA63D77FE} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} - {07C26A25-08C2-4C52-9574-1C33EC8E7919} = {E1082E26-D700-4127-9329-66D673FD2D55} + {07C26A25-08C2-4C52-9574-1C33EC8E7919} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {A6976D43-B3A4-47AF-89D9-FA388B56B52B} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {DA908446-C6A1-473C-BF5C-83E600F5C69E} = {0AF0E771-4E09-4F05-B187-B43A2B9F62B0} {9B37E707-EE0B-480E-AEB9-0176784879BE} = {DA908446-C6A1-473C-BF5C-83E600F5C69E} @@ -738,6 +761,11 @@ Global {06747B55-91DB-47F5-B7A2-56526C28A0D3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {054C5BAC-3671-4F76-B32E-47CF4E64BB39} = {0AF0E771-4E09-4F05-B187-B43A2B9F62B0} {1D950CD3-6778-4729-B6D9-446088093F34} = {054C5BAC-3671-4F76-B32E-47CF4E64BB39} + {C450F8F4-C40F-4C15-978F-F43BA7DEA29D} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {7042E8FF-472F-4CB5-8AAE-DAD87BA32207} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {5DDA6439-CDE0-4BFE-8BF9-77962BC69ACA} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {6E1ADE49-680E-4CA3-8FEA-6450802F8250} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {A3E22F99-F380-4005-8483-3ACA6C104220} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50} diff --git a/Microsoft.Maui-mac.slnf b/Microsoft.Maui-mac.slnf index 3a1c4d567a41..422f49769588 100644 --- a/Microsoft.Maui-mac.slnf +++ b/Microsoft.Maui-mac.slnf @@ -11,7 +11,7 @@ "src\\Controls\\samples\\Controls.Sample.Profiling\\Maui.Controls.Sample.Profiling.csproj", "src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj", "src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj", - "src\\Controls\\samples\\Controls.Sample.UITests\\Controls.Sample.UITests.csproj", + "src\\Controls\\tests\\TestCases\\Controls.TestCases.App.csproj", "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj", "src\\Controls\\src\\Core.Design\\Controls.Core.Design.csproj", "src\\Controls\\src\\Core\\Controls.Core.csproj", @@ -22,7 +22,10 @@ "src\\Controls\\tests\\Core.UnitTests\\Controls.Core.UnitTests.csproj", "src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj", "src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj", - "src\\Controls\\tests\\UITests\\Controls.AppiumTests.csproj", + "src\\Controls\\tests\\TestCases.Android.Tests\\Controls.TestCases.Android.Tests.csproj", + "src\\Controls\\tests\\TestCases.iOS.Tests\\Controls.TestCases.iOS.Tests.csproj", + "src\\Controls\\tests\\TestCases.Mac.Tests\\Controls.TestCases.Mac.Tests.csproj", + "src\\Controls\\tests\\TestCases.Shared.Tests\\Controls.TestCases.Shared.Tests.csproj", "src\\Controls\\tests\\Xaml.UnitTests.ExternalAssembly\\Controls.Xaml.UnitTests.ExternalAssembly.csproj", "src\\Controls\\tests\\Xaml.UnitTests.InternalsVisibleAssembly\\Controls.Xaml.UnitTests.InternalsVisibleAssembly.csproj", "src\\Controls\\tests\\Xaml.UnitTests.InternalsHiddenAssembly\\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj", diff --git a/Microsoft.Maui-vscode.sln b/Microsoft.Maui-vscode.sln index 3a1141697ab2..185fbed2c521 100644 --- a/Microsoft.Maui-vscode.sln +++ b/Microsoft.Maui-vscode.sln @@ -183,9 +183,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests.Int EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests.InternalsHiddenAssembly", "src\Controls\tests\Xaml.UnitTests.InternalsHiddenAssembly\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj", "{FB39FACE-BAF2-4F97-A249-E45BA63D77FE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.AppiumTests", "src\Controls\tests\UITests\Controls.AppiumTests.csproj", "{2A0CB35C-ED05-4FCB-91BC-21B288B749B1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Sample.UITests", "src\Controls\samples\Controls.Sample.UITests\Controls.Sample.UITests.csproj", "{07C26A25-08C2-4C52-9574-1C33EC8E7919}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.App", "src\Controls\tests\TestCases\Controls.TestCases.App.csproj", "{07C26A25-08C2-4C52-9574-1C33EC8E7919}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.IntegrationTests", "src\TestUtils\src\Microsoft.Maui.IntegrationTests\Microsoft.Maui.IntegrationTests.csproj", "{A6976D43-B3A4-47AF-89D9-FA388B56B52B}" EndProject @@ -217,6 +215,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest.Appium", "src\TestUt EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest.NUnit", "src\TestUtils\src\UITest.NUnit\UITest.NUnit.csproj", "{A7B4FF91-8AF6-4A36-805C-B73D888AC1BE}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Shared.Tests", "src\Controls\tests\TestCases.Shared.Tests\Controls.TestCases.Shared.Tests.csproj", "{34DC60C1-C722-4134-99A4-E69B9AF1EAE3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Android.Tests", "src\Controls\tests\TestCases.Android.Tests\Controls.TestCases.Android.Tests.csproj", "{78B6A973-63DD-4BCC-92F6-5C479401E5D3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.iOS.Tests", "src\Controls\tests\TestCases.iOS.Tests\Controls.TestCases.iOS.Tests.csproj", "{AF5A8B2E-13E7-4D94-A44E-BC96180C1FCC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Mac.Tests", "src\Controls\tests\TestCases.Mac.Tests\Controls.TestCases.Mac.Tests.csproj", "{0B3AF328-82B8-431D-8AFF-45F0F86CEA0E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.WinUI.Tests", "src\Controls\tests\TestCases.WinUI.Tests\Controls.TestCases.WinUI.Tests.csproj", "{DACF87DB-6354-4B18-A34C-923A55F317F0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -485,10 +493,6 @@ Global {FB39FACE-BAF2-4F97-A249-E45BA63D77FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB39FACE-BAF2-4F97-A249-E45BA63D77FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB39FACE-BAF2-4F97-A249-E45BA63D77FE}.Release|Any CPU.Build.0 = Release|Any CPU - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1}.Release|Any CPU.Build.0 = Release|Any CPU {07C26A25-08C2-4C52-9574-1C33EC8E7919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {07C26A25-08C2-4C52-9574-1C33EC8E7919}.Debug|Any CPU.Build.0 = Debug|Any CPU {07C26A25-08C2-4C52-9574-1C33EC8E7919}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -534,6 +538,26 @@ Global {A7B4FF91-8AF6-4A36-805C-B73D888AC1BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7B4FF91-8AF6-4A36-805C-B73D888AC1BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7B4FF91-8AF6-4A36-805C-B73D888AC1BE}.Release|Any CPU.Build.0 = Release|Any CPU + {34DC60C1-C722-4134-99A4-E69B9AF1EAE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34DC60C1-C722-4134-99A4-E69B9AF1EAE3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34DC60C1-C722-4134-99A4-E69B9AF1EAE3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34DC60C1-C722-4134-99A4-E69B9AF1EAE3}.Release|Any CPU.Build.0 = Release|Any CPU + {78B6A973-63DD-4BCC-92F6-5C479401E5D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {78B6A973-63DD-4BCC-92F6-5C479401E5D3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {78B6A973-63DD-4BCC-92F6-5C479401E5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {78B6A973-63DD-4BCC-92F6-5C479401E5D3}.Release|Any CPU.Build.0 = Release|Any CPU + {AF5A8B2E-13E7-4D94-A44E-BC96180C1FCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF5A8B2E-13E7-4D94-A44E-BC96180C1FCC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF5A8B2E-13E7-4D94-A44E-BC96180C1FCC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF5A8B2E-13E7-4D94-A44E-BC96180C1FCC}.Release|Any CPU.Build.0 = Release|Any CPU + {0B3AF328-82B8-431D-8AFF-45F0F86CEA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B3AF328-82B8-431D-8AFF-45F0F86CEA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B3AF328-82B8-431D-8AFF-45F0F86CEA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B3AF328-82B8-431D-8AFF-45F0F86CEA0E}.Release|Any CPU.Build.0 = Release|Any CPU + {DACF87DB-6354-4B18-A34C-923A55F317F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DACF87DB-6354-4B18-A34C-923A55F317F0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DACF87DB-6354-4B18-A34C-923A55F317F0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DACF87DB-6354-4B18-A34C-923A55F317F0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -617,8 +641,7 @@ Global {B5F38A9E-1949-4779-8739-D682B09E0CB3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {B5F38A9E-1949-4779-6666-D682B09E0CB3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {FB39FACE-BAF2-4F97-A249-E45BA63D77FE} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} - {2A0CB35C-ED05-4FCB-91BC-21B288B749B1} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} - {07C26A25-08C2-4C52-9574-1C33EC8E7919} = {E1082E26-D700-4127-9329-66D673FD2D55} + {07C26A25-08C2-4C52-9574-1C33EC8E7919} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {A6976D43-B3A4-47AF-89D9-FA388B56B52B} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {DA908446-C6A1-473C-BF5C-83E600F5C69E} = {0AF0E771-4E09-4F05-B187-B43A2B9F62B0} {9B37E707-EE0B-480E-AEB9-0176784879BE} = {DA908446-C6A1-473C-BF5C-83E600F5C69E} @@ -633,6 +656,11 @@ Global {401CA2F5-EAD1-4414-AE8F-42444BF458EB} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {5BC29B1A-1EBC-41BF-A0B6-D1B73F8A4991} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {A7B4FF91-8AF6-4A36-805C-B73D888AC1BE} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} + {34DC60C1-C722-4134-99A4-E69B9AF1EAE3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {78B6A973-63DD-4BCC-92F6-5C479401E5D3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {AF5A8B2E-13E7-4D94-A44E-BC96180C1FCC} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {0B3AF328-82B8-431D-8AFF-45F0F86CEA0E} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {DACF87DB-6354-4B18-A34C-923A55F317F0} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50} diff --git a/Microsoft.Maui-windows.slnf b/Microsoft.Maui-windows.slnf index 87fda3963db9..2a944c55a9e3 100644 --- a/Microsoft.Maui-windows.slnf +++ b/Microsoft.Maui-windows.slnf @@ -14,7 +14,7 @@ "src\\Controls\\Maps\\src\\Controls.Maps.csproj", "src\\Controls\\samples\\Controls.Sample.Profiling\\Maui.Controls.Sample.Profiling.csproj", "src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj", - "src\\Controls\\samples\\Controls.Sample.UITests\\Controls.Sample.UITests.csproj", + "src\\Controls\\tests\\TestCases\\Controls.TestCases.App.csproj", "src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj", "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj", "src\\Controls\\src\\Core.Design\\Controls.Core.Design.csproj", @@ -28,7 +28,11 @@ "src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj", "src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj", "src\\Controls\\tests\\SourceGen.UnitTests\\SourceGen.UnitTests.csproj", - "src\\Controls\\tests\\UITests\\Controls.AppiumTests.csproj", + "src\\Controls\\tests\\TestCases.Android.Tests\\Controls.TestCases.Android.Tests.csproj", + "src\\Controls\\tests\\TestCases.iOS.Tests\\Controls.TestCases.iOS.Tests.csproj", + "src\\Controls\\tests\\TestCases.Mac.Tests\\Controls.TestCases.Mac.Tests.csproj", + "src\\Controls\\tests\\TestCases.WinUI.Tests\\Controls.TestCases.WinUI.Tests.csproj", + "src\\Controls\\tests\\TestCases.Shared.Tests\\Controls.TestCases.Shared.Tests.csproj", "src\\Controls\\tests\\Xaml.UnitTests.ExternalAssembly\\Controls.Xaml.UnitTests.ExternalAssembly.csproj", "src\\Controls\\tests\\Xaml.UnitTests.InternalsHiddenAssembly\\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj", "src\\Controls\\tests\\Xaml.UnitTests.InternalsVisibleAssembly\\Controls.Xaml.UnitTests.InternalsVisibleAssembly.csproj", diff --git a/Microsoft.Maui.LegacyControlGallery.slnf b/Microsoft.Maui.LegacyControlGallery.slnf index 9298a4ee57bf..442bbcc735f2 100644 --- a/Microsoft.Maui.LegacyControlGallery.slnf +++ b/Microsoft.Maui.LegacyControlGallery.slnf @@ -17,7 +17,7 @@ "src\\Controls\\Maps\\src\\Controls.Maps.csproj", "src\\Controls\\samples\\Controls.Sample.Profiling\\Maui.Controls.Sample.Profiling.csproj", "src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj", - "src\\Controls\\samples\\Controls.Sample.UITests\\Controls.Sample.UITests.csproj", + "src\\Controls\\tests\\TestCases\\Controls.TestCases.App.csproj", "src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj", "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj", "src\\Controls\\src\\Core.Design\\Controls.Core.Design.csproj", @@ -30,7 +30,11 @@ "src\\Controls\\tests\\Core.UnitTests\\Controls.Core.UnitTests.csproj", "src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj", "src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj", - "src\\Controls\\tests\\UITests\\Controls.AppiumTests.csproj", + "src\\Controls\\tests\\TestCases.Android.Tests\\Controls.TestCases.Android.Tests.csproj", + "src\\Controls\\tests\\TestCases.iOS.Tests\\Controls.TestCases.iOS.Tests.csproj", + "src\\Controls\\tests\\TestCases.Mac.Tests\\Controls.TestCases.Mac.Tests.csproj", + "src\\Controls\\tests\\TestCases.WinUI.Tests\\Controls.TestCases.WinUI.Tests.csproj", + "src\\Controls\\tests\\TestCases.Shared.Tests\\Controls.TestCases.Shared.Tests.csproj", "src\\Controls\\tests\\Xaml.UnitTests.ExternalAssembly\\Controls.Xaml.UnitTests.ExternalAssembly.csproj", "src\\Controls\\tests\\Xaml.UnitTests.InternalsHiddenAssembly\\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj", "src\\Controls\\tests\\Xaml.UnitTests.InternalsVisibleAssembly\\Controls.Xaml.UnitTests.InternalsVisibleAssembly.csproj", diff --git a/Microsoft.Maui.Samples.slnf b/Microsoft.Maui.Samples.slnf index 1b03fe735ac9..242dd66e33e2 100644 --- a/Microsoft.Maui.Samples.slnf +++ b/Microsoft.Maui.Samples.slnf @@ -4,7 +4,7 @@ "projects": [ "src\\BlazorWebView\\samples\\MauiRazorClassLibrarySample\\MauiRazorClassLibrarySample.csproj", "src\\Controls\\samples\\Controls.Sample.Sandbox\\Maui.Controls.Sample.Sandbox.csproj", - "src\\Controls\\samples\\Controls.Sample.UITests\\Controls.Sample.UITests.csproj", + "src\\Controls\\tests\\TestCases\\Controls.TestCases.App.csproj", "src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj" ] } diff --git a/Microsoft.Maui.sln b/Microsoft.Maui.sln index 2a9cc7c37c7a..934382686cc2 100644 --- a/Microsoft.Maui.sln +++ b/Microsoft.Maui.sln @@ -237,8 +237,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.DeviceTests.Shared", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.DeviceTests", "src\Graphics\tests\DeviceTests\Graphics.DeviceTests.csproj", "{34969E49-FA6E-41BB-9813-5689BB14021E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.AppiumTests", "src\Controls\tests\UITests\Controls.AppiumTests.csproj", "{A23B108A-AB56-4692-B9DA-0E23602E3955}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests.ExternalAssembly", "src\Controls\tests\Xaml.UnitTests.ExternalAssembly\Controls.Xaml.UnitTests.ExternalAssembly.csproj", "{F2ADA552-6328-4B2D-8D48-FCDD32C4AF60}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests.InternalsVisibleAssembly", "src\Controls\tests\Xaml.UnitTests.InternalsVisibleAssembly\Controls.Xaml.UnitTests.InternalsVisibleAssembly.csproj", "{B5F38A9E-1949-4779-6666-D682B09E0CB3}" @@ -247,7 +245,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.IntegrationT EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests.InternalsHiddenAssembly", "src\Controls\tests\Xaml.UnitTests.InternalsHiddenAssembly\Controls.Xaml.UnitTests.InternalsHiddenAssembly.csproj", "{FB39FACE-BAF2-4F97-A249-E45BA63D77FE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Sample.UITests", "src\Controls\samples\Controls.Sample.UITests\Controls.Sample.UITests.csproj", "{F39F75DC-671B-4649-8005-1929797B3217}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.App", "src\Controls\tests\TestCases\Controls.TestCases.App.csproj", "{F39F75DC-671B-4649-8005-1929797B3217}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITest.Core", "src\TestUtils\src\UITest.Core\UITest.Core.csproj", "{352C2381-1DEC-4487-819D-340D1EA98FBE}" EndProject @@ -267,6 +265,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.Core.UnitTest EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGen.UnitTests", "src\Controls\tests\SourceGen.UnitTests\SourceGen.UnitTests.csproj", "{199777D4-0EA9-4AAB-82A0-0B53D4BA9E4B}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Shared.Tests", "src\Controls\tests\TestCases.Shared.Tests\Controls.TestCases.Shared.Tests.csproj", "{759A73E9-0F51-4A44-BA03-9B2AE4524423}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Android.Tests", "src\Controls\tests\TestCases.Android.Tests\Controls.TestCases.Android.Tests.csproj", "{6A6AA47E-4913-46B3-84A8-A0C9CF3EB4F7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.iOS.Tests", "src\Controls\tests\TestCases.iOS.Tests\Controls.TestCases.iOS.Tests.csproj", "{29115330-6854-4715-B382-18EA3A8A8731}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.Mac.Tests", "src\Controls\tests\TestCases.Mac.Tests\Controls.TestCases.Mac.Tests.csproj", "{E8CAE2B6-62B3-431C-A76D-1CCD961A1FB4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.TestCases.WinUI.Tests", "src\Controls\tests\TestCases.WinUI.Tests\Controls.TestCases.WinUI.Tests.csproj", "{A1D6B9E5-D8FF-436A-9ACF-703CA5E4BD02}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -619,10 +627,6 @@ Global {34969E49-FA6E-41BB-9813-5689BB14021E}.Release|Any CPU.ActiveCfg = Release|Any CPU {34969E49-FA6E-41BB-9813-5689BB14021E}.Release|Any CPU.Build.0 = Release|Any CPU {34969E49-FA6E-41BB-9813-5689BB14021E}.Release|Any CPU.Deploy.0 = Release|Any CPU - {A23B108A-AB56-4692-B9DA-0E23602E3955}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23B108A-AB56-4692-B9DA-0E23602E3955}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23B108A-AB56-4692-B9DA-0E23602E3955}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23B108A-AB56-4692-B9DA-0E23602E3955}.Release|Any CPU.Build.0 = Release|Any CPU {F2ADA552-6328-4B2D-8D48-FCDD32C4AF60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F2ADA552-6328-4B2D-8D48-FCDD32C4AF60}.Debug|Any CPU.Build.0 = Debug|Any CPU {F2ADA552-6328-4B2D-8D48-FCDD32C4AF60}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -676,6 +680,26 @@ Global {199777D4-0EA9-4AAB-82A0-0B53D4BA9E4B}.Debug|Any CPU.Build.0 = Debug|Any CPU {199777D4-0EA9-4AAB-82A0-0B53D4BA9E4B}.Release|Any CPU.ActiveCfg = Release|Any CPU {199777D4-0EA9-4AAB-82A0-0B53D4BA9E4B}.Release|Any CPU.Build.0 = Release|Any CPU + {759A73E9-0F51-4A44-BA03-9B2AE4524423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {759A73E9-0F51-4A44-BA03-9B2AE4524423}.Debug|Any CPU.Build.0 = Debug|Any CPU + {759A73E9-0F51-4A44-BA03-9B2AE4524423}.Release|Any CPU.ActiveCfg = Release|Any CPU + {759A73E9-0F51-4A44-BA03-9B2AE4524423}.Release|Any CPU.Build.0 = Release|Any CPU + {6A6AA47E-4913-46B3-84A8-A0C9CF3EB4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A6AA47E-4913-46B3-84A8-A0C9CF3EB4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A6AA47E-4913-46B3-84A8-A0C9CF3EB4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A6AA47E-4913-46B3-84A8-A0C9CF3EB4F7}.Release|Any CPU.Build.0 = Release|Any CPU + {29115330-6854-4715-B382-18EA3A8A8731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29115330-6854-4715-B382-18EA3A8A8731}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29115330-6854-4715-B382-18EA3A8A8731}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29115330-6854-4715-B382-18EA3A8A8731}.Release|Any CPU.Build.0 = Release|Any CPU + {E8CAE2B6-62B3-431C-A76D-1CCD961A1FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8CAE2B6-62B3-431C-A76D-1CCD961A1FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8CAE2B6-62B3-431C-A76D-1CCD961A1FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8CAE2B6-62B3-431C-A76D-1CCD961A1FB4}.Release|Any CPU.Build.0 = Release|Any CPU + {A1D6B9E5-D8FF-436A-9ACF-703CA5E4BD02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A1D6B9E5-D8FF-436A-9ACF-703CA5E4BD02}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A1D6B9E5-D8FF-436A-9ACF-703CA5E4BD02}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A1D6B9E5-D8FF-436A-9ACF-703CA5E4BD02}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -785,12 +809,11 @@ Global {4A6930AE-B67C-4D29-B1A8-ED9EB7F923A7} = {50C758FE-4E10-409A-94F5-A75480960864} {66CC98E3-6A1A-4C44-A23C-B575E82106EC} = {C564DDD6-DE79-45CD-88EA-3F690481572A} {34969E49-FA6E-41BB-9813-5689BB14021E} = {936C47A9-A7EA-4FBD-8733-CED1D4100E69} - {A23B108A-AB56-4692-B9DA-0E23602E3955} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {F2ADA552-6328-4B2D-8D48-FCDD32C4AF60} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {B5F38A9E-1949-4779-6666-D682B09E0CB3} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {1C899C94-8744-4E2A-8E23-1660393236FD} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {FB39FACE-BAF2-4F97-A249-E45BA63D77FE} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} - {F39F75DC-671B-4649-8005-1929797B3217} = {E1082E26-D700-4127-9329-66D673FD2D55} + {F39F75DC-671B-4649-8005-1929797B3217} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} {352C2381-1DEC-4487-819D-340D1EA98FBE} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {8C8CD467-11F9-4A14-8AF3-047B2CFD19A7} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} {8050448A-E08F-4972-9B47-16042A5DFE82} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C} @@ -800,6 +823,11 @@ Global {6730CE13-8567-4DC8-B2AF-B12C39818825} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2} {9F3DD0E7-8A71-4BA8-A3E6-690DC5A9F3D7} = {6730CE13-8567-4DC8-B2AF-B12C39818825} {199777D4-0EA9-4AAB-82A0-0B53D4BA9E4B} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {759A73E9-0F51-4A44-BA03-9B2AE4524423} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {6A6AA47E-4913-46B3-84A8-A0C9CF3EB4F7} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {29115330-6854-4715-B382-18EA3A8A8731} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {E8CAE2B6-62B3-431C-A76D-1CCD961A1FB4} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} + {A1D6B9E5-D8FF-436A-9ACF-703CA5E4BD02} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50} diff --git a/docs/design/UITesting.md b/docs/design/UITesting.md index 523c6934fa71..363f5c6148bd 100644 --- a/docs/design/UITesting.md +++ b/docs/design/UITesting.md @@ -14,7 +14,7 @@ Appium relies on different implementations called `drivers` for each platform th ### The sample project -The project that is used for UI Tests is located here: `src\Controls\samples\Controls.Sample.UITests\Controls.Sample.UITests.csproj` +The project that is used for UI Tests is located here: `src\Controls\tests\TestCases\Controls.TestCases.App.csproj` There are two types of tests you can add, Issue and Gallery. @@ -26,21 +26,21 @@ You will need to create some kind of UI to test against, which will go in the Co Then in the Controls.AppiumTests project add a new class that derives from `_IssuesUITest` and add your test. -You can use the example for the sample project [here](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs) and the example for the corresponding test [here](https://github.com/dotnet/maui/tree/main/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs). +You can use the example for the sample project [here](https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases/Issues/RefreshViewPage.cs) and the example for the corresponding test [here](https://github.com/dotnet/maui/tree/main/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/RefreshViewTests.cs). ### Adding a GalleryPage Gallery tests are to make it easier to run the same set of tests on controls, if you are creating a new control you would want to add a new gallery page. -We have some base classes you can derive from to make setting this up easier: [CoreGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreGalleryPage.cs) and [ContentViewGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/samples/Controls.Sample.UITests/Elements/ContentViewGalleryPage.cs) +We have some base classes you can derive from to make setting this up easier: [CoreGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases/CoreViews/CoreGalleryPage.cs) and [ContentViewGalleryPage](https://github.com/dotnet/maui/blob/main/src/Controls/tests/TestCases/Elements/ContentViewGalleryPage.cs) All controls you intend to interact with need to set the 'AutomationId' property as this will be what you use to query for the element. -Once you have created your GalleryPage, add it to [CorePageView](https://github.com/dotnet/maui/blob/5419846b1f20bdab1b5ce1dff40287edc5c38f12/src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs#L45C41-L45C41) so that it will show up on the main page at launch. +Once you have created your GalleryPage, add it to [CorePageView](https://github.com/dotnet/maui/blob/5419846b1f20bdab1b5ce1dff40287edc5c38f12/src/Controls/tests/TestCases/CoreViews/CorePageView.cs#L45C41-L45C41) so that it will show up on the main page at launch. ### Adding the test -The project that hosts the tests is located here: `src\Controls\tests\UITests\Controls.AppiumTests.csproj` +The project that hosts the tests is located here: `src\Controls\tests\TestCases.Shared.Tests\Controls.TestCases.Shared.Tests.csproj` This project is using [NUnit](https://nunit.org/) diff --git a/eng/devices/android.cake b/eng/devices/android.cake index b00725344ad0..d91c5ff6198c 100644 --- a/eng/devices/android.cake +++ b/eng/devices/android.cake @@ -6,7 +6,8 @@ const int DefaultApiLevel = 30; -var projectPath = Argument("project", EnvironmentVariable("ANDROID_TEST_PROJECT") ?? DEFAULT_PROJECT); +string DEFAULT_ANDROID_PROJECT = "../../src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj"; +var projectPath = Argument("project", EnvironmentVariable("ANDROID_TEST_PROJECT") ?? DEFAULT_ANDROID_PROJECT); var testDevice = Argument("device", EnvironmentVariable("ANDROID_TEST_DEVICE") ?? $"android-emulator-64_{DefaultApiLevel}"); var targetFramework = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? $"{DotnetVersion}-android"); var binlogArg = Argument("binlog", EnvironmentVariable("ANDROID_TEST_BINLOG") ?? ""); diff --git a/eng/devices/catalyst.cake b/eng/devices/catalyst.cake index 62e11322b05a..6b5edb096671 100644 --- a/eng/devices/catalyst.cake +++ b/eng/devices/catalyst.cake @@ -3,7 +3,8 @@ #load "./devices-shared.cake" // Argument handling -var projectPath = Argument("project", EnvironmentVariable("MAC_TEST_PROJECT") ?? DEFAULT_PROJECT); +string DEFAULT_MAC_PROJECT = "../../src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj"; +var projectPath = Argument("project", EnvironmentVariable("MAC_TEST_PROJECT") ?? DEFAULT_MAC_PROJECT); var testDevice = Argument("device", EnvironmentVariable("MAC_TEST_DEVICE") ?? "maccatalyst"); var dotnetRoot = Argument("dotnet-root", EnvironmentVariable("DOTNET_ROOT")); var targetFramework = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? $"{DotnetVersion}-maccatalyst"); diff --git a/eng/devices/devices-shared.cake b/eng/devices/devices-shared.cake index 05030f4c3c72..cc782af1ebe0 100644 --- a/eng/devices/devices-shared.cake +++ b/eng/devices/devices-shared.cake @@ -11,7 +11,7 @@ var projectMappings = new Dictionary ["Graphics.DeviceTests"] = "Graphics.DeviceTests", ["MauiBlazorWebView.DeviceTests"] = "MauiBlazorWebView.DeviceTests", ["Essentials.DeviceTests"] = "Essentials.DeviceTests", - ["Controls.Sample.UITests"] = "Controls.Sample.UITests", + ["Controls.TestCases.App"] = "Controls.TestCases.App", ["Compatibility.ControlGallery.iOS"] = "Compatibility.ControlGallery.iOS", ["Compatibility.ControlGallery.Android"] = "Compatibility.ControlGallery.Android", }; @@ -23,14 +23,14 @@ string DEFAULT_APP_PROJECT = ""; if (string.Equals(TARGET, "uitest", StringComparison.OrdinalIgnoreCase)) { - DEFAULT_PROJECT = "../../src/Controls/tests/UITests/Controls.AppiumTests.csproj"; - DEFAULT_APP_PROJECT = "../../src/Controls/samples/Controls.Sample.UITests/Controls.Sample.UITests.csproj"; + DEFAULT_PROJECT = "../../src/Controls/tests/TestCases.Shared.Tests/Controls.TestCases.Shared.Tests.csproj"; + DEFAULT_APP_PROJECT = "../../src/Controls/tests/TestCases/Controls.TestCases.App.csproj"; } if (string.Equals(TARGET, "uitest-build", StringComparison.OrdinalIgnoreCase)) { - DEFAULT_PROJECT = "../../src/Controls/tests/UITests/Controls.AppiumTests.csproj"; - DEFAULT_APP_PROJECT = "../../src/Controls/samples/Controls.Sample.UITests/Controls.Sample.UITests.csproj"; + DEFAULT_PROJECT = "../../src/Controls/tests/TestCases.Shared.Tests/Controls.TestCases.Shared.Tests.csproj"; + DEFAULT_APP_PROJECT = "../../src/Controls/tests/TestCases/Controls.TestCases.App.csproj"; } if (string.Equals(TARGET, "cg-uitest", StringComparison.OrdinalIgnoreCase)) diff --git a/eng/devices/ios.cake b/eng/devices/ios.cake index a3feba27a7e1..2d83da80853d 100644 --- a/eng/devices/ios.cake +++ b/eng/devices/ios.cake @@ -6,7 +6,8 @@ const string DefaultVersion = "17.2"; // Required arguments -var projectPath = Argument("project", EnvironmentVariable("IOS_TEST_PROJECT") ?? DEFAULT_PROJECT); +string DEFAULT_IOS_PROJECT = "../../src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj"; +var projectPath = Argument("project", EnvironmentVariable("IOS_TEST_PROJECT") ?? DEFAULT_IOS_PROJECT); var testDevice = Argument("device", EnvironmentVariable("IOS_TEST_DEVICE") ?? $"ios-simulator-64_{DefaultVersion}"); var targetFramework = Argument("tfm", EnvironmentVariable("TARGET_FRAMEWORK") ?? $"{DotnetVersion}-ios"); var binlogArg = Argument("binlog", EnvironmentVariable("IOS_TEST_BINLOG") ?? ""); diff --git a/eng/devices/windows.cake b/eng/devices/windows.cake index 9ab447801371..b142aa3768fe 100644 --- a/eng/devices/windows.cake +++ b/eng/devices/windows.cake @@ -9,7 +9,8 @@ const string defaultVersion = "10.0.19041.0"; const string dotnetVersion = "net8.0"; // required -FilePath PROJECT = Argument("project", EnvironmentVariable("WINDOWS_TEST_PROJECT") ?? DEFAULT_PROJECT); +string DEFAULT_WINDOWS_PROJECT = "../../src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj"; +FilePath PROJECT = Argument("project", EnvironmentVariable("WINDOWS_TEST_PROJECT") ?? DEFAULT_WINDOWS_PROJECT); // Used for Windows to differentiate between packaged and unpackaged string TEST_DEVICE = Argument("device", EnvironmentVariable("WINDOWS_TEST_DEVICE") ?? $""); // Package ID of the WinUI Application @@ -437,9 +438,9 @@ Task("SetupTestPaths") if (apps.Count() == 0) { var arcadeBin = new DirectoryPath("../../artifacts/bin/"); - if(TEST_APP_PROJECT.FullPath.Contains("Controls.Sample.UITests")) + if(TEST_APP_PROJECT.FullPath.Contains("Controls.TestCases.App")) { - binDir = MakeAbsolute(new DirectoryPath(arcadeBin + "/Controls.Sample.UITests/" + CONFIGURATION + "/" + winVersion).Combine(DOTNET_PLATFORM)); + binDir = MakeAbsolute(new DirectoryPath(arcadeBin + "/Controls.TestCases.App/" + CONFIGURATION + "/" + winVersion).Combine(DOTNET_PLATFORM)); } if(PROJECT.FullPath.Contains("Controls.DeviceTests")) diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml index 46d4de15c7de..020077868f92 100644 --- a/eng/pipelines/ui-tests.yml +++ b/eng/pipelines/ui-tests.yml @@ -162,12 +162,12 @@ stages: - name: controls desc: Controls androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable - android: $(System.DefaultWorkingDirectory)/src/Controls/tests/UITests/Controls.AppiumTests.csproj - app: $(System.DefaultWorkingDirectory)/src/Controls/samples/Controls.Sample.UITests/Controls.Sample.UITests.csproj + android: $(System.DefaultWorkingDirectory)/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj + app: $(System.DefaultWorkingDirectory)/src/Controls/tests/TestCases/Controls.TestCases.App.csproj iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI - ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/UITests/Controls.AppiumTests.csproj - winui: $(System.DefaultWorkingDirectory)/src/Controls/tests/UITests/Controls.AppiumTests.csproj - mac: $(System.DefaultWorkingDirectory)/src/Controls/tests/UITests/Controls.AppiumTests.csproj + ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj + winui: $(System.DefaultWorkingDirectory)/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj + mac: $(System.DefaultWorkingDirectory)/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj compatibilityAndroidApp: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj compatibilityAndroidTestProject: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj compatibilityiOSApp: $(System.DefaultWorkingDirectory)/src/Compatibility/ControlGallery/src/iOS/Compatibility.ControlGallery.iOS.csproj diff --git a/src/Compatibility/ControlGallery/src/Core/TestCases.cs b/src/Compatibility/ControlGallery/src/Core/TestCases.cs index 680e8655484a..92bcef269e9f 100644 --- a/src/Compatibility/ControlGallery/src/Core/TestCases.cs +++ b/src/Compatibility/ControlGallery/src/Core/TestCases.cs @@ -107,7 +107,7 @@ Page ActivatePage(Type type) class IssueModel { public IssueTracker IssueTracker { get; set; } - public int IssueNumber { get; set; } + public string IssueNumber { get; set; } public int IssueTestNumber { get; set; } public string Name { get; set; } public string Description { get; set; } diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs index 025b1bbf1a51..3ff78c33f8fa 100644 --- a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs +++ b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs @@ -204,8 +204,8 @@ public static void NavigateToIssue(Type type, IApp app) string cellName = ""; if (typeIssueAttribute.IssueTracker.ToString() != "None" && - typeIssueAttribute.IssueNumber != 1461 && - typeIssueAttribute.IssueNumber != 342) + typeIssueAttribute.IssueNumber != "1461" && + typeIssueAttribute.IssueNumber != "342") { cellName = typeIssueAttribute.DisplayName; } diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/ControlGallery.Shared.Appium.UITests.csproj b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/ControlGallery.Shared.Appium.UITests.csproj index 5c5de9da4a79..4515e8ece37e 100644 --- a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/ControlGallery.Shared.Appium.UITests.csproj +++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/ControlGallery.Shared.Appium.UITests.csproj @@ -1,4 +1,4 @@ - + $(_MauiDotNetTfm) diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/UITest.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/UITest.cs index f129ab406969..000c987a0acb 100644 --- a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/UITest.cs +++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/UITest.cs @@ -30,7 +30,7 @@ protected UITest(TestDevice testDevice) : base(testDevice) { string? ciArtifactsDirectory = Environment.GetEnvironmentVariable("BUILD_ARTIFACTSTAGINGDIRECTORY"); if (ciArtifactsDirectory != null) - ciArtifactsDirectory = Path.Combine(ciArtifactsDirectory, "Controls.AppiumTests"); + ciArtifactsDirectory = Path.Combine(ciArtifactsDirectory, "Controls.TestCases.Shared.Tests"); string assemblyDirectory = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory)!; string projectRootDirectory = Path.GetFullPath(Path.Combine(assemblyDirectory, "..", "..", "..")); diff --git a/src/Controls/samples/Controls.Sample.UITests/IssueAttribute.cs b/src/Controls/samples/Controls.Sample.UITests/IssueAttribute.cs deleted file mode 100644 index 3c4a48935b87..000000000000 --- a/src/Controls/samples/Controls.Sample.UITests/IssueAttribute.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; - -namespace Maui.Controls.Sample -{ - [AttributeUsage( - AttributeTargets.Class | - AttributeTargets.Method, - AllowMultiple = true)] - public class IssueAttribute : Attribute - { - public IssueAttribute(IssueTracker issueTracker, int issueNumber, string description, - NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0) - { - IssueTracker = issueTracker; - IssueNumber = issueNumber.ToString(); - Description = description; - PlatformsAffected = PlatformAffected.Default; - NavigationBehavior = navigationBehavior; - IssueTestNumber = issueTestNumber; - } - - public IssueAttribute(IssueTracker issueTracker, string issueNumber, string description, - NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0) - { - IssueTracker = issueTracker; - IssueNumber = issueNumber; - Description = description; - PlatformsAffected = PlatformAffected.Default; - NavigationBehavior = navigationBehavior; - IssueTestNumber = issueTestNumber; - } - - public IssueAttribute(IssueTracker issueTracker, int issueNumber, string description, - PlatformAffected platformsAffected, NavigationBehavior navigationBehavior = NavigationBehavior.Default, - int issueTestNumber = 0) - { - IssueTracker = issueTracker; - IssueNumber = issueNumber.ToString(); - Description = description; - PlatformsAffected = platformsAffected; - NavigationBehavior = navigationBehavior; - IssueTestNumber = issueTestNumber; - } - - public IssueAttribute(IssueTracker issueTracker, string issueNumber, string description, - PlatformAffected platformsAffected, NavigationBehavior navigationBehavior = NavigationBehavior.Default, - int issueTestNumber = 0) - { - IssueTracker = issueTracker; - IssueNumber = issueNumber; - Description = description; - PlatformsAffected = platformsAffected; - NavigationBehavior = navigationBehavior; - IssueTestNumber = issueTestNumber; - } - - public IssueTracker IssueTracker { get; } - - public string IssueNumber { get; } - - public int IssueTestNumber { get; } - - public string Description { get; } - - public PlatformAffected PlatformsAffected { get; } - - public NavigationBehavior NavigationBehavior { get; } - - public string DisplayName => IssueTestNumber == 0 - ? $"{IssueTracker.ToString().Substring(0, 1)}{IssueNumber}" - : $"{IssueTracker.ToString().Substring(0, 1)}{IssueNumber} ({IssueTestNumber})"; - } -} \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample.UITests/IssueTracker.cs b/src/Controls/samples/Controls.Sample.UITests/IssueTracker.cs deleted file mode 100644 index f204519fb48f..000000000000 --- a/src/Controls/samples/Controls.Sample.UITests/IssueTracker.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Maui.Controls.Sample -{ - public enum IssueTracker - { - Github, - Bugzilla, - ManualTest, - None - } -} \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample.UITests/NavigationBehavior.cs b/src/Controls/samples/Controls.Sample.UITests/NavigationBehavior.cs deleted file mode 100644 index 6a5497d8f263..000000000000 --- a/src/Controls/samples/Controls.Sample.UITests/NavigationBehavior.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Maui.Controls.Sample -{ - public enum NavigationBehavior - { - PushAsync, - PushModalAsync, - SetApplicationRoot, - Default - } -} \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample.UITests/PlatformAffected.cs b/src/Controls/samples/Controls.Sample.UITests/PlatformAffected.cs deleted file mode 100644 index 00404b4392b9..000000000000 --- a/src/Controls/samples/Controls.Sample.UITests/PlatformAffected.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; - -namespace Maui.Controls.Sample -{ - [Flags] - public enum PlatformAffected - { - iOS = 1 << 0, - Android = 1 << 1, - WinPhone = 1 << 2, - WinRT = 1 << 3, - UWP = 1 << 4, - WPF = 1 << 5, - macOS = 1 << 6, - Gtk = 1 << 7, - All = ~0, - Default = 0 - } -} \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index 80a8fdcad902..ebf4fca2e869 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -51,13 +51,6 @@ - - - - diff --git a/src/Controls/tests/CustomAttributes/TestAttributes.cs b/src/Controls/tests/CustomAttributes/TestAttributes.cs index 867fd871ee05..b5a2abde7b7c 100644 --- a/src/Controls/tests/CustomAttributes/TestAttributes.cs +++ b/src/Controls/tests/CustomAttributes/TestAttributes.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using System.Collections.Generic; namespace Microsoft.Maui.Controls.CustomAttributes { @@ -27,6 +28,7 @@ public enum IssueTracker { Github, Bugzilla, + ManualTest, None } @@ -46,10 +48,20 @@ public enum NavigationBehavior )] public class IssueAttribute : Attribute { - bool _modal; public IssueAttribute(IssueTracker issueTracker, int issueNumber, string description, NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0) + { + IssueTracker = issueTracker; + IssueNumber = issueNumber.ToString(); + Description = description; + PlatformsAffected = PlatformAffected.Default; + NavigationBehavior = navigationBehavior; + IssueTestNumber = issueTestNumber; + } + + public IssueAttribute(IssueTracker issueTracker, string issueNumber, string description, + NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0) { IssueTracker = issueTracker; IssueNumber = issueNumber; @@ -62,6 +74,18 @@ public IssueAttribute(IssueTracker issueTracker, int issueNumber, string descrip public IssueAttribute(IssueTracker issueTracker, int issueNumber, string description, PlatformAffected platformsAffected, NavigationBehavior navigationBehavior = NavigationBehavior.Default, int issueTestNumber = 0) + { + IssueTracker = issueTracker; + IssueNumber = issueNumber.ToString(); + Description = description; + PlatformsAffected = platformsAffected; + NavigationBehavior = navigationBehavior; + IssueTestNumber = issueTestNumber; + } + + public IssueAttribute(IssueTracker issueTracker, string issueNumber, string description, + PlatformAffected platformsAffected, NavigationBehavior navigationBehavior = NavigationBehavior.Default, + int issueTestNumber = 0) { IssueTracker = issueTracker; IssueNumber = issueNumber; @@ -73,7 +97,7 @@ public IssueAttribute(IssueTracker issueTracker, int issueNumber, string descrip public IssueTracker IssueTracker { get; } - public int IssueNumber { get; } + public string IssueNumber { get; } public int IssueTestNumber { get; } @@ -242,6 +266,7 @@ public enum VisualElement IsEnabled, Navigation, InputTransparent, + NotInputTransparent, Layout, X, Y, @@ -646,6 +671,7 @@ public enum Label VerticalTextAlignmentEnd, MaxLines, HtmlTextType, + BrokenHtmlTextType, HtmlTextTypeMultipleLines, HtmlTextLabelProperties, TextTypeToggle, @@ -861,6 +887,7 @@ public enum FormattedString { ToStringOverride, Spans, + SpanTapped, PropertyChanged } @@ -880,5 +907,70 @@ public enum CarouselView Position, IsBounceEnabled } + + public enum ImageLoading + { + FromBundleSvg, + FromBundlePng, + FromBundleJpg, + FromBundleGif, + } + + public enum InputTransparency + { + Default, + IsFalse, + IsTrue, + TransLayoutOverlay, + TransLayoutOverlayWithButton, + CascadeTransLayoutOverlay, + CascadeTransLayoutOverlayWithButton, + } + + public static class InputTransparencyMatrix + { + // this is both for color diff and cols + const bool truee = true; + + public static readonly IReadOnlyDictionary<(bool RT, bool RC, bool NT, bool NC, bool T), (bool Clickable, bool PassThru)> States = + new Dictionary<(bool, bool, bool, bool, bool), (bool, bool)> + { + [(truee, truee, truee, truee, truee)] = (false, truee), + [(truee, truee, truee, truee, false)] = (false, truee), + [(truee, truee, truee, false, truee)] = (false, truee), + [(truee, truee, truee, false, false)] = (false, truee), + [(truee, truee, false, truee, truee)] = (false, truee), + [(truee, truee, false, truee, false)] = (false, truee), + [(truee, truee, false, false, truee)] = (false, truee), + [(truee, truee, false, false, false)] = (false, truee), + [(truee, false, truee, truee, truee)] = (false, truee), + [(truee, false, truee, truee, false)] = (false, truee), + [(truee, false, truee, false, truee)] = (false, truee), + [(truee, false, truee, false, false)] = (truee, false), + [(truee, false, false, truee, truee)] = (false, false), + [(truee, false, false, truee, false)] = (truee, false), + [(truee, false, false, false, truee)] = (false, false), + [(truee, false, false, false, false)] = (truee, false), + [(false, truee, truee, truee, truee)] = (false, false), + [(false, truee, truee, truee, false)] = (false, false), + [(false, truee, truee, false, truee)] = (false, false), + [(false, truee, truee, false, false)] = (truee, false), + [(false, truee, false, truee, truee)] = (false, false), + [(false, truee, false, truee, false)] = (truee, false), + [(false, truee, false, false, truee)] = (false, false), + [(false, truee, false, false, false)] = (truee, false), + [(false, false, truee, truee, truee)] = (false, false), + [(false, false, truee, truee, false)] = (false, false), + [(false, false, truee, false, truee)] = (false, false), + [(false, false, truee, false, false)] = (truee, false), + [(false, false, false, truee, truee)] = (false, false), + [(false, false, false, truee, false)] = (truee, false), + [(false, false, false, false, truee)] = (false, false), + [(false, false, false, false, false)] = (truee, false), + }; + + public static string GetKey(bool rootTrans, bool rootCascade, bool nestedTrans, bool nestedCascade, bool trans, bool isClickable, bool isPassThru) => + $"Root{(rootTrans ? "Trans" : "")}{(rootCascade ? "Cascade" : "")}Nested{(nestedTrans ? "Trans" : "")}{(nestedCascade ? "Cascade" : "")}Control{(trans ? "Trans" : "")}Is{(isClickable ? "" : "Not")}ClickableIs{(isPassThru ? "" : "Not")}PassThru"; + } } } \ No newline at end of file diff --git a/src/Controls/tests/UITests/Controls.AppiumTests.csproj b/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj similarity index 50% rename from src/Controls/tests/UITests/Controls.AppiumTests.csproj rename to src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj index c64369fb24dd..de42bd99403f 100644 --- a/src/Controls/tests/UITests/Controls.AppiumTests.csproj +++ b/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj @@ -1,57 +1,55 @@  - $(_MauiDotNetTfm) - false + $(_MauiDotNetTfm) enable enable - true true - - - - Controls Appium Tests - com.microsoft.maui.controls.appiumtests - 1 - - - - - - - $(DefineConstants);$(ExtraDefineConstants) + Microsoft.Maui.TestCases.Tests + $(DefineConstants);ANDROID - + + + + - - - - - - - + - - - - + + + + + + + + Always + + + + + + + + + + - + \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Android.Tests/PlatformSpecificSampleTest.cs b/src/Controls/tests/TestCases.Android.Tests/PlatformSpecificSampleTest.cs new file mode 100644 index 000000000000..fe85d182b0ac --- /dev/null +++ b/src/Controls/tests/TestCases.Android.Tests/PlatformSpecificSampleTest.cs @@ -0,0 +1,21 @@ +using NUnit.Framework; +using OpenQA.Selenium.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests; + +public class PlatformSpecificSampleTest : UITest +{ + public PlatformSpecificSampleTest(TestDevice testDevice) : base(testDevice) + { + } + + [Test] + public void SampleTest() + { + if (App is AppiumDriver driver) + { + driver?.GetScreenshot().SaveAsFile($"{nameof(SampleTest)}.png"); + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/UITests/snapshots/android/BorderShouldHaveNoThickness.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderShouldHaveNoThickness.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/BorderShouldHaveNoThickness.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/BorderShouldHaveNoThickness.png diff --git a/src/Controls/tests/UITests/snapshots/android/ContentPageBackgroundImageSourceWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentPageBackgroundImageSourceWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/ContentPageBackgroundImageSourceWorks.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/ContentPageBackgroundImageSourceWorks.png diff --git a/src/Controls/tests/UITests/snapshots/android/EditorBackgroundWorks.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/EditorBackgroundWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/EditorBackgroundWorks.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/EditorBackgroundWorks.png diff --git a/src/Controls/tests/UITests/snapshots/android/EditorIsReadOnlyPreventModify.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/EditorIsReadOnlyPreventModify.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/EditorIsReadOnlyPreventModify.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/EditorIsReadOnlyPreventModify.png diff --git a/src/Controls/tests/UITests/snapshots/android/EntryIsPasswordObscureText.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/EntryIsPasswordObscureText.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/EntryIsPasswordObscureText.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/EntryIsPasswordObscureText.png diff --git a/src/Controls/tests/UITests/snapshots/android/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png diff --git a/src/Controls/tests/UITests/snapshots/android/Issue15330Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue15330Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/Issue15330Test.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue15330Test.png diff --git a/src/Controls/tests/UITests/snapshots/android/Issue18242Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue18242Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/Issue18242Test.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue18242Test.png diff --git a/src/Controls/tests/UITests/snapshots/android/Issue18751Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue18751Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/Issue18751Test.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue18751Test.png diff --git a/src/Controls/tests/UITests/snapshots/android/Issue18896Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue18896Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/Issue18896Test.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue18896Test.png diff --git a/src/Controls/tests/UITests/snapshots/android/Issue21513Test.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue21513Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/Issue21513Test.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue21513Test.png diff --git a/src/Controls/tests/UITests/snapshots/android/LoadAndVerifyGif.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LoadAndVerifyGif.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/LoadAndVerifyGif.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/LoadAndVerifyGif.png diff --git a/src/Controls/tests/UITests/snapshots/android/LoadAndVerifyJpg.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LoadAndVerifyJpg.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/LoadAndVerifyJpg.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/LoadAndVerifyJpg.png diff --git a/src/Controls/tests/UITests/snapshots/android/LoadAndVerifyPng.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LoadAndVerifyPng.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/LoadAndVerifyPng.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/LoadAndVerifyPng.png diff --git a/src/Controls/tests/UITests/snapshots/android/LoadAndVerifySvg.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/LoadAndVerifySvg.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/LoadAndVerifySvg.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/LoadAndVerifySvg.png diff --git a/src/Controls/tests/UITests/snapshots/android/PropertiesShouldBeCorrectlyApplied.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/PropertiesShouldBeCorrectlyApplied.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/PropertiesShouldBeCorrectlyApplied.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/PropertiesShouldBeCorrectlyApplied.png diff --git a/src/Controls/tests/UITests/snapshots/android/RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp.png diff --git a/src/Controls/tests/UITests/snapshots/android/ResizeCarouselViewKeepsIndex.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ResizeCarouselViewKeepsIndex.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/ResizeCarouselViewKeepsIndex.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/ResizeCarouselViewKeepsIndex.png diff --git a/src/Controls/tests/UITests/snapshots/android/ShadowsDontRespectControlShape.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowsDontRespectControlShape.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/ShadowsDontRespectControlShape.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShadowsDontRespectControlShape.png diff --git a/src/Controls/tests/UITests/snapshots/android/SpanLineHeightShouldNotGrowProgressively.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SpanLineHeightShouldNotGrowProgressively.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/SpanLineHeightShouldNotGrowProgressively.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/SpanLineHeightShouldNotGrowProgressively.png diff --git a/src/Controls/tests/UITests/snapshots/android/SystemFontsShouldRenderCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SystemFontsShouldRenderCorrectly.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/SystemFontsShouldRenderCorrectly.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/SystemFontsShouldRenderCorrectly.png diff --git a/src/Controls/tests/UITests/snapshots/android/UpdateToolbarItemAfterNavigate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/UpdateToolbarItemAfterNavigate.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/android/UpdateToolbarItemAfterNavigate.png rename to src/Controls/tests/TestCases.Android.Tests/snapshots/android/UpdateToolbarItemAfterNavigate.png diff --git a/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj b/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj new file mode 100644 index 000000000000..b8a5bcd4d817 --- /dev/null +++ b/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj @@ -0,0 +1,49 @@ + + + + $(_MauiDotNetTfm) + enable + enable + true + Microsoft.Maui.TestCases.Tests + $(DefineConstants);MACCATALYST;MACUITEST + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Mac.Tests/PlatformSpecificSampleTest.cs b/src/Controls/tests/TestCases.Mac.Tests/PlatformSpecificSampleTest.cs new file mode 100644 index 000000000000..fe85d182b0ac --- /dev/null +++ b/src/Controls/tests/TestCases.Mac.Tests/PlatformSpecificSampleTest.cs @@ -0,0 +1,21 @@ +using NUnit.Framework; +using OpenQA.Selenium.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests; + +public class PlatformSpecificSampleTest : UITest +{ + public PlatformSpecificSampleTest(TestDevice testDevice) : base(testDevice) + { + } + + [Test] + public void SampleTest() + { + if (App is AppiumDriver driver) + { + driver?.GetScreenshot().SaveAsFile($"{nameof(SampleTest)}.png"); + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Axis.cs b/src/Controls/tests/TestCases.Shared.Tests/Axis.cs new file mode 100644 index 000000000000..b66a39651b39 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Axis.cs @@ -0,0 +1,9 @@ +namespace Microsoft.Maui.TestCases.Tests +{ + internal enum Axis + { + X, + Y, + Z + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Controls - Backup.TestCases.Shared.Tests.csproj b/src/Controls/tests/TestCases.Shared.Tests/Controls - Backup.TestCases.Shared.Tests.csproj new file mode 100644 index 000000000000..a172639265c7 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Controls - Backup.TestCases.Shared.Tests.csproj @@ -0,0 +1,42 @@ + + + + $(_MauiDotNetTfm) + False + False + Microsoft.Maui.TestCases.Tests + + + + $(DefineConstants);$(ExtraDefineConstants) + + + + + + + + + + + + $(DefineConstants);ANDROID + + + + $(DefineConstants);IOS + + + + $(DefineConstants);MACCATALYST + + + + $(DefineConstants);TIZEN + + + + $(DefineConstants); WINDOWS + + + \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Controls.TestCases.Shared.Tests.csproj b/src/Controls/tests/TestCases.Shared.Tests/Controls.TestCases.Shared.Tests.csproj new file mode 100644 index 000000000000..a172639265c7 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Controls.TestCases.Shared.Tests.csproj @@ -0,0 +1,42 @@ + + + + $(_MauiDotNetTfm) + False + False + Microsoft.Maui.TestCases.Tests + + + + $(DefineConstants);$(ExtraDefineConstants) + + + + + + + + + + + + $(DefineConstants);ANDROID + + + + $(DefineConstants);IOS + + + + $(DefineConstants);MACCATALYST + + + + $(DefineConstants);TIZEN + + + + $(DefineConstants); WINDOWS + + + \ No newline at end of file diff --git a/src/Controls/tests/UITests/FloatToBoolConverter.cs b/src/Controls/tests/TestCases.Shared.Tests/FloatToBoolConverter.cs similarity index 93% rename from src/Controls/tests/UITests/FloatToBoolConverter.cs rename to src/Controls/tests/TestCases.Shared.Tests/FloatToBoolConverter.cs index e0960054f67a..fb4384e44d6a 100644 --- a/src/Controls/tests/UITests/FloatToBoolConverter.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/FloatToBoolConverter.cs @@ -1,4 +1,4 @@ -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal class FloatToBoolConverter : TypeConverter { diff --git a/src/Controls/tests/UITests/IUITestContextExtensions.cs b/src/Controls/tests/TestCases.Shared.Tests/IUITestContextExtensions.cs similarity index 93% rename from src/Controls/tests/UITests/IUITestContextExtensions.cs rename to src/Controls/tests/TestCases.Shared.Tests/IUITestContextExtensions.cs index b78051893873..971b14d1bcfe 100644 --- a/src/Controls/tests/UITests/IUITestContextExtensions.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/IUITestContextExtensions.cs @@ -2,7 +2,7 @@ using UITest.Appium.NUnit; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public static class IUITestContextExtensions { diff --git a/src/Controls/tests/UITests/Matrix.cs b/src/Controls/tests/TestCases.Shared.Tests/Matrix.cs similarity index 96% rename from src/Controls/tests/UITests/Matrix.cs rename to src/Controls/tests/TestCases.Shared.Tests/Matrix.cs index ec01d2b550be..728218a63147 100644 --- a/src/Controls/tests/UITests/Matrix.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Matrix.cs @@ -1,4 +1,4 @@ -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal class Matrix : object { diff --git a/src/Controls/tests/UITests/ParsingUtils.cs b/src/Controls/tests/TestCases.Shared.Tests/ParsingUtils.cs similarity index 98% rename from src/Controls/tests/UITests/ParsingUtils.cs rename to src/Controls/tests/TestCases.Shared.Tests/ParsingUtils.cs index 23f5532b359b..a0188b999fb9 100644 --- a/src/Controls/tests/UITests/ParsingUtils.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/ParsingUtils.cs @@ -1,7 +1,7 @@ using Microsoft.Maui.Controls; using Microsoft.Maui.Graphics; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal static class ParsingUtils { diff --git a/src/Controls/tests/UITests/PlatformMethodQueries.cs b/src/Controls/tests/TestCases.Shared.Tests/PlatformMethodQueries.cs similarity index 99% rename from src/Controls/tests/UITests/PlatformMethodQueries.cs rename to src/Controls/tests/TestCases.Shared.Tests/PlatformMethodQueries.cs index bec7de27a522..20467a4313eb 100644 --- a/src/Controls/tests/UITests/PlatformMethodQueries.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/PlatformMethodQueries.cs @@ -1,6 +1,6 @@ using Microsoft.Maui.Controls; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal static class PlatformMethodQueries { diff --git a/src/Controls/tests/UITests/PlatformMethods.cs b/src/Controls/tests/TestCases.Shared.Tests/PlatformMethods.cs similarity index 93% rename from src/Controls/tests/UITests/PlatformMethods.cs rename to src/Controls/tests/TestCases.Shared.Tests/PlatformMethods.cs index 8fef8d90d371..57ad488c8253 100644 --- a/src/Controls/tests/UITests/PlatformMethods.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/PlatformMethods.cs @@ -1,7 +1,7 @@ using Microsoft.Maui.Controls; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal static class PlatformMethods { diff --git a/src/Controls/tests/UITests/StringToBoolConverter.cs b/src/Controls/tests/TestCases.Shared.Tests/StringToBoolConverter.cs similarity index 93% rename from src/Controls/tests/UITests/StringToBoolConverter.cs rename to src/Controls/tests/TestCases.Shared.Tests/StringToBoolConverter.cs index 21e8a2493ad9..0434612a2d7e 100644 --- a/src/Controls/tests/UITests/StringToBoolConverter.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/StringToBoolConverter.cs @@ -1,4 +1,4 @@ -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal class StringToBoolConverter : TypeConverter { diff --git a/src/Controls/samples/Controls.Sample.UITests/Test.cs b/src/Controls/tests/TestCases.Shared.Tests/Test.cs similarity index 99% rename from src/Controls/samples/Controls.Sample.UITests/Test.cs rename to src/Controls/tests/TestCases.Shared.Tests/Test.cs index b5b94adc4ff6..61c0f05560a9 100644 --- a/src/Controls/samples/Controls.Sample.UITests/Test.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Test.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Maui.Controls.Sample +namespace Maui.Controls.Sample { public static class Test { diff --git a/src/Controls/tests/UITests/Tests/BorderUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/BorderUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs index 552bd34e3c90..8a09e2d2ff0b 100644 --- a/src/Controls/tests/UITests/Tests/BorderUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/BorderUITests.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class BorderUITests : UITest { diff --git a/src/Controls/tests/UITests/Tests/ButtonUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/ButtonUITests.cs similarity index 76% rename from src/Controls/tests/UITests/Tests/ButtonUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/ButtonUITests.cs index cd0ae371c205..aa11dc5a3a6d 100644 --- a/src/Controls/tests/UITests/Tests/ButtonUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/ButtonUITests.cs @@ -1,9 +1,10 @@ using Maui.Controls.Sample; using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class ButtonUITests : _ViewUITests { @@ -27,13 +28,13 @@ public void Clicked() remote.GoTo(); var textBeforeClick = remote.GetEventLabel().GetText(); - Assert.AreEqual("Event: Clicked (none)", textBeforeClick); + ClassicAssert.AreEqual("Event: Clicked (none)", textBeforeClick); // Click Button remote.TapView(); var textAfterClick = remote.GetEventLabel().GetText(); - Assert.AreEqual("Event: Clicked (fired 1)", textAfterClick); + ClassicAssert.AreEqual("Event: Clicked (fired 1)", textAfterClick); } } } diff --git a/src/Controls/tests/UITests/Tests/CarouselViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CarouselViewUITests.cs similarity index 90% rename from src/Controls/tests/UITests/Tests/CarouselViewUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/CarouselViewUITests.cs index b915ae834e45..fd3b12d395d6 100644 --- a/src/Controls/tests/UITests/Tests/CarouselViewUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CarouselViewUITests.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class CarouselViewUITests : UITest { @@ -32,7 +33,7 @@ public async Task CarouselViewSetPosition() App.WaitForElement("lblPosition"); await Task.Delay(1000); var result = App.FindElement("lblPosition").GetText(); - Assert.AreEqual("3", result); + ClassicAssert.AreEqual("3", result); } } @@ -64,7 +65,7 @@ public void CarouselViewGoToNextCurrentItem() void CheckLabelValue(string labelAutomationId, string value) { var result = App.FindElement(labelAutomationId).GetText(); - Assert.AreEqual(value, result); + ClassicAssert.AreEqual(value, result); } } } diff --git a/src/Controls/tests/UITests/Tests/CheckBoxUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CheckBoxUITests.cs similarity index 93% rename from src/Controls/tests/UITests/Tests/CheckBoxUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/CheckBoxUITests.cs index 5aa94d622113..4b4c0b26187b 100644 --- a/src/Controls/tests/UITests/Tests/CheckBoxUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CheckBoxUITests.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class CheckBoxUITests : _ViewUITests { diff --git a/src/Controls/tests/UITests/Tests/Concepts/ImageLoadingGalleryTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/ImageLoadingGalleryTests.cs similarity index 96% rename from src/Controls/tests/UITests/Tests/Concepts/ImageLoadingGalleryTests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/ImageLoadingGalleryTests.cs index 4f86d90ec4c4..7774cd29be99 100644 --- a/src/Controls/tests/UITests/Tests/Concepts/ImageLoadingGalleryTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/ImageLoadingGalleryTests.cs @@ -3,7 +3,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class ImageLoadingGalleryTests : CoreGalleryBasePageTest { diff --git a/src/Controls/tests/UITests/Tests/Concepts/InputTransparencyGalleryTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/InputTransparencyGalleryTests.cs similarity index 85% rename from src/Controls/tests/UITests/Tests/Concepts/InputTransparencyGalleryTests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/InputTransparencyGalleryTests.cs index 8e69b47a61d2..60929d28cdf2 100644 --- a/src/Controls/tests/UITests/Tests/Concepts/InputTransparencyGalleryTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Concepts/InputTransparencyGalleryTests.cs @@ -1,9 +1,10 @@ using Maui.Controls.Sample; using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class InputTransparencyGalleryTests : CoreGalleryBasePageTest { @@ -48,7 +49,7 @@ void RunTest(string test, bool? clickable = null, bool? passthru = null) remote.GoTo(test.ToString()); var textBeforeClick = remote.GetEventLabel().GetText(); - Assert.AreEqual($"Event: {test} (none)", textBeforeClick); + ClassicAssert.AreEqual($"Event: {test} (none)", textBeforeClick); remote.TapView(); @@ -57,19 +58,19 @@ void RunTest(string test, bool? clickable = null, bool? passthru = null) if (clickable is null || passthru is null) { // some tests are really basic so have no need for fancy checks - Assert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick); + ClassicAssert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick); } else if (clickable == true || passthru == true) { // if the button is clickable or taps pass through to the base button - Assert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick); + ClassicAssert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick); } else if (Device == TestDevice.Android) { // TODO: Android is broken with everything passing through so we just use that // to test the bottom button was clickable // https://github.com/dotnet/maui/issues/10252 - Assert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick); + ClassicAssert.AreEqual($"Event: {test} (SUCCESS 1)", textAfterClick); } else { @@ -77,7 +78,7 @@ void RunTest(string test, bool? clickable = null, bool? passthru = null) Task.Delay(500).Wait(); // just make sure that nothing happened textAfterClick = remote.GetEventLabel().GetText(); - Assert.AreEqual($"Event: {test} (none)", textBeforeClick); + ClassicAssert.AreEqual($"Event: {test} (none)", textBeforeClick); } } } diff --git a/src/Controls/tests/UITests/Tests/CoreGalleryBasePageTest.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/CoreGalleryBasePageTest.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs index a5f48db1e630..a71810b23622 100644 --- a/src/Controls/tests/UITests/Tests/CoreGalleryBasePageTest.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/CoreGalleryBasePageTest.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public abstract class CoreGalleryBasePageTest : UITest { diff --git a/src/Controls/tests/UITests/Tests/DragAndDropUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs similarity index 52% rename from src/Controls/tests/UITests/Tests/DragAndDropUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs index 3e2af31f632a..da174288d1b4 100644 --- a/src/Controls/tests/UITests/Tests/DragAndDropUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/DragAndDropUITests.cs @@ -1,10 +1,11 @@ using Maui.Controls.Sample; using Microsoft.Maui.Graphics; using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class DragAndDropUITests : UITest { @@ -39,9 +40,9 @@ public void DragEvents() } else { - Assert.True(textAfterDrag.Contains("DragStarting", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted", StringComparison.OrdinalIgnoreCase)); } } @@ -68,10 +69,10 @@ public void DragAndDropBetweenLayouts() } else { - Assert.True(textAfterDrag.Contains("DragStarting", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("RainbowColorsAdd:Red", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("RainbowColorsAdd:Red", StringComparison.OrdinalIgnoreCase)); } } @@ -97,65 +98,65 @@ public void PlatformDragEventArgs() { if (Device == TestDevice.iOS || Device == TestDevice.Mac) { - Assert.True(textAfterDrag.Contains("DragStarting:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragStarting:DragInteraction", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragStarting:DragSession", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting:DragInteraction", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting:DragSession", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted:DropInteraction", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted:DropSession", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted:DropInteraction", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted:DropSession", StringComparison.OrdinalIgnoreCase)); // Until the UI test can drag over an item without placing it down - //Assert.True(textAfterDrag.Contains("DragLeave:Sender", StringComparison.OrdinalIgnoreCase)); - //Assert.True(textAfterDrag.Contains("DragLeave:DropInteraction", StringComparison.OrdinalIgnoreCase)); - //Assert.True(textAfterDrag.Contains("DragLeave:DropSession", StringComparison.OrdinalIgnoreCase)); + //ClassicAssert.True(textAfterDrag.Contains("DragLeave:Sender", StringComparison.OrdinalIgnoreCase)); + //ClassicAssert.True(textAfterDrag.Contains("DragLeave:DropInteraction", StringComparison.OrdinalIgnoreCase)); + //ClassicAssert.True(textAfterDrag.Contains("DragLeave:DropSession", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver:DropInteraction", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver:DropSession", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver:DropInteraction", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver:DropSession", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("Drop:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("Drop:DropInteraction", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("Drop:DropSession", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("Drop:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("Drop:DropInteraction", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("Drop:DropSession", StringComparison.OrdinalIgnoreCase)); } else if (Device == TestDevice.Android) { - Assert.True(textAfterDrag.Contains("DragStarting:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragStarting:MotionEvent", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting:MotionEvent", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted:DragEvent", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted:DragEvent", StringComparison.OrdinalIgnoreCase)); // Until the UI test can drag over an item without placing it down - //Assert.True(textAfterDrag.Contains("DragLeave:Sender", StringComparison.OrdinalIgnoreCase)); - //Assert.True(textAfterDrag.Contains("DragLeave:DragEvent", StringComparison.OrdinalIgnoreCase)); + //ClassicAssert.True(textAfterDrag.Contains("DragLeave:Sender", StringComparison.OrdinalIgnoreCase)); + //ClassicAssert.True(textAfterDrag.Contains("DragLeave:DragEvent", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver:DragEvent", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver:DragEvent", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("Drop:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("Drop:DragEvent", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("Drop:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("Drop:DragEvent", StringComparison.OrdinalIgnoreCase)); } else { - Assert.True(textAfterDrag.Contains("DragStarting:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragStarting:DragStartingEventArgs", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragStarting:Handled", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting:DragStartingEventArgs", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragStarting:Handled", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DropCompleted:DropCompletedEventArgs", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DropCompleted:DropCompletedEventArgs", StringComparison.OrdinalIgnoreCase)); // Until the UI test can drag over an item without placing it down - //Assert.True(textAfterDrag.Contains("DragLeave:Sender", StringComparison.OrdinalIgnoreCase)); - //Assert.True(textAfterDrag.Contains("DragLeave:DragEventArgs", StringComparison.OrdinalIgnoreCase)); - //Assert.True(textAfterDrag.Contains("DragLeave:Handled", StringComparison.OrdinalIgnoreCase)); + //ClassicAssert.True(textAfterDrag.Contains("DragLeave:Sender", StringComparison.OrdinalIgnoreCase)); + //ClassicAssert.True(textAfterDrag.Contains("DragLeave:DragEventArgs", StringComparison.OrdinalIgnoreCase)); + //ClassicAssert.True(textAfterDrag.Contains("DragLeave:Handled", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("DragOver:DragEventArgs", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("DragOver:DragEventArgs", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("Drop:Sender", StringComparison.OrdinalIgnoreCase)); - Assert.True(textAfterDrag.Contains("Drop:DragEventArgs", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("Drop:Sender", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(textAfterDrag.Contains("Drop:DragEventArgs", StringComparison.OrdinalIgnoreCase)); } } } @@ -178,20 +179,20 @@ public void DragStartEventCoordinates() var dragStartRelativeToScreen = GetCoordinatesFromLabel(App.FindElement("DragStartRelativeScreen").GetText()); var dragStartRelativeToLabel = GetCoordinatesFromLabel(App.FindElement("DragStartRelativeLabel").GetText()); - Assert.NotNull(dragStartRelativeToSelf); - Assert.NotNull(dragStartRelativeToScreen); - Assert.NotNull(dragStartRelativeToLabel); + ClassicAssert.NotNull(dragStartRelativeToSelf); + ClassicAssert.NotNull(dragStartRelativeToScreen); + ClassicAssert.NotNull(dragStartRelativeToLabel); - Assert.True(dragStartRelativeToSelf!.Value.X > 0 && dragStartRelativeToSelf!.Value.Y > 0); - Assert.True(dragStartRelativeToScreen!.Value.X > 0 && dragStartRelativeToScreen!.Value.Y > 0); + ClassicAssert.True(dragStartRelativeToSelf!.Value.X > 0 && dragStartRelativeToSelf!.Value.Y > 0); + ClassicAssert.True(dragStartRelativeToScreen!.Value.X > 0 && dragStartRelativeToScreen!.Value.Y > 0); // The position of the drag relative to itself should be less than that relative to the screen // There are other elements in the screen, plus the ContentView of the test has some margin - Assert.True(dragStartRelativeToSelf!.Value.X < dragStartRelativeToScreen!.Value.X); - Assert.True(dragStartRelativeToSelf!.Value.Y < dragStartRelativeToScreen!.Value.Y); + ClassicAssert.True(dragStartRelativeToSelf!.Value.X < dragStartRelativeToScreen!.Value.X); + ClassicAssert.True(dragStartRelativeToSelf!.Value.Y < dragStartRelativeToScreen!.Value.Y); // Since the label is below the the box, the Y position of the drag relative to the label should be negative - Assert.True(dragStartRelativeToLabel!.Value.Y < 0); + ClassicAssert.True(dragStartRelativeToLabel!.Value.Y < 0); } [Test] @@ -213,24 +214,24 @@ public void DragEventCoordinates() var dragRelativeToLabel = GetCoordinatesFromLabel(App.FindElement("DragRelativeLabel").GetText()); var dragStartRelativeToScreen = GetCoordinatesFromLabel(App.FindElement("DragStartRelativeScreen").GetText()); - Assert.NotNull(dragRelativeToDrop); - Assert.NotNull(dragRelativeToScreen); - Assert.NotNull(dragRelativeToLabel); - Assert.NotNull(dragStartRelativeToScreen); + ClassicAssert.NotNull(dragRelativeToDrop); + ClassicAssert.NotNull(dragRelativeToScreen); + ClassicAssert.NotNull(dragRelativeToLabel); + ClassicAssert.NotNull(dragStartRelativeToScreen); - Assert.True(dragRelativeToDrop!.Value.X > 0 && dragRelativeToDrop!.Value.Y > 0); - Assert.True(dragRelativeToScreen!.Value.X > 0 && dragRelativeToScreen!.Value.Y > 0); + ClassicAssert.True(dragRelativeToDrop!.Value.X > 0 && dragRelativeToDrop!.Value.Y > 0); + ClassicAssert.True(dragRelativeToScreen!.Value.X > 0 && dragRelativeToScreen!.Value.Y > 0); // The position of the drag relative to the drop location should be less than that relative to the screen // There are other elements in the screen, plus the ContentView of the test has some margin - Assert.True(dragRelativeToDrop!.Value.X < dragRelativeToScreen!.Value.X); - Assert.True(dragRelativeToDrop!.Value.Y < dragRelativeToScreen!.Value.Y); + ClassicAssert.True(dragRelativeToDrop!.Value.X < dragRelativeToScreen!.Value.X); + ClassicAssert.True(dragRelativeToDrop!.Value.Y < dragRelativeToScreen!.Value.Y); // Since the label is below the the box, the Y position of the drag relative to the label should be negative - Assert.True(dragRelativeToLabel!.Value.Y < 0); + ClassicAssert.True(dragRelativeToLabel!.Value.Y < 0); // The drag is executed left to right, so the X value should be higher than where it started - Assert.True(dragRelativeToScreen!.Value.X > dragStartRelativeToScreen!.Value.X); + ClassicAssert.True(dragRelativeToScreen!.Value.X > dragStartRelativeToScreen!.Value.X); } [Test] @@ -254,30 +255,30 @@ public void DropEventCoordinates() var dragRelativeToLabel = GetCoordinatesFromLabel(App.FindElement("DragRelativeLabel").GetText()); var dragStartRelativeToScreen = GetCoordinatesFromLabel(App.FindElement("DragStartRelativeScreen").GetText()); - Assert.NotNull(dropRelativeToLayout); - Assert.NotNull(dropRelativeToScreen); - Assert.NotNull(dropRelativeToLabel); + ClassicAssert.NotNull(dropRelativeToLayout); + ClassicAssert.NotNull(dropRelativeToScreen); + ClassicAssert.NotNull(dropRelativeToLabel); - Assert.NotNull(dragRelativeToLabel); - Assert.NotNull(dragStartRelativeToScreen); + ClassicAssert.NotNull(dragRelativeToLabel); + ClassicAssert.NotNull(dragStartRelativeToScreen); - Assert.True(dropRelativeToLayout!.Value.X > 0 && dropRelativeToLayout!.Value.Y > 0); - Assert.True(dropRelativeToScreen!.Value.X > 0 && dropRelativeToScreen!.Value.Y > 0); + ClassicAssert.True(dropRelativeToLayout!.Value.X > 0 && dropRelativeToLayout!.Value.Y > 0); + ClassicAssert.True(dropRelativeToScreen!.Value.X > 0 && dropRelativeToScreen!.Value.Y > 0); // The position of the drop relative the layout should be less than that relative to the screen // There are other elements in the screen, plus the ContentView of the test has some margin - Assert.True(dropRelativeToLayout!.Value.X < dropRelativeToScreen!.Value.X); - Assert.True(dropRelativeToLayout!.Value.Y < dropRelativeToScreen!.Value.Y); + ClassicAssert.True(dropRelativeToLayout!.Value.X < dropRelativeToScreen!.Value.X); + ClassicAssert.True(dropRelativeToLayout!.Value.Y < dropRelativeToScreen!.Value.Y); // Since the label is below the the box, the Y position of the drop relative to the label should be negative - Assert.True(dropRelativeToLabel!.Value.Y < 0); + ClassicAssert.True(dropRelativeToLabel!.Value.Y < 0); // The drop is executed left to right, so the X value should be higher than where it started - Assert.True(dropRelativeToScreen!.Value.X > dragStartRelativeToScreen!.Value.X); + ClassicAssert.True(dropRelativeToScreen!.Value.X > dragStartRelativeToScreen!.Value.X); // The label receiving the coordinates of the drop is below that which receives the coordinates of the drag // Therefore, the label that receives the coordinates of the drop should have a smaller Y value (more negative) - Assert.True(dropRelativeToLabel!.Value.Y < dragRelativeToLabel!.Value.Y); + ClassicAssert.True(dropRelativeToLabel!.Value.Y < dragRelativeToLabel!.Value.Y); } // Helper function to parse out the X and Y coordinates from text labels 'Drag position: (x),(y)' diff --git a/src/Controls/tests/UITests/Tests/EditorUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/EditorUITests.cs similarity index 93% rename from src/Controls/tests/UITests/Tests/EditorUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/EditorUITests.cs index 0239dfe53e0a..be6a9d18d36a 100644 --- a/src/Controls/tests/UITests/Tests/EditorUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/EditorUITests.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class EditorUITests : _ViewUITests { diff --git a/src/Controls/tests/UITests/Tests/GestureRecognizerUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs similarity index 89% rename from src/Controls/tests/UITests/Tests/GestureRecognizerUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs index 09db4e794044..1900a5cb6e5b 100644 --- a/src/Controls/tests/UITests/Tests/GestureRecognizerUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/GestureRecognizerUITests.cs @@ -1,9 +1,10 @@ using Maui.Controls.Sample; using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class GestureRecognizerUITests : UITest { @@ -36,7 +37,7 @@ public void PointerGestureTest() App.Tap("secondaryLabel"); var secondaryLabelText = App.FindElement("secondaryLabel").GetText(); - Assert.IsNotEmpty(secondaryLabelText); + ClassicAssert.IsNotEmpty(secondaryLabelText); } [Test] @@ -51,8 +52,7 @@ public void DoubleTap() App.DoubleTap("DoubleTapSurface"); var result = App.FindElement("DoubleTapResults").GetText(); - Assert.AreEqual("Success", result); + ClassicAssert.AreEqual("Success", result); } } -} - +} \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/GroupListViewHeaderIndexOutOfRange.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/GroupListViewHeaderIndexOutOfRange.cs similarity index 91% rename from src/Controls/tests/UITests/Tests/Issues/GroupListViewHeaderIndexOutOfRange.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/GroupListViewHeaderIndexOutOfRange.cs index 43b64f8e98e9..661697912c57 100644 --- a/src/Controls/tests/UITests/Tests/Issues/GroupListViewHeaderIndexOutOfRange.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/GroupListViewHeaderIndexOutOfRange.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class GroupListViewHeaderIndexOutOfRange : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/HideSoftInputOnTappedPageTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/HideSoftInputOnTappedPageTests.cs similarity index 77% rename from src/Controls/tests/UITests/Tests/Issues/HideSoftInputOnTappedPageTests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/HideSoftInputOnTappedPageTests.cs index 42d30f69d438..bc6b3c83fa47 100644 --- a/src/Controls/tests/UITests/Tests/Issues/HideSoftInputOnTappedPageTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/HideSoftInputOnTappedPageTests.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class HideSoftInputOnTappedPageTests : _IssuesUITest { @@ -47,10 +48,10 @@ void HideSoftInputOnTappedPageTestForMac(string control, bool hideOnTapped) App.WaitForElement(control); App.Click(control); - Assert.IsTrue(App.IsFocused(control)); + ClassicAssert.IsTrue(App.IsFocused(control)); App.Click("EmptySpace"); - Assert.AreEqual(!hideOnTapped, App.IsFocused(control)); + ClassicAssert.AreEqual(!hideOnTapped, App.IsFocused(control)); } finally { @@ -73,10 +74,10 @@ void HideSoftInputOnTappedPageTestForAndroidiOS(string control, bool hideOnTappe App.WaitForElement(control); App.Tap(control); - Assert.True(App.IsKeyboardShown()); + ClassicAssert.True(App.IsKeyboardShown()); App.Tap("EmptySpace"); - Assert.AreEqual(!hideOnTapped, App.IsKeyboardShown()); + ClassicAssert.AreEqual(!hideOnTapped, App.IsKeyboardShown()); } finally { @@ -115,14 +116,14 @@ public void TogglingHideSoftInputOnTappedForMac() for (int i = 0; i < 2; i++) { App.Click("HideKeyboardWhenTappingPage"); - Assert.True(App.IsFocused("HideKeyboardWhenTappingPage")); + ClassicAssert.True(App.IsFocused("HideKeyboardWhenTappingPage")); App.Click("EmptySpace"); - Assert.AreEqual(false, App.IsFocused("HideKeyboardWhenTappingPage")); + ClassicAssert.AreEqual(false, App.IsFocused("HideKeyboardWhenTappingPage")); App.Click("DontHideKeyboardWhenTappingPage"); - Assert.True(App.IsFocused("DontHideKeyboardWhenTappingPage")); + ClassicAssert.True(App.IsFocused("DontHideKeyboardWhenTappingPage")); App.Click("EmptySpace"); - Assert.AreEqual(true, App.IsFocused("DontHideKeyboardWhenTappingPage")); + ClassicAssert.AreEqual(true, App.IsFocused("DontHideKeyboardWhenTappingPage")); } } finally @@ -145,14 +146,14 @@ public void TogglingHideSoftInputOnTappedForAndroidiOS() { App.WaitForElement("HideKeyboardWhenTappingPage"); App.Tap("HideKeyboardWhenTappingPage"); - Assert.True(App.IsKeyboardShown()); + ClassicAssert.True(App.IsKeyboardShown()); App.Tap("EmptySpace"); - Assert.AreEqual(false, App.IsKeyboardShown()); + ClassicAssert.AreEqual(false, App.IsKeyboardShown()); App.Tap("DontHideKeyboardWhenTappingPage"); - Assert.True(App.IsKeyboardShown()); + ClassicAssert.True(App.IsKeyboardShown()); App.Tap("EmptySpace"); - Assert.AreEqual(true, App.IsKeyboardShown()); + ClassicAssert.AreEqual(true, App.IsKeyboardShown()); } } finally diff --git a/src/Controls/tests/UITests/Tests/Issues/IsInvokeRequiredRaceCondition.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/IsInvokeRequiredRaceCondition.cs similarity index 91% rename from src/Controls/tests/UITests/Tests/Issues/IsInvokeRequiredRaceCondition.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/IsInvokeRequiredRaceCondition.cs index 8b3889eeadf1..0775a2ae7970 100644 --- a/src/Controls/tests/UITests/Tests/Issues/IsInvokeRequiredRaceCondition.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/IsInvokeRequiredRaceCondition.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class IsInvokeRequiredRaceCondition : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue10234.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10234.cs similarity index 81% rename from src/Controls/tests/UITests/Tests/Issues/Issue10234.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10234.cs index 1aa72ae80d0b..d9ab519386b2 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue10234.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10234.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue10234 : _IssuesUITest { @@ -15,8 +16,6 @@ public Issue10234(TestDevice device) : base(device) [Test] public void ScrollCarouselViewAfterDispose() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }); - try { _ = App.WaitForElement("GoToTest"); @@ -33,7 +32,8 @@ public void ScrollCarouselViewAfterDispose() App.Tap("goToBack"); App.WaitForElement("goToShow"); } - finally{ + finally + { Reset(); } } @@ -44,3 +44,4 @@ void ScrollNextItem() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue10947.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10947.cs similarity index 80% rename from src/Controls/tests/UITests/Tests/Issues/Issue10947.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10947.cs index f3f21cadf2de..dac97f933764 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue10947.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue10947.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue10947 : _IssuesUITest { @@ -26,13 +27,13 @@ public void CollectionViewHeaderShouldNotScroll() var newHeaderEntry = App.WaitForElement(HeaderEntry); var newHeaderLocation = headerEntry.GetRect(); - Assert.AreEqual(headerLocation, newHeaderLocation); + ClassicAssert.AreEqual(headerLocation, newHeaderLocation); App.Tap(FooterEntry); var newFooterEntry = App.WaitForElement(FooterEntry); var newFooterLocation = headerEntry.GetRect(); - Assert.AreEqual(footerLocation, newFooterLocation); + ClassicAssert.AreEqual(footerLocation, newFooterLocation); } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue11501.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue11501.cs similarity index 85% rename from src/Controls/tests/UITests/Tests/Issues/Issue11501.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue11501.cs index 2a955b18231c..07a97eac7461 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue11501.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue11501.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if ANDROID || IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue11501 : _IssuesUITest { @@ -18,8 +19,6 @@ public Issue11501(TestDevice device) : base(device) [TestCase("RemoveAddTabs")] public void MakingFragmentRelatedChangesWhileAppIsBackgroundedFails(string scenario) { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows }); - try { App.WaitForElement(scenario); @@ -43,3 +42,4 @@ public void MakingFragmentRelatedChangesWhileAppIsBackgroundedFails(string scena } } } +#endif diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue12211.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12211.cs similarity index 74% rename from src/Controls/tests/UITests/Tests/Issues/Issue12211.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12211.cs index f0a0be7f5377..4a219e8b12fe 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue12211.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12211.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue12211 : _IssuesUITest { @@ -24,9 +25,9 @@ public void WhenChangingBoxViewOpacityThenValueIsCorrectlySet() var secondOpacity = ChangeOpacityAndGetCurrentStatus(); var thirdOpacity = ChangeOpacityAndGetCurrentStatus(); - Assert.AreEqual(GetExpectedCurrentOpacityStatus(0.7), initialOpacity); - Assert.AreEqual(GetExpectedCurrentOpacityStatus(1), secondOpacity); - Assert.AreEqual(GetExpectedCurrentOpacityStatus(0), thirdOpacity); + ClassicAssert.AreEqual(GetExpectedCurrentOpacityStatus(0.7), initialOpacity); + ClassicAssert.AreEqual(GetExpectedCurrentOpacityStatus(1), secondOpacity); + ClassicAssert.AreEqual(GetExpectedCurrentOpacityStatus(0), thirdOpacity); } string? ChangeOpacityAndGetCurrentStatus() diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue12567.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12567.cs similarity index 87% rename from src/Controls/tests/UITests/Tests/Issues/Issue12567.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12567.cs index 77073e2d957f..77df061cbf2e 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue12567.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12567.cs @@ -2,7 +2,7 @@ //using NUnit.Framework; //using Xamarin.UITest.Queries; -//namespace Microsoft.Maui.AppiumTests.Issues +//namespace Microsoft.Maui.TestCases.Tests.Issues //{ // public class Issue12567 : _IssuesUITest // { @@ -13,7 +13,7 @@ // [Test] // public void WhenQueryingCarouselItemsInViewThenSingleItemIsRetrieved() // { -// // TODO: Investigate and remove the need for this. Currently all platforms fail the "Assert.AreEqual(10, itemNumber)", +// // TODO: Investigate and remove the need for this. Currently all platforms fail the "ClassicAssert.AreEqual(10, itemNumber)", // // though failures are a bit different on different platforms. // Assert.Ignore("WhenQueryingCarouselItemsInViewThenSingleItemIsRetrieved is newly added but fails; need to investigate and fix"); @@ -28,7 +28,7 @@ // var itemNumber = GetCurrentItemNumber(); -// Assert.AreEqual(10, itemNumber); +// ClassicAssert.AreEqual(10, itemNumber); // } // int GetCurrentItemNumber() @@ -43,10 +43,10 @@ // // Get the visible labels in the carousel (should be one if everything is OK) // var labels = App.FindElement(element => element.Marked("NameLabel")).Where(IsActiveCarouselItem); -// Assert.NotNull(labels); +// ClassicAssert.NotNull(labels); // Assert.IsNotEmpty(labels); // //Only one item should be visible at a time in the carousel -// Assert.AreEqual(1, labels.Count()); +// ClassicAssert.AreEqual(1, labels.Count()); // } // //Only the active item in the window should have a size greater than zero diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue14257.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14257.cs similarity index 83% rename from src/Controls/tests/UITests/Tests/Issues/Issue14257.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14257.cs index 302e4a053c22..5011a250c5a8 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue14257.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14257.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue14257 : _IssuesUITest { @@ -26,7 +27,7 @@ public void ResizeScrollViewAndTapButtonTest() App.Tap("Test"); // If we can successfully tap the button, the Success label will be displayed - Assert.IsTrue(App.WaitForTextToBePresentInElement("Result", "Success")); + ClassicAssert.IsTrue(App.WaitForTextToBePresentInElement("Result", "Success")); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue14557.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14557.cs similarity index 76% rename from src/Controls/tests/UITests/Tests/Issues/Issue14557.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14557.cs index 40c5629c27e6..9104969f9cef 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue14557.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14557.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { class Issue14557 : _IssuesUITest { @@ -18,8 +19,8 @@ public void HeaderAndFooterRender() var headerText = App.FindElement("headerLabel").GetText(); var footerText = App.FindElement("footerLabel").GetText(); - Assert.IsNotEmpty(headerText); - Assert.IsNotEmpty(footerText); + ClassicAssert.IsNotEmpty(headerText); + ClassicAssert.IsNotEmpty(footerText); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue14829.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14829.cs similarity index 73% rename from src/Controls/tests/UITests/Tests/Issues/Issue14829.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14829.cs index 3a3d1fa03fbd..28f7f736b76e 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue14829.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue14829.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if WINDOWS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue14829 : _IssuesUITest { @@ -16,8 +17,6 @@ public Issue14829(TestDevice device) : base(device) [Category(UITestCategories.ActionSheet)] public void DisplayActionSheetStillNotWorkingOnWindows() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.iOS }, "Only affects Windows."); - App.WaitForElement("DisplayActionSheetButton", timeout: TimeSpan.FromSeconds(4)).Click(); App.WaitForElement("ActionSheetTitle", timeout: TimeSpan.FromSeconds(4)); @@ -25,3 +24,4 @@ public void DisplayActionSheetStillNotWorkingOnWindows() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue15330.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15330.cs similarity index 63% rename from src/Controls/tests/UITests/Tests/Issues/Issue15330.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15330.cs index 912870e2d617..ea6c63941860 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue15330.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15330.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if !IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue15330 : _IssuesUITest { @@ -16,11 +17,11 @@ public Issue15330(TestDevice device) [Category(UITestCategories.Layout)] public void Issue15330Test() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS }, - "Currently fails on iOS; see https://github.com/dotnet/maui/issues/17125"); + // Currently fails on iOS; see https://github.com/dotnet/maui/issues/17125 App.WaitForElement("WaitForStubControl"); VerifyScreenshot(); } } } +#endif diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue15357.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15357.cs similarity index 75% rename from src/Controls/tests/UITests/Tests/Issues/Issue15357.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15357.cs index f9f990e6432f..b75726e73240 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue15357.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15357.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue15357 : _IssuesUITest { @@ -26,9 +27,9 @@ public async Task WhenTapButtonThenListViewsChangesVisibility() var thirdStatus = TapButtonAndGetStatus(); await Task.Delay(500); - Assert.AreEqual(GetExpectedButtonStatus(isVisible: true), initialStatus); - Assert.AreEqual(GetExpectedButtonStatus(isVisible: false), secondStatus); - Assert.AreEqual(GetExpectedButtonStatus(isVisible: true), thirdStatus); + ClassicAssert.AreEqual(GetExpectedButtonStatus(isVisible: true), initialStatus); + ClassicAssert.AreEqual(GetExpectedButtonStatus(isVisible: false), secondStatus); + ClassicAssert.AreEqual(GetExpectedButtonStatus(isVisible: true), thirdStatus); } string? TapButtonAndGetStatus() diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue15815.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15815.cs similarity index 73% rename from src/Controls/tests/UITests/Tests/Issues/Issue15815.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15815.cs index ddea6591b420..6326c6918aed 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue15815.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15815.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue15815 : _IssuesUITest { @@ -16,6 +17,6 @@ public Issue15815(TestDevice device) public void LastItemIsVisilbe() { var lastItem = App.WaitForElement("id-2"); - Assert.AreEqual("Item 2", lastItem.GetText()); + ClassicAssert.AreEqual("Item 2", lastItem.GetText()); } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue15826.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15826.cs similarity index 74% rename from src/Controls/tests/UITests/Tests/Issues/Issue15826.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15826.cs index 49876f55c4dd..79687b36f406 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue15826.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15826.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue15826 : _IssuesUITest { @@ -26,9 +27,9 @@ public async Task WhenTapButtonThenListViewsChangesVisibility() var thirdStatus = TapButtonAndGetStatus(); await Task.Delay(500); - Assert.AreEqual(GetExpectedListsStatus("List 1"), initialStatus); - Assert.AreEqual(GetExpectedListsStatus("List 2"), secondStatus); - Assert.AreEqual(GetExpectedListsStatus("List 1"), thirdStatus); + ClassicAssert.AreEqual(GetExpectedListsStatus("List 1"), initialStatus); + ClassicAssert.AreEqual(GetExpectedListsStatus("List 2"), secondStatus); + ClassicAssert.AreEqual(GetExpectedListsStatus("List 1"), thirdStatus); } string? TapButtonAndGetStatus() diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16094.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16094.cs similarity index 78% rename from src/Controls/tests/UITests/Tests/Issues/Issue16094.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16094.cs index fd0a9b474e6d..ae4b6d431f2c 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue16094.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16094.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if !MACCATALYST +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue16094 : _IssuesUITest { @@ -16,8 +17,6 @@ public Issue16094(TestDevice device) [Category(UITestCategories.Editor)] public void ShadowsDontRespectControlShape() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac }); - App.WaitForElement("TestScrollView"); App.ScrollDown("TestScrollView", ScrollStrategy.Gesture); App.WaitForElement("EditorControl"); @@ -25,3 +24,4 @@ public void ShadowsDontRespectControlShape() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16320.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16320.cs similarity index 83% rename from src/Controls/tests/UITests/Tests/Issues/Issue16320.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16320.cs index 32182130fa2e..32d76ddfc219 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue16320.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16320.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue16320 : _IssuesUITest { @@ -26,7 +27,7 @@ public void Issue16320Test() App.Tap("Add"); - Assert.NotNull(App.WaitForElement("item: 1")); + ClassicAssert.NotNull(App.WaitForElement("item: 1")); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16321.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16321.cs similarity index 77% rename from src/Controls/tests/UITests/Tests/Issues/Issue16321.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16321.cs index 2552915bd472..0499a22ec6c7 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue16321.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16321.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue16321 : _IssuesUITest { @@ -18,13 +19,9 @@ public Issue16321(TestDevice device) : base(device) { } [Category(UITestCategories.DisplayAlert)] public void OpenAlertWithModals(string testCase) { - this.IgnoreIfPlatforms(new[] - { - TestDevice.Mac, TestDevice.Windows, TestDevice.Android - }); - App.WaitForElement(testCase).Tap(); App.WaitForElement("Cancel").Tap(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16386.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16386.cs similarity index 74% rename from src/Controls/tests/UITests/Tests/Issues/Issue16386.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16386.cs index 5bfc74901ce3..11588c404005 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue16386.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16386.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if ANDROID +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue16386 : _IssuesUITest { @@ -16,12 +17,6 @@ public Issue16386(TestDevice device) [Category(UITestCategories.Entry)] public void HittingEnterKeySendsDone() { - this.IgnoreIfPlatforms(new[] - { - TestDevice.Mac, - TestDevice.Windows - }); - App.WaitForElement("HardwareEnterKeyEntry"); App.Tap("HardwareEnterKeyEntry"); App.PressEnter(); @@ -29,3 +24,4 @@ public void HittingEnterKeySendsDone() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16499.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16499.cs similarity index 90% rename from src/Controls/tests/UITests/Tests/Issues/Issue16499.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16499.cs index 67f651e775b2..86b17ba5afc2 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue16499.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16499.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue16499 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16561.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16561.cs similarity index 95% rename from src/Controls/tests/UITests/Tests/Issues/Issue16561.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16561.cs index cdc4cfebbab6..f4d6f5bf1ae4 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue16561.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16561.cs @@ -1,5 +1,6 @@ using System.Drawing; using NUnit.Framework; +using NUnit.Framework.Legacy; using OpenQA.Selenium.Appium.Interactions; using OpenQA.Selenium.Appium.iOS; using OpenQA.Selenium.Appium.Windows; @@ -8,7 +9,7 @@ using UITest.Core; using PointerInputDevice = OpenQA.Selenium.Appium.Interactions.PointerInputDevice; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue16561 : _IssuesUITest { @@ -126,8 +127,8 @@ static void AssertCorrectTapLocation(string tapData, float expectedX, float expe // Turn the text values into numbers so we can compare with a tolerance (var tapX, var tapY) = ParseCoordinates(tapData); - Assert.AreEqual((double)expectedX, tapX, 1.5, $"{which} tap has unexpected X value"); - Assert.AreEqual((double)expectedY, tapY, 1.5, $"{which} tap has unexpected Y value"); + ClassicAssert.AreEqual((double)expectedX, tapX, 1.5, $"{which} tap has unexpected X value"); + ClassicAssert.AreEqual((double)expectedY, tapY, 1.5, $"{which} tap has unexpected Y value"); } static (double, double) ParseCoordinates(string text) diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16787.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16787.cs similarity index 72% rename from src/Controls/tests/UITests/Tests/Issues/Issue16787.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16787.cs index 8a2a53269e99..0f7c765babf1 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue16787.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16787.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue16787 : _IssuesUITest { @@ -16,7 +17,7 @@ public Issue16787(TestDevice device) : base(device) [Category(UITestCategories.CollectionView)] public void CollectionViewBindingContextOnlyChangesOnce() { - Assert.AreEqual("1", App.WaitForElement("LabelBindingCount").GetText()); + ClassicAssert.AreEqual("1", App.WaitForElement("LabelBindingCount").GetText()); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue16918.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16918.cs similarity index 74% rename from src/Controls/tests/UITests/Tests/Issues/Issue16918.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16918.cs index 8b2b352e4be7..3f5300cb6121 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue16918.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue16918.cs @@ -1,8 +1,9 @@ +#if WINDOWS using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue16918 : _IssuesUITest { @@ -16,15 +17,10 @@ public Issue16918(TestDevice device) public void Issue16918Test() { // https://github.com/dotnet/maui/issues/16918 - this.IgnoreIfPlatforms(new[] - { - TestDevice.Mac, - TestDevice.Android, - TestDevice.iOS - }); App.WaitForElement("MenuImage"); VerifyScreenshot(); } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17022.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17022.cs similarity index 88% rename from src/Controls/tests/UITests/Tests/Issues/Issue17022.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17022.cs index 9de8d7537e7f..d29ed5adf4ef 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17022.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17022.cs @@ -1,8 +1,10 @@ -using NUnit.Framework; +#if IOS +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue17022 : _IssuesUITest { @@ -38,11 +40,9 @@ public Issue17022(TestDevice device) public void Issue17022Test(string testButtonID, bool isTopOfScreen, bool requiresScreenshot = false) { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, "This test is only for iOS"); - App.WaitForElement(testButtonID).Click(); var boxView = App.WaitForElement("TopBoxView"); - Assert.NotNull(boxView); + ClassicAssert.NotNull(boxView); var rect = boxView.GetRect(); try { @@ -54,11 +54,11 @@ public void Issue17022Test(string testButtonID, bool isTopOfScreen, bool require { if (isTopOfScreen) { - Assert.AreEqual(rect.Y, 0); + ClassicAssert.AreEqual(rect.Y, 0); } else { - Assert.AreNotEqual(rect.Y, 0); + ClassicAssert.AreNotEqual(rect.Y, 0); } } } @@ -73,3 +73,4 @@ public void Issue17022Test(string testButtonID, bool isTopOfScreen, bool require } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17347.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17347.cs similarity index 92% rename from src/Controls/tests/UITests/Tests/Issues/Issue17347.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17347.cs index 3baf141e01b3..05b23c41457e 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17347.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17347.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue17347 : _IssuesUITest { @@ -26,4 +26,4 @@ public void AppDoesntCrashWhenSettingNewTitleViewOnExistingPage() } } } -} +} \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17366.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17366.cs similarity index 60% rename from src/Controls/tests/UITests/Tests/Issues/Issue17366.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17366.cs index 86d9bf45efe6..b0be59997ce0 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17366.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17366.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue17366 : _IssuesUITest { @@ -16,11 +17,10 @@ public Issue17366(TestDevice device) : base(device) [Category(UITestCategories.Brush)] public void Issue17366Test() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, - "The bug only happens on iOS; see https://github.com/dotnet/maui/pull/17789"); - + // The bug only happens on iOS; see https://github.com/dotnet/maui/pull/17789 App.WaitForElement("WaitForStubControl"); VerifyScreenshot(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17400.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17400.cs similarity index 64% rename from src/Controls/tests/UITests/Tests/Issues/Issue17400.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17400.cs index 965daf016d2c..1882537fb0e3 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17400.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17400.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if WINDOWS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue17400 : _IssuesUITest { @@ -16,8 +17,7 @@ public Issue17400(TestDevice device) [Category(UITestCategories.CollectionView)] public void Issue17400Test() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS, TestDevice.Android, TestDevice.Mac }, - "Is a Windows issue; see https://github.com/dotnet/maui/issues/17400"); + // Is a Windows issue; see https://github.com/dotnet/maui/issues/17400 App.WaitForElement("UpdateBtn"); App.Tap("UpdateBtn"); @@ -26,4 +26,5 @@ public void Issue17400Test() VerifyScreenshot(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17453.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17453.cs similarity index 81% rename from src/Controls/tests/UITests/Tests/Issues/Issue17453.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17453.cs index 51f56aa28395..b02802d1c8e0 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17453.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17453.cs @@ -1,8 +1,10 @@ -using NUnit.Framework; +#if ANDROID +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { class Issue17453 : _IssuesUITest { @@ -15,12 +17,6 @@ public Issue17453(TestDevice device) : base(device) { } public void EntryClearButtonWorksEntryDoesntClearWhenNotClickingOnClear() { // https://github.com/dotnet/maui/issues/17453 - this.IgnoreIfPlatforms(new[] - { - TestDevice.iOS, - TestDevice.Mac, - TestDevice.Windows - }); App.WaitForElement("WaitForStubControl"); string? rtlEntryText = App.FindElement("RtlEntry").GetText(); @@ -39,19 +35,13 @@ public void EntryClearButtonWorksEntryDoesntClearWhenNotClickingOnClear() rtlEntryText = App.FindElement("RtlEntry").GetText(); - Assert.IsNotEmpty(rtlEntryText); + ClassicAssert.IsNotEmpty(rtlEntryText); } [Test] public void EntryClearButtonWorks() { // https://github.com/dotnet/maui/issues/17453 - this.IgnoreIfPlatforms(new[] - { - TestDevice.iOS, - TestDevice.Mac, - TestDevice.Windows - }); App.WaitForElement("WaitForStubControl"); @@ -71,7 +61,8 @@ public void EntryClearButtonWorks() rtlEntryText = App.FindElement("RtlEntry").GetText(); - Assert.IsEmpty(rtlEntryText); + ClassicAssert.IsEmpty(rtlEntryText); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17490.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17490.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/Issues/Issue17490.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17490.cs index b2c68254c576..becefa61589b 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17490.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17490.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue17490 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17610.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17610.cs similarity index 87% rename from src/Controls/tests/UITests/Tests/Issues/Issue17610.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17610.cs index 9460ce7699ca..e31fefe64ee9 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17610.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17610.cs @@ -1,13 +1,11 @@ -using System.Drawing.Imaging; +#if ANDROID using NUnit.Framework; -using OpenQA.Selenium.Appium; using OpenQA.Selenium.Appium.Interactions; -using OpenQA.Selenium.Appium.MultiTouch; using OpenQA.Selenium.Interactions; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue17610 : _IssuesUITest { @@ -21,13 +19,6 @@ public Issue17610(TestDevice device) : base(device) [Category(UITestCategories.RefreshView)] public void RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp() { - this.IgnoreIfPlatforms(new[] - { - TestDevice.iOS, - TestDevice.Mac, - TestDevice.Windows - }); - if (App is not AppiumAndroidApp androidApp) throw new InvalidOperationException($"Invalid App Type For this Test: {App} Expected AppiumAndroidApp."); @@ -52,3 +43,4 @@ public void RefreshIconDisappearsWhenUserCancelsRefreshByScrollingBackUp() } } } +#endif diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17694.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17694.cs similarity index 67% rename from src/Controls/tests/UITests/Tests/Issues/Issue17694.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17694.cs index c85ab917d8c2..80f65514f4f2 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17694.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17694.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if WINDOWS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue17694 : _IssuesUITest { @@ -15,13 +16,6 @@ public Issue17694(TestDevice device) : base(device) [Test] public void Issue17694Test() { - this.IgnoreIfPlatforms(new[] - { - TestDevice.iOS, - TestDevice.Mac, - TestDevice.Android - }); - App.WaitForElement("Spin"); // 1. Click button @@ -31,3 +25,4 @@ public void Issue17694Test() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue17789.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17789.cs similarity index 90% rename from src/Controls/tests/UITests/Tests/Issues/Issue17789.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17789.cs index f2dbe4068d6b..e9c3f04a2701 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue17789.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17789.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue17789 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18111.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18111.cs similarity index 92% rename from src/Controls/tests/UITests/Tests/Issues/Issue18111.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18111.cs index dcce741df479..ad8e0e3106b0 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18111.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18111.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18111 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18242.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18242.cs similarity index 91% rename from src/Controls/tests/UITests/Tests/Issues/Issue18242.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18242.cs index 85b0eee10787..e2387b6220b0 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18242.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18242.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18242 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18282.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18282.cs similarity index 70% rename from src/Controls/tests/UITests/Tests/Issues/Issue18282.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18282.cs index 93bc6f58b830..b727949d58dd 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18282.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18282.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { class Issue18282 : _IssuesUITest { @@ -14,14 +15,10 @@ public Issue18282(TestDevice device) : base(device) { } [Category(UITestCategories.Editor)] public void EditorPlaceholderPosition() { - this.IgnoreIfPlatforms(new[] - { - TestDevice.Android, TestDevice.Mac, TestDevice.Windows - }); - App.WaitForElement("WaitForStubControl"); VerifyScreenshot(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18617.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18617.cs similarity index 80% rename from src/Controls/tests/UITests/Tests/Issues/Issue18617.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18617.cs index 24f6a11f2d4b..1b6521a77c2d 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18617.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18617.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18617 : _IssuesUITest { @@ -23,14 +24,14 @@ public void CommandCanExecuteDisableButton() // 2. The test fails if the 'On' button is still enabled or the 'Off' button is not enabled. var status1 = App.FindElement("StatusLabel").GetText(); - Assert.AreEqual("OnButton disabled OffButton enabled", status1); + ClassicAssert.AreEqual("OnButton disabled OffButton enabled", status1); // 3.Press the 'Off' button. App.Tap("OffButton"); // 4. The test fails if the 'Off' button is still enabled or the 'On' button is not enabled. var status2 = App.FindElement("StatusLabel").GetText(); - Assert.AreEqual("OnButton enabled OffButton disabled", status2); + ClassicAssert.AreEqual("OnButton enabled OffButton disabled", status2); // NOTE: We do not verify snapshots because we already did it in G1. } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18623.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18623.cs similarity index 95% rename from src/Controls/tests/UITests/Tests/Issues/Issue18623.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18623.cs index 3ce1d2f2b92f..a45c38001049 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18623.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18623.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18623 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18645.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18645.cs similarity index 84% rename from src/Controls/tests/UITests/Tests/Issues/Issue18645.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18645.cs index 46d8b772a89b..390fdb1fb37d 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18645.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18645.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18645 : _IssuesUITest { @@ -26,7 +27,7 @@ public void EditorMaxLengthWorks() var editorText = App.FindElement("IssueEditor").GetText(); // MaxLines = 5 - Assert.AreEqual("12345", editorText); + ClassicAssert.AreEqual("12345", editorText); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18647.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18647.cs similarity index 84% rename from src/Controls/tests/UITests/Tests/Issues/Issue18647.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18647.cs index 1e51648f05fd..852e9485b142 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18647.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18647.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18647 : _IssuesUITest { @@ -24,30 +25,30 @@ public void EditorTextTransformWorks() // 2. The test fails if the editor below does not display the string 'aBcDeFg' exactly (case-sensitive). var result2 = App.FindElement("NoneTextTransformEditor").GetText()?.Trim(); - Assert.AreEqual("aBcDeFg", result2); + ClassicAssert.AreEqual("aBcDeFg", result2); // 3. Input the string 'aBcDeFg' into the editor below. App.EnterText("LowercaseTextTransformEditor", "aBcDeFg"); // 4. The test fails if the editor below does not display the string 'abcdefg' exactly (case-sensitive). var result4 = App.FindElement("LowercaseTextTransformEditor").GetText()?.Trim(); - Assert.AreEqual("abcdefg", result4); + ClassicAssert.AreEqual("abcdefg", result4); // 5. Input the string 'aBcDeFg' into the editor below. App.EnterText("UppercaseTextTransformEditor", "aBcDeFg"); // 6. The test fails if the editor below does not display the string 'ABCDEFG' exactly (case-sensitive). var result6 = App.FindElement("UppercaseTextTransformEditor").GetText()?.Trim(); - Assert.AreEqual("ABCDEFG", result6); + ClassicAssert.AreEqual("ABCDEFG", result6); // 7. The test fails if the editor below does not display the string 'abcdefg' exactly (case-sensitive). var result7 = App.FindElement("FilledLowercaseTextTransformEditor").GetText()?.Trim(); - Assert.AreEqual("abcdefg", result7); + ClassicAssert.AreEqual("abcdefg", result7); // 8. The test fails if the editor below does not display the string 'ABCDEFG' exactly (case-sensitive). var result8 = App.FindElement("FilledUppercaseTextTransformEditor").GetText()?.Trim(); - Assert.AreEqual("ABCDEFG", result8); + ClassicAssert.AreEqual("ABCDEFG", result8); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18675.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18675.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/Issues/Issue18675.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18675.cs index d0b0914d1afd..9dcc46ebf867 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18675.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18675.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue186751 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18706.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18706.cs similarity index 89% rename from src/Controls/tests/UITests/Tests/Issues/Issue18706.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18706.cs index 39635f809bee..5eae64d690b9 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18706.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18706.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18706 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18716.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18716.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/Issues/Issue18716.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18716.cs index 715ed535ac3e..1258c815d03f 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18716.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18716.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18716 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18740.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18740.cs similarity index 79% rename from src/Controls/tests/UITests/Tests/Issues/Issue18740.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18740.cs index aec9df5a8c73..d501b91f8abc 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18740.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18740.cs @@ -1,8 +1,10 @@ -using NUnit.Framework; +#if ANDROID +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18740 : _IssuesUITest { @@ -19,8 +21,6 @@ public Issue18740(TestDevice device) [TestCase("SearchBar")] public void Issue18740Test(string view) { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS, TestDevice.Mac, TestDevice.Windows }); - try { // Navigate to the specific View test @@ -36,7 +36,7 @@ public void Issue18740Test(string view) App.Tap($"Test{view}"); // 3. Verify that the virtual keyboard appears. - Assert.IsTrue(App.IsKeyboardShown()); + ClassicAssert.IsTrue(App.IsKeyboardShown()); } finally @@ -45,4 +45,5 @@ public void Issue18740Test(string view) } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18751.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18751.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/Issues/Issue18751.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18751.cs index 605a6774e797..abd7efa9eb83 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18751.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18751.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18751 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18754.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18754.cs similarity index 82% rename from src/Controls/tests/UITests/Tests/Issues/Issue18754.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18754.cs index b563529246a2..a105d1701080 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18754.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18754.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18754 : _IssuesUITest { @@ -23,13 +24,13 @@ public void Issue18754Test() App.Tap("ReadOnlyEditor"); // 2. The test fails if the editor displays the input. - Assert.IsFalse(App.IsKeyboardShown()); + ClassicAssert.IsFalse(App.IsKeyboardShown()); // 3. Attempt to edit the text in the editor below. App.Tap("FilledReadOnlyEditor"); // 4. The test fails if the editor displays the input. - Assert.IsFalse(App.IsKeyboardShown()); + ClassicAssert.IsFalse(App.IsKeyboardShown()); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue18896.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18896.cs similarity index 95% rename from src/Controls/tests/UITests/Tests/Issues/Issue18896.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18896.cs index 4055a6900d96..1c7f7b8dc9e2 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue18896.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18896.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue18896 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19283.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19283.cs similarity index 90% rename from src/Controls/tests/UITests/Tests/Issues/Issue19283.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19283.cs index 954c7f4567ac..368fedfa957e 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19283.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19283.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue19283 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19329.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19329.cs similarity index 91% rename from src/Controls/tests/UITests/Tests/Issues/Issue19329.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19329.cs index e648da80e9d5..e105cd89ef3d 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19329.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19329.cs @@ -3,7 +3,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue19329 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19379.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19379.cs similarity index 74% rename from src/Controls/tests/UITests/Tests/Issues/Issue19379.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19379.cs index 0725ac59284d..ebe4779596fd 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19379.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19379.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue19379 : _IssuesUITest { @@ -16,8 +17,6 @@ public Issue19379(TestDevice device) [Category(UITestCategories.CollectionView)] public void UpdateCollectionViewHeaderTest() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }); - App.WaitForElement("WaitForStubControl"); // 1. Update the CollectionView Header. @@ -28,3 +27,4 @@ public void UpdateCollectionViewHeaderTest() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19509.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19509.cs similarity index 92% rename from src/Controls/tests/UITests/Tests/Issues/Issue19509.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19509.cs index 3140ff89289e..7e2e99e4cf6a 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19509.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19509.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { class Issue19509 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19556.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19556.cs similarity index 70% rename from src/Controls/tests/UITests/Tests/Issues/Issue19556.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19556.cs index 30dc8d22e0e5..74ce952735a2 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19556.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19556.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if ANDROID +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue19556 : _IssuesUITest { @@ -15,11 +16,10 @@ public Issue19556(TestDevice device) [Test] public void SystemFontsShouldRenderCorrectly() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS, TestDevice.Mac, TestDevice.Windows }); - _ = App.WaitForElement("label"); // The test passes if fonts are correctly rendered VerifyScreenshot(); } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19592.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19592.cs similarity index 74% rename from src/Controls/tests/UITests/Tests/Issues/Issue19592.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19592.cs index c8a8e8743ad5..60ff1a41e42c 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19592.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19592.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if ANDROID +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue19592 : _IssuesUITest { @@ -15,8 +16,6 @@ public Issue19592(TestDevice device) : base(device) [Test] public void SpanLineHeightShouldNotGrowProgressively() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS, TestDevice.Mac, TestDevice.Windows }); - _ = App.WaitForElement("label"); // The line height should be the same for each line @@ -26,3 +25,4 @@ public void SpanLineHeightShouldNotGrowProgressively() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19657.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19657.cs similarity index 66% rename from src/Controls/tests/UITests/Tests/Issues/Issue19657.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19657.cs index 43e2a82d581c..ff126abdee65 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19657.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19657.cs @@ -1,9 +1,9 @@ -using System.Drawing; +#if IOS using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue19657 : _IssuesUITest { @@ -15,8 +15,7 @@ public Issue19657(TestDevice device) : base(device) { } [Category(UITestCategories.CarouselView)] public void CarouselItemLoadsInCorrectPosition() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, - "The bug only happens on iOS; see https://github.com/dotnet/maui/issues/19657"); + // The bug only happens on iOS; see https://github.com/dotnet/maui/issues/19657 _ = App.WaitForElement("WaitHere"); @@ -25,4 +24,5 @@ public void CarouselItemLoadsInCorrectPosition() VerifyScreenshot(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19786.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19786.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/Issues/Issue19786.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19786.cs index d0c0ec00f853..fdf68e37e0b8 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19786.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19786.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue19786 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19803.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19803.cs similarity index 72% rename from src/Controls/tests/UITests/Tests/Issues/Issue19803.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19803.cs index 516a9f7788fa..58ae6555b27b 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19803.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19803.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue19803 : _IssuesUITest { @@ -15,8 +16,6 @@ public Issue19803(TestDevice device) : base(device) [Test] public void NoNREWhenChangingGridItemsLayout() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }); - _ = App.WaitForElement("button"); //The test passes if no NullReferenceException is thrown @@ -25,3 +24,4 @@ public void NoNREWhenChangingGridItemsLayout() } } } +#endif diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19926.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19926.cs similarity index 67% rename from src/Controls/tests/UITests/Tests/Issues/Issue19926.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19926.cs index 03c653779667..afff08338c88 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19926.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19926.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if ANDROID +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue19926 : _IssuesUITest { @@ -15,9 +16,9 @@ public Issue19926(TestDevice device) [Test] public void PropertiesShouldBeCorrectlyApplied() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS, TestDevice.Mac, TestDevice.Windows }); _ = App.WaitForElement("boxView"); VerifyScreenshot(); } } +#endif diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue19956.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19956.cs similarity index 85% rename from src/Controls/tests/UITests/Tests/Issues/Issue19956.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19956.cs index 6b57823dfae9..04b7cc6a9ab6 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue19956.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue19956.cs @@ -1,14 +1,13 @@ -using System.Drawing; +#if IOS +using System.Drawing; using NUnit.Framework; using UITest.Appium; using UITest.Core; -using Microsoft.Maui.AppiumTests; -using OpenQA.Selenium.Appium.MultiTouch; using OpenQA.Selenium.Interactions; using OpenQA.Selenium.Appium.Interactions; -using System.Reflection; +using NUnit.Framework.Legacy; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue19956: _IssuesUITest { public Issue19956(TestDevice device) : base(device) { } @@ -19,10 +18,10 @@ public Issue19956(TestDevice device) : base(device) { } [Category(UITestCategories.Entry)] public void ContentAccountsForStickyHeaders() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, - "This is an iOS Keyboard Scrolling issue."); + // This is an iOS Keyboard Scrolling issue. + + var app = App as AppiumApp; - var app = App as AppiumApp; if (app is null) return; @@ -50,10 +49,10 @@ void ValidateEntryPosition (string entryName, AppiumApp app, Rectangle stickyHea var entryRect = App.WaitForElement(entryName).GetRect(); var keyboardPos = KeyboardScrolling.FindiOSKeyboardLocation(app.Driver); - Assert.AreEqual(App.WaitForElement("StickyHeader").GetRect(), stickyHeaderRect); - Assert.Less(stickyHeaderRect.Bottom, entryRect.Top); - Assert.NotNull(keyboardPos); - Assert.Less(entryRect.Bottom, keyboardPos!.Value.Y); + ClassicAssert.AreEqual(App.WaitForElement("StickyHeader").GetRect(), stickyHeaderRect); + ClassicAssert.Less(stickyHeaderRect.Bottom, entryRect.Top); + ClassicAssert.NotNull(keyboardPos); + ClassicAssert.Less(entryRect.Bottom, keyboardPos!.Value.Y); KeyboardScrolling.NextiOSKeyboardPress(app.Driver); } @@ -61,9 +60,6 @@ void ValidateEntryPosition (string entryName, AppiumApp app, Rectangle stickyHea [Test] public void BottomInsetsSetCorrectly() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, - "This is an iOS Keyboard Scrolling issue."); - var app = App as AppiumApp; if (app is null) return; @@ -123,7 +119,8 @@ void CheckForBottomEntry (AppiumApp app) { var bottomEntryRect = App.WaitForElement("Entry12").GetRect(); var keyboardPosition = KeyboardScrolling.FindiOSKeyboardLocation(app.Driver); - Assert.NotNull(keyboardPosition); - Assert.Less(bottomEntryRect.Bottom, keyboardPosition!.Value.Y); + ClassicAssert.NotNull(keyboardPosition); + ClassicAssert.Less(bottomEntryRect.Bottom, keyboardPosition!.Value.Y); } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue20156.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20156.cs similarity index 90% rename from src/Controls/tests/UITests/Tests/Issues/Issue20156.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20156.cs index d3dbd397577e..92c38ed340db 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue20156.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20156.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue20156 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue20199.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20199.cs similarity index 73% rename from src/Controls/tests/UITests/Tests/Issues/Issue20199.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20199.cs index 3599b45bb34e..4db5312819ca 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue20199.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20199.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue20199 : _IssuesUITest { @@ -15,8 +16,6 @@ public Issue20199(TestDevice device) : base(device) [Test] public void TitleViewShouldBeVisible() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }); - _ = App.WaitForElement("button"); App.Click("button"); @@ -25,3 +24,4 @@ public void TitleViewShouldBeVisible() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue20294.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20294.cs similarity index 80% rename from src/Controls/tests/UITests/Tests/Issues/Issue20294.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20294.cs index ddf68bd7a1fe..50889d7fc1f6 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue20294.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20294.cs @@ -1,9 +1,9 @@ -using System.Drawing; +#if IOS using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue20294 : _IssuesUITest { @@ -14,8 +14,6 @@ public Issue20294(TestDevice device) : base(device) { } [Test] public void ScrollToEndDoesntCrash() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }); - App.ScrollTo("FOOTER"); App.ScrollUp("theCollectionView", ScrollStrategy.Gesture, 0.5); App.ScrollDown("theCollectionView", ScrollStrategy.Gesture, 0.5); @@ -24,3 +22,4 @@ public void ScrollToEndDoesntCrash() App.ScrollDown("theCollectionView", ScrollStrategy.Gesture, 0.5); } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue20439.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20439.cs similarity index 80% rename from src/Controls/tests/UITests/Tests/Issues/Issue20439.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20439.cs index d7c804e337f4..c2480a1e0739 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue20439.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20439.cs @@ -1,8 +1,9 @@ +# if IOS using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue20439 : _IssuesUITest { @@ -15,8 +16,6 @@ public Issue20439(TestDevice device) : base(device) [Test] public void ErrorShouldNotBeThrown() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }); - try { _ = App.WaitForElement("GoToTest"); @@ -36,3 +35,4 @@ public void ErrorShouldNotBeThrown() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue20842.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20842.cs similarity index 81% rename from src/Controls/tests/UITests/Tests/Issues/Issue20842.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20842.cs index d89d0f15e067..27612f4fea2d 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue20842.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20842.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if WINDOWS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue20842 : _IssuesUITest { @@ -18,8 +19,6 @@ public Issue20842(TestDevice device) : base(device) [Test] public async Task VerifyCollectionViewItemsAfterScrolling() { - this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Mac]); - App.WaitForElement(scrollUpButton); App.Tap(scrollDownButton); @@ -33,4 +32,4 @@ public async Task VerifyCollectionViewItemsAfterScrolling() } } } - +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue20903.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20903.cs similarity index 83% rename from src/Controls/tests/UITests/Tests/Issues/Issue20903.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20903.cs index 702f989a8c3e..047088572590 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue20903.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20903.cs @@ -1,9 +1,9 @@ -using System.Drawing; -using NUnit.Framework; +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue20903 : _IssuesUITest { @@ -28,6 +28,6 @@ public async Task RegisterTwoDoubleTapHandlersAndCheckNumberOfFiredEventsAsync() IUIElement element = App.FindElement("EventCountLabel"); string? count = element.GetText(); - Assert.AreEqual("4", count); + ClassicAssert.AreEqual("4", count); } } \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue20920.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20920.cs similarity index 67% rename from src/Controls/tests/UITests/Tests/Issues/Issue20920.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20920.cs index 20b7e215c14e..1b131762a567 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue20920.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue20920.cs @@ -1,9 +1,10 @@ -using System.Drawing; +#if ANDROID using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue20920 : _IssuesUITest { @@ -15,7 +16,6 @@ public Issue20920(TestDevice device) : base(device) { } public void ScrollingBothDirectionsWithNestedScrollViews() { // TODO: Correct this test for other platforms - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows, TestDevice.iOS }); var initialPosition = App.WaitForElement("dotnet_bot").GetRect(); App.ScrollDown("dotnet_bot"); @@ -23,7 +23,8 @@ public void ScrollingBothDirectionsWithNestedScrollViews() var afterScrollPosition = App.WaitForElement("dotnet_bot").GetRect(); - Assert.Less(afterScrollPosition.X, initialPosition.X); - Assert.Less(afterScrollPosition.Y, initialPosition.Y); + ClassicAssert.Less(afterScrollPosition.X, initialPosition.X); + ClassicAssert.Less(afterScrollPosition.Y, initialPosition.Y); } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21202.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21202.cs similarity index 63% rename from src/Controls/tests/UITests/Tests/Issues/Issue21202.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21202.cs index 7cf7f89b7b03..9455e272ba0e 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21202.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21202.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if WINDOWS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21202 : _IssuesUITest { @@ -15,11 +16,10 @@ public Issue21202(TestDevice device) : base(device) [Test] public void Issue21202Test() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.iOS }, "Only Windows for now"); - App.WaitForElement("WaitForStubControl"); VerifyScreenshot(); } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21314.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21314.cs similarity index 80% rename from src/Controls/tests/UITests/Tests/Issues/Issue21314.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21314.cs index f7a97ad5d79f..71f641f55451 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21314.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21314.cs @@ -1,9 +1,10 @@ using Maui.Controls.Sample; using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21314 : _IssuesUITest { public override string Issue => "Image has wrong orientation on iOS"; @@ -18,7 +19,7 @@ public void ImageShouldBePortrait() this.IgnoreIfPlatforms (new TestDevice[] { TestDevice.Android, TestDevice.Windows }); var image = App.WaitForElement ("theImage").GetRect(); - Assert.Greater(image.Height, image.Width); + ClassicAssert.Greater(image.Height, image.Width); } } } \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21394.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21394.cs similarity index 58% rename from src/Controls/tests/UITests/Tests/Issues/Issue21394.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21394.cs index 0857a69f2897..f9b60cc01d91 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21394.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21394.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if WINDOWS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21394 : _IssuesUITest { @@ -15,11 +16,12 @@ public Issue21394(TestDevice device) [Test] public void Issue21394Test() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.iOS, TestDevice.Android }, "iOS will be fixed in https://github.com/dotnet/maui/pull/20953"); + // iOS will be fixed in https://github.com/dotnet/maui/pull/20953 App.WaitForElement("WaitForStubControl"); VerifyScreenshot(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21513.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21513.cs similarity index 90% rename from src/Controls/tests/UITests/Tests/Issues/Issue21513.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21513.cs index caa09527f918..e6acff06d540 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21513.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21513.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21513 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21609.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21609.cs similarity index 77% rename from src/Controls/tests/UITests/Tests/Issues/Issue21609.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21609.cs index c60023cbf3c5..b1e99db15bcb 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21609.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21609.cs @@ -1,9 +1,10 @@ -using System.Drawing; +#if !WINDOWS using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue21609 : _IssuesUITest { @@ -16,7 +17,6 @@ public void ChangingDimensionsOfCarouselViewDoesntUpdateItemDimensions() { // This test is currently not passing on windows // the 3rd size doesn't match the first one - this.IgnoreIfPlatform(TestDevice.Windows); App.WaitForElement("ChangeCarouselViewDimensions"); var imageInitial = App.WaitForElement("DotnetBot").GetRect(); @@ -25,7 +25,8 @@ public void ChangingDimensionsOfCarouselViewDoesntUpdateItemDimensions() App.Tap("ChangeCarouselViewDimensions"); var imageAfterSizeChangedBacktoInitial = App.WaitForElement("DotnetBot").GetRect(); - Assert.AreEqual(imageInitial, imageAfterSizeChangedBacktoInitial); - Assert.AreNotEqual(imageInitial, imageAfterSizeChange); + ClassicAssert.AreEqual(imageInitial, imageAfterSizeChangedBacktoInitial); + ClassicAssert.AreNotEqual(imageInitial, imageAfterSizeChange); } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21630.cs similarity index 87% rename from src/Controls/tests/UITests/Tests/Issues/Issue21630.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21630.cs index eb7d23fdb132..31a2574458be 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21630.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21630.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue21630 : _IssuesUITest { @@ -37,12 +38,12 @@ public void NavBarEntryDoesNotTriggerKeyboardScroll(string scenario) var newNavBarEntry = App.WaitForElement(NavBarEntry + scenarioSuffix); var newNavBarEntryLocation = newNavBarEntry.GetRect(); - Assert.AreEqual(navBarLocation, newNavBarEntryLocation); + ClassicAssert.AreEqual(navBarLocation, newNavBarEntryLocation); var newHeaderEntry = App.WaitForElement(HeaderEntry); var newHeaderLocation = newHeaderEntry.GetRect(); - Assert.AreEqual(headerLocation, newHeaderLocation); + ClassicAssert.AreEqual(headerLocation, newHeaderLocation); App.WaitForElement(RestoreButton); App.Click(RestoreButton); diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21631.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21631.cs similarity index 74% rename from src/Controls/tests/UITests/Tests/Issues/Issue21631.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21631.cs index b99b38986d93..fa66329d03ff 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21631.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21631.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if WINDOWS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21631 : _IssuesUITest { @@ -16,11 +17,10 @@ public Issue21631(TestDevice device) : base(device) { } [Category(UITestCategories.WebView)] public async Task NavigateToStringWithWebviewWorks() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.iOS }); - App.WaitForElement("WaitForWebView"); await Task.Delay(500); VerifyScreenshot(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21706.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21706.cs similarity index 73% rename from src/Controls/tests/UITests/Tests/Issues/Issue21706.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21706.cs index 418b0b19efb8..9793732283f5 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21706.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21706.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if WINDOWS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21706 : _IssuesUITest { @@ -13,7 +14,6 @@ public Issue21706(TestDevice device) : base(device) { } [Test] public async Task ImageButtonStuckAfterRightClick() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.iOS }); App.WaitForElement("WaitForElement"); App.RightClick("WaitForElement"); await Task.Delay(200); @@ -23,3 +23,4 @@ public async Task ImageButtonStuckAfterRightClick() } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21711.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21711.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/Issues/Issue21711.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21711.cs index d3fc4323f6b6..eb471bb76ef1 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21711.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21711.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21711 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21726.cs similarity index 85% rename from src/Controls/tests/UITests/Tests/Issues/Issue21726.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21726.cs index 86faa1e1ac83..ae43a3b9393b 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21726.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21726.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21726 : _IssuesUITest { @@ -22,7 +23,7 @@ public void PushViewControllerWithNullWindow() App.WaitForElement("TextField1").Click(); App.WaitForElement("Button1").Click(); var mainPageElement = App.WaitForElement("AddVC"); - Assert.NotNull(mainPageElement); + ClassicAssert.NotNull(mainPageElement); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21846.cs similarity index 92% rename from src/Controls/tests/UITests/Tests/Issues/Issue21846.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21846.cs index 5332e44725fe..35916395c402 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21846.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21846.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21846 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21967.cs similarity index 78% rename from src/Controls/tests/UITests/Tests/Issues/Issue21967.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21967.cs index 5572789807f2..ed91401c223a 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21967.cs @@ -1,9 +1,10 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using OpenQA.Selenium; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue21967 : _IssuesUITest { @@ -23,8 +24,8 @@ public void CollectionViewItemsResizeWhenContraintsOnCollectionViewChange() App.Tap("Resize"); var smallSize = App.WaitForElement("Item1").GetRect(); - Assert.Greater(largestSize.Width, mediumSize.Width); - Assert.Greater(mediumSize.Width, smallSize.Width); + ClassicAssert.Greater(largestSize.Width, mediumSize.Width); + ClassicAssert.Greater(mediumSize.Width, smallSize.Width); } [Test] @@ -32,7 +33,7 @@ public void CollectionViewItemsResizeWhenContraintsOnCollectionViewChange() public void CollectionViewFirstItemCorrectlySetsTheMeasure() { var itemSize = App.WaitForElement("Item1").GetRect(); - Assert.Greater(200, itemSize.Height); + ClassicAssert.Greater(200, itemSize.Height); } [Test] @@ -52,8 +53,8 @@ public void CollectionViewWorksWhenRotatingDevice() App.SetOrientationPortrait(); var itemSizePortrait2 = App.WaitForElement("Item1").GetRect(); - Assert.Greater(itemSizeLandscape.Width, itemSizePortrait.Width); - Assert.AreEqual(itemSizePortrait2.Width, itemSizePortrait.Width); + ClassicAssert.Greater(itemSizeLandscape.Width, itemSizePortrait.Width); + ClassicAssert.AreEqual(itemSizePortrait2.Width, itemSizePortrait.Width); } finally { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue22000.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22000.cs similarity index 92% rename from src/Controls/tests/UITests/Tests/Issues/Issue22000.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22000.cs index 0dee2977a2a1..98ab2f905b0e 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue22000.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22000.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue22000 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue22035.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22035.cs similarity index 95% rename from src/Controls/tests/UITests/Tests/Issues/Issue22035.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22035.cs index 48b29fe6ce2c..da2f3b75c415 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue22035.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22035.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { [Category(UITestCategories.CarouselView)] public class Issue22035 : _IssuesUITest diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22288.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22288.cs new file mode 100644 index 000000000000..b6a3f4198e8f --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22288.cs @@ -0,0 +1,36 @@ +#if ANDROID || IOS +using NUnit.Framework; +using NUnit.Framework.Legacy; +using UITest.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests.Issues +{ + public class Issue22288 : _IssuesUITest + { + public Issue22288(TestDevice device) : base(device) { } + + public override string Issue => "Top Button Content Causes Infinite Layout"; + + [Test] + [Category(UITestCategories.Button)] + public void AppDoesntFreezeWhenRotatingDevice() + { + try + { + App.SetOrientationPortrait(); + var portraitRect = App.WaitForElement("outerScrollView").GetRect(); + App.SetOrientationLandscape(); + var landscapeRect = App.WaitForElement("outerScrollView").GetRect(); + + ClassicAssert.Greater(landscapeRect.Width, portraitRect.Width); + + } + finally + { + App.SetOrientationPortrait(); + } + } + } +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue3525.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3525.cs similarity index 95% rename from src/Controls/tests/UITests/Tests/Issues/Issue3525.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3525.cs index d1270298f79d..56a39b0e5106 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue3525.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue3525.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues; +namespace Microsoft.Maui.TestCases.Tests.Issues; public class Issue3525 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue5191.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5191.cs similarity index 68% rename from src/Controls/tests/UITests/Tests/Issues/Issue5191.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5191.cs index 8a82b88ca2cc..3f3e1c1e59f7 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue5191.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5191.cs @@ -1,9 +1,10 @@ -using Microsoft.Maui.AppiumTests; +#if ANDROID using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue5191 : _IssuesUITest { @@ -15,9 +16,6 @@ public Issue5191(TestDevice device) : base(device) { } [Category(UITestCategories.Gestures)] public void Issue5191Test() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS, TestDevice.Mac, TestDevice.Windows }, - "Android Test."); - App.WaitForElement("WaitForStubControl"); // 1. Drag and drop. @@ -25,7 +23,8 @@ public void Issue5191Test() // 2. Verify if PanGesture reports a completed event status when the touch is lifted. var result = App.FindElement("WaitForStubControl").GetText(); - Assert.True(result?.Contains("Completed", StringComparison.OrdinalIgnoreCase)); + ClassicAssert.True(result?.Contains("Completed", StringComparison.OrdinalIgnoreCase)); } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue5354.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5354.cs similarity index 64% rename from src/Controls/tests/UITests/Tests/Issues/Issue5354.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5354.cs index 3ad93ff12ed7..d42334831b49 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue5354.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5354.cs @@ -1,10 +1,11 @@ -using Microsoft.Maui.AppiumTests; +#if ANDROID +using Microsoft.Maui.TestCases.Tests; using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; - -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public partial class Issue5354 : _IssuesUITest { @@ -15,10 +16,7 @@ public Issue5354(TestDevice device) : base(device) { } [Test] [Category(UITestCategories.CollectionView)] public void CollectionViewItemsLayoutUpdate() - { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS, TestDevice.Mac, TestDevice.Windows }, - "This is a product bug."); - + { App.WaitForElement("CollectionView5354"); App.WaitForElement("Button5354"); @@ -27,19 +25,20 @@ public void CollectionViewItemsLayoutUpdate() var linearRect0 = App.WaitForElement("Image0").GetRect(); var linearRect1 = App.WaitForElement("Image1").GetRect(); - Assert.AreEqual(linearRect0.X, linearRect1.X); - Assert.GreaterOrEqual(linearRect1.Y, linearRect0.Y + linearRect0.Height); + ClassicAssert.AreEqual(linearRect0.X, linearRect1.X); + ClassicAssert.GreaterOrEqual(linearRect1.Y, linearRect0.Y + linearRect0.Height); App.Click("Button5354"); var gridRect0 = App.WaitForElement("Image0").GetRect(); var gridRect1 = App.WaitForElement("Image1").GetRect(); - Assert.AreEqual(gridRect0.Y, gridRect1.Y); - Assert.AreEqual(gridRect0.Height, gridRect1.Height); - + ClassicAssert.AreEqual(gridRect0.Y, gridRect1.Y); + ClassicAssert.AreEqual(gridRect0.Height, gridRect1.Height); + App.Click("Button5354"); } } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue5555.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5555.cs similarity index 93% rename from src/Controls/tests/UITests/Tests/Issues/Issue5555.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5555.cs index 82981ff19bd0..239a3db64801 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue5555.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5555.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue5555 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue5724.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5724.cs similarity index 50% rename from src/Controls/tests/UITests/Tests/Issues/Issue5724.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5724.cs index b465b8f864f5..71c9d13d091a 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue5724.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5724.cs @@ -1,9 +1,10 @@ -using NUnit.Framework; -using OpenQA.Selenium.Appium.Android; +#if ANDROID +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue5724 : _IssuesUITest { @@ -16,12 +17,7 @@ public Issue5724(TestDevice device) : base(device) [Test] public async Task TappingNextMovesToNextElement() { - this.IgnoreIfPlatforms(new[] - { - TestDevice.Mac, - TestDevice.iOS, - TestDevice.Windows, - }, "Send Keys only works on Android which is why we are ignoring these other platforms"); + // Send Keys only works on Android which is why we are ignoring these other platforms. App.WaitForElement("Entry1"); App.Tap("Entry1"); @@ -31,27 +27,21 @@ public async Task TappingNextMovesToNextElement() App.Tap("SendNext"); await Task.Yield(); - Assert.True(App.IsFocused("Entry2")); + ClassicAssert.True(App.IsFocused("Entry2")); } [Test] public async Task TappingDoneClosesKeyboard() { - this.IgnoreIfPlatforms(new[] - { - TestDevice.Mac, - TestDevice.iOS, - TestDevice.Windows, - }, "Send Keys only works on Android which is why we are ignoring these other platforms"); - App.WaitForElement("EntryDone"); App.Tap("EntryDone"); await Task.Yield(); - Assert.True(App.IsKeyboardShown()); + ClassicAssert.True(App.IsKeyboardShown()); App.Tap("SendDone"); await Task.Yield(); - Assert.False(App.IsKeyboardShown()); + ClassicAssert.False(App.IsKeyboardShown()); } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue5924.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5924.cs similarity index 69% rename from src/Controls/tests/UITests/Tests/Issues/Issue5924.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5924.cs index 6c80f3d87661..c47fa0c49c53 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue5924.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue5924.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue5924 : _IssuesUITest { @@ -21,10 +22,10 @@ public void TableViewViewCellVanishesAfterContentIsUpdated() var entry = App.WaitForElement("entry").GetRect(); var label = App.WaitForElement("label").GetRect(); - Assert.Greater(entry.Height, 0); - Assert.Greater(entry.Width, 0); - Assert.Greater(label.Height, 0); - Assert.Greater(label.Width, 0); + ClassicAssert.Greater(entry.Height, 0); + ClassicAssert.Greater(entry.Width, 0); + ClassicAssert.Greater(label.Height, 0); + ClassicAssert.Greater(label.Width, 0); } } } \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue7562.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7562.cs similarity index 68% rename from src/Controls/tests/UITests/Tests/Issues/Issue7562.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7562.cs index 2da708d523cc..beab54b3abb2 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue7562.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7562.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using NUnit.Framework; +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue7562 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue7823.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7823.cs similarity index 93% rename from src/Controls/tests/UITests/Tests/Issues/Issue7823.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7823.cs index 87d00ce76145..61256fe7785c 100644 --- a/src/Controls/tests/UITests/Tests/Issues/Issue7823.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7823.cs @@ -3,7 +3,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class Issue7823 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/RefreshViewTests.cs similarity index 55% rename from src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/RefreshViewTests.cs index a4c8e215b6e8..6939161b2588 100644 --- a/src/Controls/tests/UITests/Tests/Issues/RefreshViewTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/RefreshViewTests.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class RefreshViewTests : _IssuesUITest { @@ -18,8 +19,8 @@ public void IsRefreshingAndCommandTest() { App.WaitForElement("ToggleRefresh"); App.Tap("ToggleRefresh"); - Assert.IsTrue(App.WaitForTextToBePresentInElement("IsRefreshingLabel", "IsRefreshing: True")); - Assert.IsTrue(App.WaitForTextToBePresentInElement("IsRefreshingLabel", "IsRefreshing: False")); + ClassicAssert.IsTrue(App.WaitForTextToBePresentInElement("IsRefreshingLabel", "IsRefreshing: True")); + ClassicAssert.IsTrue(App.WaitForTextToBePresentInElement("IsRefreshingLabel", "IsRefreshing: False")); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla28570.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla28570.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla28570.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla28570.cs index c702ad743d36..f5fff2602c09 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla28570.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla28570.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class Bugzilla28570UITests : _IssuesUITest diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla35127.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla35127.cs similarity index 87% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla35127.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla35127.cs index 99590ea4659d..bb7ebd4a85ac 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla35127.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla35127.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class Bugzilla35127UITests : _IssuesUITest @@ -23,7 +24,7 @@ public void Issue35127Test() App.WaitForNoElement("See me?"); var count = App.FindElements("scrollView").Count; - Assert.IsTrue(count == 0); + ClassicAssert.IsTrue(count == 0); App.WaitForNoElement("Click Me?"); } } diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla41415.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla41415.cs similarity index 83% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla41415.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla41415.cs index cb4333674d40..3e5a20e7abf1 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla41415.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla41415.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if !IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class Bugzilla41415UITests : _IssuesUITest @@ -20,8 +21,7 @@ public Bugzilla41415UITests(TestDevice device) [Test] public void Bugzilla41415Test() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.iOS }, - "This test is failing, likely due to product issue"); + // This test is failing, likely due to product issue App.WaitForElement(ButtonId); App.Tap(ButtonId); @@ -36,4 +36,5 @@ public void Bugzilla41415Test() App.WaitForNoElement("a: False"); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla44461.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla44461.cs similarity index 83% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla44461.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla44461.cs index 232582e97c3a..bcd440cc4f7a 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla44461.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla44461.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class Bugzilla44461UITests : _IssuesUITest @@ -22,8 +23,8 @@ public void Bugzilla44461Test() "This test is failing, likely due to product issue"); var positions = TapButton(0); - Assert.AreEqual(positions.initialPosition.X, positions.finalPosition.X); - Assert.LessOrEqual(positions.finalPosition.X, 1); + ClassicAssert.AreEqual(positions.initialPosition.X, positions.finalPosition.X); + ClassicAssert.LessOrEqual(positions.finalPosition.X, 1); App.Screenshot("Button0 is aligned with the left side of the screen"); } diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla49069.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla49069.cs similarity index 92% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla49069.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla49069.cs index 1cfdeac359bd..a03a498b2b2c 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.Bugzilla49069.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla49069.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class Bugzilla49069UITests : _IssuesUITest diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollChangeOrientation.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollChangeOrientation.cs similarity index 85% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollChangeOrientation.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollChangeOrientation.cs index e5f24b935bd6..2cb9e74d5680 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollChangeOrientation.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollChangeOrientation.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if ANDROID || IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class ScrollChangeOrientationUITests : _IssuesUITest @@ -18,8 +19,6 @@ public ScrollChangeOrientationUITests(TestDevice device) [Test] public void ScrollRotationRelayoutIssue() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows }); - try { App.WaitForElement("Button1"); @@ -44,4 +43,5 @@ public void ScrollRotationRelayoutIssue() } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewDelayedContent.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewDelayedContent.cs similarity index 95% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewDelayedContent.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewDelayedContent.cs index 00aa458d3544..03ac8beb3a65 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewDelayedContent.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewDelayedContent.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class ScrollViewDelayedContentUITests : _IssuesUITest diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewDisableScroll.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewDisableScroll.cs similarity index 97% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewDisableScroll.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewDisableScroll.cs index c3135c94349d..6ca8bfaca33f 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewDisableScroll.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewDisableScroll.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class ScrollViewDisableScrollUITests : _IssuesUITest diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewIsEnabled.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewIsEnabled.cs similarity index 96% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewIsEnabled.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewIsEnabled.cs index 04cd48e1bffe..8e90ebbc886e 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewIsEnabled.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewIsEnabled.cs @@ -1,8 +1,9 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class ScrollViewIsEnabledTests : _IssuesUITest @@ -66,7 +67,7 @@ public void ScrollViewInitiallyEnabledThenDisabled() // 4. Shouldn't have scrolled. var success = App.FindElement(Success).GetText(); // Shouldn't have scrolled, so no success label should be displayed - Assert.IsEmpty(success); + ClassicAssert.IsEmpty(success); this.Back(); } @@ -86,7 +87,7 @@ public void ScrollViewInitiallyNotEnabled() // 2. Shouldn't have scrolled. var success = App.FindElement(Success).GetText(); // Shouldn't have scrolled, so no success label should be displayed - Assert.IsEmpty(success); + ClassicAssert.IsEmpty(success); this.Back(); } diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewNoContent.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewNoContent.cs similarity index 94% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewNoContent.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewNoContent.cs index d2bfad3f43f9..de4371bab35a 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewNoContent.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewNoContent.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class ScrollViewNoContentUITests : _IssuesUITest diff --git a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewObjectDisposed.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewObjectDisposed.cs similarity index 95% rename from src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewObjectDisposed.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewObjectDisposed.cs index 24698b62a117..f31309a79df4 100644 --- a/src/Controls/tests/UITests/Tests/Issues/ScrollViewUITests.ScrollViewObjectDisposed.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.ScrollViewObjectDisposed.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class ScrollViewObjectDisposedUITests : _IssuesUITest diff --git a/src/Controls/tests/UITests/Tests/Issues/SoftInputExtensionsPageTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/SoftInputExtensionsPageTests.cs similarity index 64% rename from src/Controls/tests/UITests/Tests/Issues/SoftInputExtensionsPageTests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/SoftInputExtensionsPageTests.cs index 86b32281712d..22eac82f2534 100644 --- a/src/Controls/tests/UITests/Tests/Issues/SoftInputExtensionsPageTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/SoftInputExtensionsPageTests.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class SoftInputExtensionsPageTests : _IssuesUITest { @@ -17,9 +18,9 @@ public void SoftInputExtensionsPageTest() // Make sure the buttons appear on the screen. Task.Delay(1000).Wait(); App.Tap("ShowKeyboard"); - Assert.IsTrue(App.WaitForTextToBePresentInElement("Result", "True")); + ClassicAssert.IsTrue(App.WaitForTextToBePresentInElement("Result", "True")); App.Tap("HideKeyboard"); - Assert.IsTrue(App.WaitForTextToBePresentInElement("Result", "False")); + ClassicAssert.IsTrue(App.WaitForTextToBePresentInElement("Result", "False")); } } } diff --git a/src/Controls/tests/UITests/Tests/Issues/XFIssue2681.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue2681.cs similarity index 91% rename from src/Controls/tests/UITests/Tests/Issues/XFIssue2681.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue2681.cs index 8305067b9cc2..5c31147eb3fc 100644 --- a/src/Controls/tests/UITests/Tests/Issues/XFIssue2681.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue2681.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests.Issues +namespace Microsoft.Maui.TestCases.Tests.Issues { public class XFIssue2681 : _IssuesUITest { diff --git a/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs similarity index 95% rename from src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs index 747ab9fd00c6..01648d2b8bf1 100644 --- a/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/_IssuesUITest.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public abstract class _IssuesUITest : UITest { diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrolling.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrolling.cs similarity index 96% rename from src/Controls/tests/UITests/Tests/KeyboardScrolling.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrolling.cs index b89eb7516150..d4eefd9ab61d 100644 --- a/src/Controls/tests/UITests/Tests/KeyboardScrolling.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrolling.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using NUnit.Framework.Legacy; using OpenQA.Selenium.Appium; using OpenQA.Selenium.Appium.Interactions; using OpenQA.Selenium.Appium.MultiTouch; @@ -6,7 +7,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal static class KeyboardScrolling { @@ -79,12 +80,12 @@ static bool CheckIfViewAboveKeyboard(IApp app, string marked, bool isEditor) if (!app.IsKeyboardShown()) return false; - Assert.NotNull(views); + ClassicAssert.NotNull(views); var rect = views.GetRect(); var testApp = app as AppiumApp; var keyboardPositionNullable = FindiOSKeyboardLocation(testApp?.Driver); - Assert.NotNull(keyboardPositionNullable); + ClassicAssert.NotNull(keyboardPositionNullable); var keyboardPosition = (System.Drawing.Point)keyboardPositionNullable!; if (isEditor) @@ -95,7 +96,7 @@ static bool CheckIfViewAboveKeyboard(IApp app, string marked, bool isEditor) keyboardPosition.Y -= defaultSizeAccessoryView; } - Assert.Less(rect.CenterY(), keyboardPosition.Y); + ClassicAssert.Less(rect.CenterY(), keyboardPosition.Y); return true; } diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingGridTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs similarity index 71% rename from src/Controls/tests/UITests/Tests/KeyboardScrollingGridTests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs index 1313ea460d5d..e68a3e7a09fe 100644 --- a/src/Controls/tests/UITests/Tests/KeyboardScrollingGridTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingGridTests.cs @@ -1,12 +1,14 @@ -using Maui.Controls.Sample; +#if IOS +using Maui.Controls.Sample; using NUnit.Framework; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class KeyboardScrollingGridTests : UITest { const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Grid with Star Row"; + public KeyboardScrollingGridTests(TestDevice device) : base(device) { @@ -21,8 +23,8 @@ protected override void FixtureSetup() [Test] public void GridStarRowScrollingTest() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); KeyboardScrolling.GridStarRowScrollingTest(App); } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs similarity index 64% rename from src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs index 38e287b52886..9928d171d34c 100644 --- a/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs @@ -1,8 +1,9 @@ -using Maui.Controls.Sample; +#if IOS +using Maui.Controls.Sample; using NUnit.Framework; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class KeyboardScrollingNonScrollingPageLargeTitlesTests : UITest { @@ -21,22 +22,20 @@ protected override void FixtureSetup() [Test] public void EntriesScrollingPageTest() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); KeyboardScrolling.EntriesScrollingTest(App, KeyboardScrollingGallery); } [Test] public void EditorsScrollingPageTest() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); KeyboardScrolling.EditorsScrollingTest(App, KeyboardScrollingGallery); } [Test] public void EntryNextEditorTest() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); KeyboardScrolling.EntryNextEditorScrollingTest(App, KeyboardScrollingGallery); } } } +#endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs new file mode 100644 index 000000000000..39b895a525f2 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs @@ -0,0 +1,43 @@ +#if IOS +using Maui.Controls.Sample; +using NUnit.Framework; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests +{ + public class KeyboardScrollingNonScrollingPageSmallTitlesTests : UITest + { + const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles"; + public KeyboardScrollingNonScrollingPageSmallTitlesTests(TestDevice device) + : base(device) + { + } + + protected override void FixtureSetup() + { + base.FixtureSetup(); + App.NavigateToGallery(KeyboardScrollingGallery); + } + + /* + [Test] + public void EntriesScrollingPageTest() + { + KeyboardScrolling.EntriesScrollingTest(App, KeyboardScrollingGallery); + } + + [Test] + public void EditorsScrollingPageTest() + { + KeyboardScrolling.EditorsScrollingTest(App, KeyboardScrollingGallery); + } + + [Test] + public void EntryNextEditorTest() + { + KeyboardScrolling.EntryNextEditorScrollingTest(App, KeyboardScrollingGallery); + } + */ + } +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs new file mode 100644 index 000000000000..a659d237f07a --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs @@ -0,0 +1,43 @@ +#if IOS +using Maui.Controls.Sample; +using NUnit.Framework; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests +{ + public class KeyboardScrollingScrollingPageLargeTitlesTests : UITest + { + const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Large Titles"; + public KeyboardScrollingScrollingPageLargeTitlesTests(TestDevice device) + : base(device) + { + } + + protected override void FixtureSetup() + { + base.FixtureSetup(); + App.NavigateToGallery(KeyboardScrollingGallery); + } + + /* + [Test] + public void EntriesScrollingPageTest() + { + KeyboardScrolling.EntriesScrollingTest(App, KeyboardScrollingGallery); + } + + [Test] + public void EditorsScrollingPageTest() + { + KeyboardScrolling.EditorsScrollingTest(App, KeyboardScrollingGallery); + } + + [Test] + public void EntryNextEditorTest() + { + KeyboardScrolling.EntryNextEditorScrollingTest(App, KeyboardScrollingGallery); + } + */ + } +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs new file mode 100644 index 000000000000..87eba98c017c --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs @@ -0,0 +1,43 @@ +#if IOS +using Maui.Controls.Sample; +using NUnit.Framework; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests +{ + public class KeyboardScrollingScrollingPageSmallTitlesTests : UITest + { + const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Small Titles"; + public KeyboardScrollingScrollingPageSmallTitlesTests(TestDevice device) + : base(device) + { + } + + protected override void FixtureSetup() + { + base.FixtureSetup(); + App.NavigateToGallery(KeyboardScrollingGallery); + } + + /* + [Test] + public void EntriesScrollingPageTest() + { + KeyboardScrolling.EntriesScrollingTest(App, KeyboardScrollingGallery); + } + + [Test] + public void EditorsScrollingPageTest() + { + KeyboardScrolling.EditorsScrollingTest(App, KeyboardScrollingGallery); + } + + [Test] + public void EntryNextEditorTest() + { + KeyboardScrolling.EntryNextEditorScrollingTest(App, KeyboardScrollingGallery); + } + */ + } +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/LabelUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/LabelUITests.cs similarity index 84% rename from src/Controls/tests/UITests/Tests/LabelUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/LabelUITests.cs index 8f3ca0558ce6..54127ace7a66 100644 --- a/src/Controls/tests/UITests/Tests/LabelUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/LabelUITests.cs @@ -1,10 +1,10 @@ using Maui.Controls.Sample; -using Microsoft.Maui.AppiumTests; using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests; +namespace Microsoft.Maui.TestCases.Tests; public class LabelUITests : _ViewUITests { @@ -36,7 +36,7 @@ public void SpanTapped() remote.GoTo(); var textBeforeClick = remote.GetEventLabel().GetText(); - Assert.AreEqual("Event: SpanTapped (none)", textBeforeClick); + ClassicAssert.AreEqual("Event: SpanTapped (none)", textBeforeClick); // TODO: This will probably fail on desktops because the tap is in screen coordinates and the // view seems to either be in window or parent coordinates. @@ -44,6 +44,6 @@ public void SpanTapped() App.TapCoordinates(r.X + (r.Height * 3), r.CenterY()); // 3 "heights" in from the left var textAfterClick = remote.GetEventLabel().GetText(); - Assert.AreEqual("Event: SpanTapped (fired 1)", textAfterClick); + ClassicAssert.AreEqual("Event: SpanTapped (fired 1)", textAfterClick); } } diff --git a/src/Controls/tests/UITests/Tests/RadioButtonUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/RadioButtonUITests.cs similarity index 93% rename from src/Controls/tests/UITests/Tests/RadioButtonUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/RadioButtonUITests.cs index 8eb15468cb49..3883b7f6e574 100644 --- a/src/Controls/tests/UITests/Tests/RadioButtonUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/RadioButtonUITests.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class RadioButtonUITests : _ViewUITests { diff --git a/src/Controls/tests/UITests/Tests/ScrollViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs similarity index 96% rename from src/Controls/tests/UITests/Tests/ScrollViewUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs index fe87c3a88a4e..6e41a367f975 100644 --- a/src/Controls/tests/UITests/Tests/ScrollViewUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/ScrollViewUITests.cs @@ -2,7 +2,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { [Category(UITestCategories.ScrollView)] public class ScrollToUITests : UITest @@ -128,19 +128,18 @@ public void ScrollToYTwice() Assert.Ignore("This test is failing, likely due to product issue"); } } - +#if ANDROID || IOS [Test] [Category(UITestCategories.ScrollView)] [Description("Scroll down the ScrollView using a gesture")] public void ScrollUpAndDownWithGestures() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows }); - App.ScrollDown("thescroller", ScrollStrategy.Gesture, 0.75); App.Screenshot("Element scrolled down"); App.ScrollUp("thescroller", ScrollStrategy.Gesture, 0.75); App.Screenshot("Element scrolled up"); } +#endif } } \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/SliderUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs similarity index 86% rename from src/Controls/tests/UITests/Tests/SliderUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs index acb73cffaabd..932f58d027cd 100644 --- a/src/Controls/tests/UITests/Tests/SliderUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/SliderUITests.cs @@ -1,8 +1,9 @@ -using NUnit.Framework; +#if ANDROID || IOS +using NUnit.Framework; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class SliderUITests : UITest { @@ -24,8 +25,6 @@ protected override void FixtureSetup() [Description("Set different slider values")] public void SetSliderValue() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows }); - const string customSlider = "CustomSlider"; App.WaitForElement(customSlider); @@ -42,4 +41,5 @@ public void SetSliderValue() App.Screenshot("Move the thumb to the center"); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/SwipeViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs similarity index 81% rename from src/Controls/tests/UITests/Tests/SwipeViewUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs index 7b864462c61f..3865ae2a94e9 100644 --- a/src/Controls/tests/UITests/Tests/SwipeViewUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/SwipeViewUITests.cs @@ -1,8 +1,10 @@ -using NUnit.Framework; +#if ANDROID || IOS +using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class SwipeViewUITests : UITest { @@ -29,15 +31,13 @@ protected override void FixtureSetup() [Description("Swipe to right the SwipeView")] public void SwipeToRight() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows }); - // 1. Open the SwipeView using a gesture. App.WaitForElement(SwipeViewToRightId); App.SwipeLeftToRight(SwipeViewToRightId); // 2. Check if the SwipeView has been opened correctly. var result = App.FindElement(ResultToRightId).GetText(); - Assert.AreEqual("Success", result); + ClassicAssert.AreEqual("Success", result); App.Screenshot("The SwipeView is Open"); } @@ -47,17 +47,16 @@ public void SwipeToRight() [Description("Swipe to left the SwipeView")] public void SwipeToLeft() { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows }); - // 1. Open the SwipeView using a gesture. App.WaitForElement(SwipeViewToLeftId); App.SwipeRightToLeft(SwipeViewToLeftId); // 2. Check if the SwipeView has been opened correctly. var result = App.FindElement(ResultToLeftId).GetText(); - Assert.AreEqual("Success", result); + ClassicAssert.AreEqual("Success", result); App.Screenshot("The SwipeView is Open"); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/TestContextSetupFixture.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/TestContextSetupFixture.cs similarity index 100% rename from src/Controls/tests/UITests/Tests/TestContextSetupFixture.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/TestContextSetupFixture.cs diff --git a/src/Controls/tests/UITests/Tests/VisualTestContext.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/VisualTestContext.cs similarity index 85% rename from src/Controls/tests/UITests/Tests/VisualTestContext.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/VisualTestContext.cs index b86b057574b2..3b44c8dc4e2a 100644 --- a/src/Controls/tests/UITests/Tests/VisualTestContext.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/VisualTestContext.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using VisualTestUtils; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public class VisualTestContext : ITestContext { diff --git a/src/Controls/tests/UITests/Tests/_ViewUITests.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/_ViewUITests.cs similarity index 76% rename from src/Controls/tests/UITests/Tests/_ViewUITests.cs rename to src/Controls/tests/TestCases.Shared.Tests/Tests/_ViewUITests.cs index 18d77d092fbf..07793b85e963 100644 --- a/src/Controls/tests/UITests/Tests/_ViewUITests.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/_ViewUITests.cs @@ -1,10 +1,11 @@ using Maui.Controls.Sample; using Microsoft.Maui.Controls; using NUnit.Framework; +using NUnit.Framework.Legacy; using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public abstract class _ViewUITests : CoreGalleryBasePageTest { @@ -17,22 +18,22 @@ public virtual void _IsEnabled() remote.GoTo(); var enabled = remote.GetProperty(View.IsEnabledProperty); - Assert.IsTrue(enabled); + ClassicAssert.IsTrue(enabled); remote.TapStateButton(); enabled = remote.GetProperty(View.IsEnabledProperty); - Assert.IsFalse(enabled); + ClassicAssert.IsFalse(enabled); remote.TapStateButton(); var isEnabled = remote.GetStateLabel().GetText(); - Assert.AreEqual("True", isEnabled); + ClassicAssert.AreEqual("True", isEnabled); remote.TapStateButton(); var isDisabled = remote.GetStateLabel().GetText(); - Assert.AreEqual("False", isDisabled); + ClassicAssert.AreEqual("False", isDisabled); } [Test] @@ -43,13 +44,13 @@ public virtual void _IsVisible() App.WaitForElement($"IsVisibleStateButton"); var viewPre = remote.GetViews(); - Assert.AreEqual(1, viewPre.Count); + ClassicAssert.AreEqual(1, viewPre.Count); remote.TapStateButton(); var viewPost = remote.GetViews(); - Assert.AreEqual(0, viewPost.Count); + ClassicAssert.AreEqual(0, viewPost.Count); } } diff --git a/src/Controls/tests/UITests/TypeConverter.cs b/src/Controls/tests/TestCases.Shared.Tests/TypeConverter.cs similarity index 80% rename from src/Controls/tests/UITests/TypeConverter.cs rename to src/Controls/tests/TestCases.Shared.Tests/TypeConverter.cs index 96385332c4c8..8c42748649ea 100644 --- a/src/Controls/tests/UITests/TypeConverter.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/TypeConverter.cs @@ -1,4 +1,4 @@ -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal abstract class TypeConverter { diff --git a/src/Controls/tests/UITests/UITest.cs b/src/Controls/tests/TestCases.Shared.Tests/UITest.cs similarity index 94% rename from src/Controls/tests/UITests/UITest.cs rename to src/Controls/tests/TestCases.Shared.Tests/UITest.cs index 4cd8a5531eff..d751a8020d3c 100644 --- a/src/Controls/tests/UITests/UITest.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/UITest.cs @@ -6,7 +6,7 @@ using VisualTestUtils; using VisualTestUtils.MagickNet; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { #if ANDROID [TestFixture(TestDevice.Android)] @@ -33,11 +33,9 @@ protected UITest(TestDevice testDevice) : base(testDevice) { string? ciArtifactsDirectory = Environment.GetEnvironmentVariable("BUILD_ARTIFACTSTAGINGDIRECTORY"); if (ciArtifactsDirectory != null) - ciArtifactsDirectory = Path.Combine(ciArtifactsDirectory, "Controls.AppiumTests"); + ciArtifactsDirectory = Path.Combine(ciArtifactsDirectory, "Controls.TestCases.Shared.Tests"); - string assemblyDirectory = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory)!; - string repoRootDirectory = Path.GetFullPath(Path.Combine(assemblyDirectory, "..", "..", "..", "..", "..")); - string projectRootDirectory = Path.GetFullPath(Path.Combine(repoRootDirectory, "src", "Controls", "tests", "UITests")); + string projectRootDirectory = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory)!; _visualRegressionTester = new VisualRegressionTester(testRootDirectory: projectRootDirectory, visualComparer: new MagickNetVisualComparer(), @@ -63,7 +61,7 @@ public override IConfig GetTestConfig() switch (_testDevice) { case TestDevice.Android: - config.SetProperty("DeviceName", Environment.GetEnvironmentVariable("DEVICE_SKIN") ?? "Nexus 5X"); + config.SetProperty("DeviceName", Environment.GetEnvironmentVariable("DEVICE_SKIN") ?? ""); config.SetProperty("PlatformVersion", Environment.GetEnvironmentVariable("PLATFORM_VERSION") ?? ""); config.SetProperty("Udid", Environment.GetEnvironmentVariable("DEVICE_UDID") ?? ""); break; diff --git a/src/Controls/tests/UITests/UITestCategories.cs b/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs similarity index 98% rename from src/Controls/tests/UITests/UITestCategories.cs rename to src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs index 7b95f199114c..d08e4194c378 100644 --- a/src/Controls/tests/UITests/UITestCategories.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/UITestCategories.cs @@ -1,4 +1,4 @@ -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal static class UITestCategories { diff --git a/src/Controls/tests/UITests/UtilExtensions.cs b/src/Controls/tests/TestCases.Shared.Tests/UtilExtensions.cs similarity index 97% rename from src/Controls/tests/UITests/UtilExtensions.cs rename to src/Controls/tests/TestCases.Shared.Tests/UtilExtensions.cs index 7b5c834ec464..801862b6f34f 100644 --- a/src/Controls/tests/UITests/UtilExtensions.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/UtilExtensions.cs @@ -3,7 +3,7 @@ using UITest.Appium.NUnit; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { public static class UtilExtensions { diff --git a/src/Controls/tests/UITests/ViewContainers/BaseViewContainerRemote.cs b/src/Controls/tests/TestCases.Shared.Tests/ViewContainers/BaseViewContainerRemote.cs similarity index 99% rename from src/Controls/tests/UITests/ViewContainers/BaseViewContainerRemote.cs rename to src/Controls/tests/TestCases.Shared.Tests/ViewContainers/BaseViewContainerRemote.cs index 5c9cfb0719f5..da1eeabb7044 100644 --- a/src/Controls/tests/UITests/ViewContainers/BaseViewContainerRemote.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/ViewContainers/BaseViewContainerRemote.cs @@ -4,7 +4,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal abstract partial class BaseViewContainerRemote { diff --git a/src/Controls/tests/UITests/ViewContainers/EventViewContainerRemote.cs b/src/Controls/tests/TestCases.Shared.Tests/ViewContainers/EventViewContainerRemote.cs similarity index 92% rename from src/Controls/tests/UITests/ViewContainers/EventViewContainerRemote.cs rename to src/Controls/tests/TestCases.Shared.Tests/ViewContainers/EventViewContainerRemote.cs index 7dd43fe11aa4..ac1030cc65ba 100644 --- a/src/Controls/tests/UITests/ViewContainers/EventViewContainerRemote.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/ViewContainers/EventViewContainerRemote.cs @@ -1,7 +1,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal sealed class EventViewContainerRemote : BaseViewContainerRemote { diff --git a/src/Controls/tests/UITests/ViewContainers/LayeredViewContainerRemote.cs b/src/Controls/tests/TestCases.Shared.Tests/ViewContainers/LayeredViewContainerRemote.cs similarity index 91% rename from src/Controls/tests/UITests/ViewContainers/LayeredViewContainerRemote.cs rename to src/Controls/tests/TestCases.Shared.Tests/ViewContainers/LayeredViewContainerRemote.cs index 1e88c85dddfd..4e9ac7303c0e 100644 --- a/src/Controls/tests/UITests/ViewContainers/LayeredViewContainerRemote.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/ViewContainers/LayeredViewContainerRemote.cs @@ -1,7 +1,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal sealed class LayeredViewContainerRemote : BaseViewContainerRemote { diff --git a/src/Controls/tests/UITests/ViewContainers/StateViewContainerRemote.cs b/src/Controls/tests/TestCases.Shared.Tests/ViewContainers/StateViewContainerRemote.cs similarity index 92% rename from src/Controls/tests/UITests/ViewContainers/StateViewContainerRemote.cs rename to src/Controls/tests/TestCases.Shared.Tests/ViewContainers/StateViewContainerRemote.cs index 703e538847eb..bd7c0aa28ad6 100644 --- a/src/Controls/tests/UITests/ViewContainers/StateViewContainerRemote.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/ViewContainers/StateViewContainerRemote.cs @@ -1,7 +1,7 @@ using UITest.Appium; using UITest.Core; -namespace Microsoft.Maui.AppiumTests +namespace Microsoft.Maui.TestCases.Tests { internal sealed class StateViewContainerRemote : BaseViewContainerRemote { diff --git a/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj b/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj new file mode 100644 index 000000000000..b9a21822ebd4 --- /dev/null +++ b/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj @@ -0,0 +1,55 @@ + + + + $(_MauiDotNetTfm) + enable + enable + true + Microsoft.Maui.TestCases.Tests + $(DefineConstants);WINDOWS;WINTEST + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Controls/tests/TestCases.WinUI.Tests/PlatformSpecificSampleTest.cs b/src/Controls/tests/TestCases.WinUI.Tests/PlatformSpecificSampleTest.cs new file mode 100644 index 000000000000..fe85d182b0ac --- /dev/null +++ b/src/Controls/tests/TestCases.WinUI.Tests/PlatformSpecificSampleTest.cs @@ -0,0 +1,21 @@ +using NUnit.Framework; +using OpenQA.Selenium.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests; + +public class PlatformSpecificSampleTest : UITest +{ + public PlatformSpecificSampleTest(TestDevice testDevice) : base(testDevice) + { + } + + [Test] + public void SampleTest() + { + if (App is AppiumDriver driver) + { + driver?.GetScreenshot().SaveAsFile($"{nameof(SampleTest)}.png"); + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/UITests/snapshots/windows/BorderShouldHaveNoThickness.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderShouldHaveNoThickness.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/BorderShouldHaveNoThickness.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/BorderShouldHaveNoThickness.png diff --git a/src/Controls/tests/UITests/snapshots/windows/ContentPageBackgroundImageSourceWorks.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ContentPageBackgroundImageSourceWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/ContentPageBackgroundImageSourceWorks.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ContentPageBackgroundImageSourceWorks.png diff --git a/src/Controls/tests/UITests/snapshots/windows/DisplayActionSheetStillNotWorkingOnWindows.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/DisplayActionSheetStillNotWorkingOnWindows.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/DisplayActionSheetStillNotWorkingOnWindows.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/DisplayActionSheetStillNotWorkingOnWindows.png diff --git a/src/Controls/tests/UITests/snapshots/windows/EditorBackgroundWorks.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/EditorBackgroundWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/EditorBackgroundWorks.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/EditorBackgroundWorks.png diff --git a/src/Controls/tests/UITests/snapshots/windows/EditorIsReadOnlyPreventModify.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/EditorIsReadOnlyPreventModify.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/EditorIsReadOnlyPreventModify.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/EditorIsReadOnlyPreventModify.png diff --git a/src/Controls/tests/UITests/snapshots/windows/EntryIsPasswordObscureText.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/EntryIsPasswordObscureText.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/EntryIsPasswordObscureText.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/EntryIsPasswordObscureText.png diff --git a/src/Controls/tests/UITests/snapshots/windows/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png diff --git a/src/Controls/tests/UITests/snapshots/windows/ImageButtonStuckAfterRightClick.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ImageButtonStuckAfterRightClick.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/ImageButtonStuckAfterRightClick.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ImageButtonStuckAfterRightClick.png diff --git a/src/Controls/tests/UITests/snapshots/windows/Issue15330Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue15330Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/Issue15330Test.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue15330Test.png diff --git a/src/Controls/tests/UITests/snapshots/windows/Issue16918Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue16918Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/Issue16918Test.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue16918Test.png diff --git a/src/Controls/tests/UITests/snapshots/windows/Issue17400Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue17400Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/Issue17400Test.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue17400Test.png diff --git a/src/Controls/tests/UITests/snapshots/windows/Issue17694Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue17694Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/Issue17694Test.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue17694Test.png diff --git a/src/Controls/tests/UITests/snapshots/windows/Issue18242Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue18242Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/Issue18242Test.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue18242Test.png diff --git a/src/Controls/tests/UITests/snapshots/windows/Issue21202Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue21202Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/Issue21202Test.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue21202Test.png diff --git a/src/Controls/tests/UITests/snapshots/windows/Issue21394Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue21394Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/Issue21394Test.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue21394Test.png diff --git a/src/Controls/tests/UITests/snapshots/windows/Issue21513Test.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue21513Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/Issue21513Test.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/Issue21513Test.png diff --git a/src/Controls/tests/UITests/snapshots/windows/LoadAndVerifyGif.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/LoadAndVerifyGif.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/LoadAndVerifyGif.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/LoadAndVerifyGif.png diff --git a/src/Controls/tests/UITests/snapshots/windows/LoadAndVerifyJpg.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/LoadAndVerifyJpg.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/LoadAndVerifyJpg.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/LoadAndVerifyJpg.png diff --git a/src/Controls/tests/UITests/snapshots/windows/LoadAndVerifyPng.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/LoadAndVerifyPng.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/LoadAndVerifyPng.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/LoadAndVerifyPng.png diff --git a/src/Controls/tests/UITests/snapshots/windows/LoadAndVerifySvg.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/LoadAndVerifySvg.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/LoadAndVerifySvg.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/LoadAndVerifySvg.png diff --git a/src/Controls/tests/UITests/snapshots/windows/NavigateToStringWithWebviewWorks.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/NavigateToStringWithWebviewWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/NavigateToStringWithWebviewWorks.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/NavigateToStringWithWebviewWorks.png diff --git a/src/Controls/tests/UITests/snapshots/windows/ResizeCarouselViewKeepsIndex.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ResizeCarouselViewKeepsIndex.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/ResizeCarouselViewKeepsIndex.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ResizeCarouselViewKeepsIndex.png diff --git a/src/Controls/tests/UITests/snapshots/windows/ShadowsDontRespectControlShape.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowsDontRespectControlShape.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/ShadowsDontRespectControlShape.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShadowsDontRespectControlShape.png diff --git a/src/Controls/tests/UITests/snapshots/windows/UpdateToolbarItemAfterNavigate.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/UpdateToolbarItemAfterNavigate.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/UpdateToolbarItemAfterNavigate.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/UpdateToolbarItemAfterNavigate.png diff --git a/src/Controls/tests/UITests/snapshots/windows/VerifyCollectionViewItemsAfterScrolling.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCollectionViewItemsAfterScrolling.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/windows/VerifyCollectionViewItemsAfterScrolling.png rename to src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyCollectionViewItemsAfterScrolling.png diff --git a/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj b/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj new file mode 100644 index 000000000000..a8e48c7bddc5 --- /dev/null +++ b/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj @@ -0,0 +1,55 @@ + + + + $(_MauiDotNetTfm) + enable + enable + true + Microsoft.Maui.TestCases.Tests + $(DefineConstants);IOS;IOSUITEST + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Controls/tests/TestCases.iOS.Tests/PlatformSpecificSampleTest.cs b/src/Controls/tests/TestCases.iOS.Tests/PlatformSpecificSampleTest.cs new file mode 100644 index 000000000000..fe85d182b0ac --- /dev/null +++ b/src/Controls/tests/TestCases.iOS.Tests/PlatformSpecificSampleTest.cs @@ -0,0 +1,21 @@ +using NUnit.Framework; +using OpenQA.Selenium.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests; + +public class PlatformSpecificSampleTest : UITest +{ + public PlatformSpecificSampleTest(TestDevice testDevice) : base(testDevice) + { + } + + [Test] + public void SampleTest() + { + if (App is AppiumDriver driver) + { + driver?.GetScreenshot().SaveAsFile($"{nameof(SampleTest)}.png"); + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/ContentPageBackgroundImageSourceWorks.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/ContentPageBackgroundImageSourceWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/ContentPageBackgroundImageSourceWorks.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/ContentPageBackgroundImageSourceWorks.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/EditorBackgroundWorks.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/EditorBackgroundWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/EditorBackgroundWorks.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/EditorBackgroundWorks.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/EditorIsReadOnlyPreventModify.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/EditorIsReadOnlyPreventModify.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/EditorIsReadOnlyPreventModify.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/EditorIsReadOnlyPreventModify.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/EditorPlaceholderPosition.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/EditorPlaceholderPosition.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/EditorPlaceholderPosition.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/EditorPlaceholderPosition.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/Issue15330Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/Issue15330Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/Issue15330Test.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/Issue15330Test.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/Issue16094Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/Issue16094Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/Issue16094Test.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/Issue16094Test.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/Issue17366Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/Issue17366Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/Issue17366Test.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/Issue17366Test.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/Issue18751Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/Issue18751Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/Issue18751Test.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/Issue18751Test.png diff --git a/src/Controls/tests/UITests/snapshots/ios-iphonex/SettingMaximumTrackColorOnSliderWorks.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/SettingMaximumTrackColorOnSliderWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios-iphonex/SettingMaximumTrackColorOnSliderWorks.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios-iphonex/SettingMaximumTrackColorOnSliderWorks.png diff --git a/src/Controls/tests/UITests/snapshots/ios/BorderShouldHaveNoThickness.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderShouldHaveNoThickness.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/BorderShouldHaveNoThickness.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/BorderShouldHaveNoThickness.png diff --git a/src/Controls/tests/UITests/snapshots/ios/CarouselItemLoadsInCorrectPosition.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CarouselItemLoadsInCorrectPosition.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/CarouselItemLoadsInCorrectPosition.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/CarouselItemLoadsInCorrectPosition.png diff --git a/src/Controls/tests/UITests/snapshots/ios/ContentPageBackgroundImageSourceWorks.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ContentPageBackgroundImageSourceWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/ContentPageBackgroundImageSourceWorks.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ContentPageBackgroundImageSourceWorks.png diff --git a/src/Controls/tests/UITests/snapshots/ios/EditorBackgroundWorks.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EditorBackgroundWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/EditorBackgroundWorks.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EditorBackgroundWorks.png diff --git a/src/Controls/tests/UITests/snapshots/ios/EditorIsReadOnlyPreventModify.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EditorIsReadOnlyPreventModify.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/EditorIsReadOnlyPreventModify.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EditorIsReadOnlyPreventModify.png diff --git a/src/Controls/tests/UITests/snapshots/ios/EditorPlaceholderPosition.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EditorPlaceholderPosition.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/EditorPlaceholderPosition.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EditorPlaceholderPosition.png diff --git a/src/Controls/tests/UITests/snapshots/ios/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/EntryTextColorStopsWorkingAfterPropertyIsUpdatedFromBinding.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue17022TestNewFlyoutPageGridTranslucentButton.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestNewFlyoutPageGridTranslucentButton.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue17022TestNewFlyoutPageGridTranslucentButton.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestNewFlyoutPageGridTranslucentButton.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue17022TestNewNavigationPageGridTranslucentButton.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestNewNavigationPageGridTranslucentButton.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue17022TestNewNavigationPageGridTranslucentButton.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestNewNavigationPageGridTranslucentButton.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue17022TestSemiTransparentFlyoutPageBackgroundColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestSemiTransparentFlyoutPageBackgroundColor.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue17022TestSemiTransparentFlyoutPageBackgroundColor.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestSemiTransparentFlyoutPageBackgroundColor.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue17022TestSemiTransparentFlyoutPageBrush.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestSemiTransparentFlyoutPageBrush.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue17022TestSemiTransparentFlyoutPageBrush.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestSemiTransparentFlyoutPageBrush.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue17022TestSemiTransparentNavigationPageBackgroundColor.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestSemiTransparentNavigationPageBackgroundColor.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue17022TestSemiTransparentNavigationPageBackgroundColor.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestSemiTransparentNavigationPageBackgroundColor.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue17022TestSemiTransparentNavigationPageBrush.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestSemiTransparentNavigationPageBrush.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue17022TestSemiTransparentNavigationPageBrush.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17022TestSemiTransparentNavigationPageBrush.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue17366Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17366Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue17366Test.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue17366Test.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue18242Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue18242Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue18242Test.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue18242Test.png diff --git a/src/Controls/tests/UITests/snapshots/ios/Issue18751Test.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue18751Test.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/Issue18751Test.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue18751Test.png diff --git a/src/Controls/tests/UITests/snapshots/ios/LoadAndVerifyGif.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LoadAndVerifyGif.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/LoadAndVerifyGif.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LoadAndVerifyGif.png diff --git a/src/Controls/tests/UITests/snapshots/ios/LoadAndVerifyJpg.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LoadAndVerifyJpg.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/LoadAndVerifyJpg.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LoadAndVerifyJpg.png diff --git a/src/Controls/tests/UITests/snapshots/ios/LoadAndVerifyPng.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LoadAndVerifyPng.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/LoadAndVerifyPng.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LoadAndVerifyPng.png diff --git a/src/Controls/tests/UITests/snapshots/ios/LoadAndVerifySvg.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LoadAndVerifySvg.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/LoadAndVerifySvg.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/LoadAndVerifySvg.png diff --git a/src/Controls/tests/UITests/snapshots/ios/ResizeCarouselViewKeepsIndex.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ResizeCarouselViewKeepsIndex.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/ResizeCarouselViewKeepsIndex.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ResizeCarouselViewKeepsIndex.png diff --git a/src/Controls/tests/UITests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks-iOS-UITestBaseTearDown-ScreenShot-0b04d693dcdb426aa0e39747f469b61d.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks-iOS-UITestBaseTearDown-ScreenShot-0b04d693dcdb426aa0e39747f469b61d.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks-iOS-UITestBaseTearDown-ScreenShot-0b04d693dcdb426aa0e39747f469b61d.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks-iOS-UITestBaseTearDown-ScreenShot-0b04d693dcdb426aa0e39747f469b61d.png diff --git a/src/Controls/tests/UITests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SettingMaximumTrackColorOnSliderWorks.png diff --git a/src/Controls/tests/UITests/snapshots/ios/ShadowsDontRespectControlShape.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowsDontRespectControlShape.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/ShadowsDontRespectControlShape.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShadowsDontRespectControlShape.png diff --git a/src/Controls/tests/UITests/snapshots/ios/TitleViewShouldBeVisible.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TitleViewShouldBeVisible.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/TitleViewShouldBeVisible.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/TitleViewShouldBeVisible.png diff --git a/src/Controls/tests/UITests/snapshots/ios/UpdateCollectionViewHeaderTest.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/UpdateCollectionViewHeaderTest.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateCollectionViewHeaderTest.png diff --git a/src/Controls/tests/UITests/snapshots/ios/UpdateToolbarItemAfterNavigate.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateToolbarItemAfterNavigate.png similarity index 100% rename from src/Controls/tests/UITests/snapshots/ios/UpdateToolbarItemAfterNavigate.png rename to src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/UpdateToolbarItemAfterNavigate.png diff --git a/src/Controls/samples/Controls.Sample.UITests/Concepts/ImageLoadingGalleryPage.cs b/src/Controls/tests/TestCases/Concepts/ImageLoadingGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Concepts/ImageLoadingGalleryPage.cs rename to src/Controls/tests/TestCases/Concepts/ImageLoadingGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Concepts/InputTransparencyGalleryPage.cs b/src/Controls/tests/TestCases/Concepts/InputTransparencyGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Concepts/InputTransparencyGalleryPage.cs rename to src/Controls/tests/TestCases/Concepts/InputTransparencyGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Controls.Sample.UITests.csproj b/src/Controls/tests/TestCases/Controls.TestCases.App.csproj similarity index 85% rename from src/Controls/samples/Controls.Sample.UITests/Controls.Sample.UITests.csproj rename to src/Controls/tests/TestCases/Controls.TestCases.App.csproj index 2c6296e42374..f0444e1878f9 100644 --- a/src/Controls/samples/Controls.Sample.UITests/Controls.Sample.UITests.csproj +++ b/src/Controls/tests/TestCases/Controls.TestCases.App.csproj @@ -11,7 +11,7 @@ - Controls UITests + Controls TestCases com.microsoft.maui.uitests 1.0 1 @@ -25,12 +25,12 @@ - - + + - - + + @@ -51,5 +51,11 @@ + + + + + + diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreGalleryBasePage.cs b/src/Controls/tests/TestCases/CoreViews/CoreGalleryBasePage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreGalleryBasePage.cs rename to src/Controls/tests/TestCases/CoreViews/CoreGalleryBasePage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreGalleryPage.cs b/src/Controls/tests/TestCases/CoreViews/CoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreGalleryPage.cs rename to src/Controls/tests/TestCases/CoreViews/CoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreNavigationPage.cs b/src/Controls/tests/TestCases/CoreViews/CoreNavigationPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreNavigationPage.cs rename to src/Controls/tests/TestCases/CoreViews/CoreNavigationPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs b/src/Controls/tests/TestCases/CoreViews/CorePageView.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/CorePageView.cs rename to src/Controls/tests/TestCases/CoreViews/CorePageView.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreRootPage.cs b/src/Controls/tests/TestCases/CoreViews/CoreRootPage.cs similarity index 97% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreRootPage.cs rename to src/Controls/tests/TestCases/CoreViews/CoreRootPage.cs index 4cc600e2319d..1eefbbdf883e 100644 --- a/src/Controls/samples/Controls.Sample.UITests/CoreViews/CoreRootPage.cs +++ b/src/Controls/tests/TestCases/CoreViews/CoreRootPage.cs @@ -8,7 +8,7 @@ internal class CoreRootPage : Microsoft.Maui.Controls.ContentPage { public CoreRootPage(Microsoft.Maui.Controls.Page rootPage) { - Title = "Core Gallery"; + Title = "Controls TestCases"; var corePageView = new CorePageView(rootPage); diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/EventViewContainer.cs b/src/Controls/tests/TestCases/CoreViews/ViewContainers/EventViewContainer.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/EventViewContainer.cs rename to src/Controls/tests/TestCases/CoreViews/ViewContainers/EventViewContainer.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/ExpectedEventViewContainer.cs b/src/Controls/tests/TestCases/CoreViews/ViewContainers/ExpectedEventViewContainer.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/ExpectedEventViewContainer.cs rename to src/Controls/tests/TestCases/CoreViews/ViewContainers/ExpectedEventViewContainer.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/IViewContainer.cs b/src/Controls/tests/TestCases/CoreViews/ViewContainers/IViewContainer.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/IViewContainer.cs rename to src/Controls/tests/TestCases/CoreViews/ViewContainers/IViewContainer.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/LayeredViewContainer.cs b/src/Controls/tests/TestCases/CoreViews/ViewContainers/LayeredViewContainer.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/LayeredViewContainer.cs rename to src/Controls/tests/TestCases/CoreViews/ViewContainers/LayeredViewContainer.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/StateViewContainer.cs b/src/Controls/tests/TestCases/CoreViews/ViewContainers/StateViewContainer.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/StateViewContainer.cs rename to src/Controls/tests/TestCases/CoreViews/ViewContainers/StateViewContainer.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/ValueViewContainer.cs b/src/Controls/tests/TestCases/CoreViews/ViewContainers/ValueViewContainer.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/ValueViewContainer.cs rename to src/Controls/tests/TestCases/CoreViews/ViewContainers/ValueViewContainer.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/ViewContainer.cs b/src/Controls/tests/TestCases/CoreViews/ViewContainers/ViewContainer.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/CoreViews/ViewContainers/ViewContainer.cs rename to src/Controls/tests/TestCases/CoreViews/ViewContainers/ViewContainer.cs diff --git a/src/Controls/tests/TestCases/Directory.Build.props b/src/Controls/tests/TestCases/Directory.Build.props new file mode 100644 index 000000000000..a4b44f259892 --- /dev/null +++ b/src/Controls/tests/TestCases/Directory.Build.props @@ -0,0 +1,9 @@ + + + true + true + Maui + $(WarningsNotAsErrors);XC0022;XC0023 + + + diff --git a/src/Controls/tests/TestCases/Directory.Build.targets b/src/Controls/tests/TestCases/Directory.Build.targets new file mode 100644 index 000000000000..ee0f29e9005c --- /dev/null +++ b/src/Controls/tests/TestCases/Directory.Build.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/ActivityIndicatorCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/ActivityIndicatorCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/ActivityIndicatorCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/ActivityIndicatorCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/BorderGallery.cs b/src/Controls/tests/TestCases/Elements/BorderGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/BorderGallery.cs rename to src/Controls/tests/TestCases/Elements/BorderGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/BordersWithVariousShapes.xaml b/src/Controls/tests/TestCases/Elements/BordersWithVariousShapes.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/BordersWithVariousShapes.xaml rename to src/Controls/tests/TestCases/Elements/BordersWithVariousShapes.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/BordersWithVariousShapes.xaml.cs b/src/Controls/tests/TestCases/Elements/BordersWithVariousShapes.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/BordersWithVariousShapes.xaml.cs rename to src/Controls/tests/TestCases/Elements/BordersWithVariousShapes.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/BoxViewCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/BoxViewCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/BoxViewCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/BoxViewCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/ButtonCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/ButtonCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/ButtonCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/ButtonCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/CarouselViewCoreGalleryPage.xaml b/src/Controls/tests/TestCases/Elements/CarouselViewCoreGalleryPage.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/CarouselViewCoreGalleryPage.xaml rename to src/Controls/tests/TestCases/Elements/CarouselViewCoreGalleryPage.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/CarouselViewCoreGalleryPage.xaml.cs b/src/Controls/tests/TestCases/Elements/CarouselViewCoreGalleryPage.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/CarouselViewCoreGalleryPage.xaml.cs rename to src/Controls/tests/TestCases/Elements/CarouselViewCoreGalleryPage.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/CheckBoxCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/CheckBoxCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/CheckBoxCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/CheckBoxCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/CollectionViewCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/CollectionViewCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/CollectionViewCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/CollectionViewCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/ContentViewGalleryPage.cs b/src/Controls/tests/TestCases/Elements/ContentViewGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/ContentViewGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/ContentViewGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DatePickerCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/DatePickerCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DatePickerCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/DatePickerCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DoubleTapGallery.cs b/src/Controls/tests/TestCases/Elements/DoubleTapGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DoubleTapGallery.cs rename to src/Controls/tests/TestCases/Elements/DoubleTapGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropBetweenLayouts.xaml b/src/Controls/tests/TestCases/Elements/DragAndDropBetweenLayouts.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropBetweenLayouts.xaml rename to src/Controls/tests/TestCases/Elements/DragAndDropBetweenLayouts.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropBetweenLayouts.xaml.cs b/src/Controls/tests/TestCases/Elements/DragAndDropBetweenLayouts.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropBetweenLayouts.xaml.cs rename to src/Controls/tests/TestCases/Elements/DragAndDropBetweenLayouts.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropEventArgs.xaml b/src/Controls/tests/TestCases/Elements/DragAndDropEventArgs.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropEventArgs.xaml rename to src/Controls/tests/TestCases/Elements/DragAndDropEventArgs.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropEventArgs.xaml.cs b/src/Controls/tests/TestCases/Elements/DragAndDropEventArgs.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropEventArgs.xaml.cs rename to src/Controls/tests/TestCases/Elements/DragAndDropEventArgs.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropEvents.xaml b/src/Controls/tests/TestCases/Elements/DragAndDropEvents.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropEvents.xaml rename to src/Controls/tests/TestCases/Elements/DragAndDropEvents.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropEvents.xaml.cs b/src/Controls/tests/TestCases/Elements/DragAndDropEvents.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropEvents.xaml.cs rename to src/Controls/tests/TestCases/Elements/DragAndDropEvents.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropGallery.cs b/src/Controls/tests/TestCases/Elements/DragAndDropGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/DragAndDropGallery.cs rename to src/Controls/tests/TestCases/Elements/DragAndDropGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/EditorCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/EditorCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/EditorCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/EditorCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/EntryCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/EntryCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/EntryCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/EntryCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/FrameCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/FrameCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/FrameCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/FrameCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/GestureRecognizerGallery.cs b/src/Controls/tests/TestCases/Elements/GestureRecognizerGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/GestureRecognizerGallery.cs rename to src/Controls/tests/TestCases/Elements/GestureRecognizerGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/ImageButtonCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/ImageButtonCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/ImageButtonCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/ImageButtonCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/ImageCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/ImageCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/ImageCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/ImageCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEditorsPage.xaml b/src/Controls/tests/TestCases/Elements/KeyboardScrollingEditorsPage.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEditorsPage.xaml rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingEditorsPage.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEditorsPage.xaml.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingEditorsPage.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEditorsPage.xaml.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingEditorsPage.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEntriesPage.xaml b/src/Controls/tests/TestCases/Elements/KeyboardScrollingEntriesPage.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEntriesPage.xaml rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingEntriesPage.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEntriesPage.xaml.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingEntriesPage.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEntriesPage.xaml.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingEntriesPage.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEntryNextEditorPage.xaml b/src/Controls/tests/TestCases/Elements/KeyboardScrollingEntryNextEditorPage.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEntryNextEditorPage.xaml rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingEntryNextEditorPage.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEntryNextEditorPage.xaml.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingEntryNextEditorPage.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingEntryNextEditorPage.xaml.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingEntryNextEditorPage.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingGridGallery.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingGridGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingGridGallery.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingGridGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingGridPage.xaml b/src/Controls/tests/TestCases/Elements/KeyboardScrollingGridPage.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingGridPage.xaml rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingGridPage.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingGridPage.xaml.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingGridPage.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingGridPage.xaml.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingGridPage.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingNonScrollingPageLargeTitlesGallery.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingNonScrollingPageLargeTitlesGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingNonScrollingPageLargeTitlesGallery.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingNonScrollingPageLargeTitlesGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingNonScrollingPageSmallTitlesGallery.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingNonScrollingPageSmallTitlesGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingNonScrollingPageSmallTitlesGallery.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingNonScrollingPageSmallTitlesGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingScrollingPageLargeTitlesGallery.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingScrollingPageLargeTitlesGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingScrollingPageLargeTitlesGallery.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingScrollingPageLargeTitlesGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingScrollingPageSmallTitlesGallery.cs b/src/Controls/tests/TestCases/Elements/KeyboardScrollingScrollingPageSmallTitlesGallery.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/KeyboardScrollingScrollingPageSmallTitlesGallery.cs rename to src/Controls/tests/TestCases/Elements/KeyboardScrollingScrollingPageSmallTitlesGallery.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/LabelCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/LabelCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/LabelCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/LabelCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/ListViewCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/ListViewCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/ListViewCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/ListViewCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/PickerCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/PickerCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/PickerCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/PickerCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/PointerGestureRecognizerEvents.xaml b/src/Controls/tests/TestCases/Elements/PointerGestureRecognizerEvents.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/PointerGestureRecognizerEvents.xaml rename to src/Controls/tests/TestCases/Elements/PointerGestureRecognizerEvents.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/PointerGestureRecognizerEvents.xaml.cs b/src/Controls/tests/TestCases/Elements/PointerGestureRecognizerEvents.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/PointerGestureRecognizerEvents.xaml.cs rename to src/Controls/tests/TestCases/Elements/PointerGestureRecognizerEvents.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/ProgressBarCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/ProgressBarCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/ProgressBarCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/ProgressBarCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/RadioButtonCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/RadioButtonCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/RadioButtonCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/RadioButtonCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/ScrollViewCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/ScrollViewCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/ScrollViewCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/ScrollViewCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/SearchBarCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/SearchBarCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/SearchBarCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/SearchBarCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/SliderCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/SliderCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/SliderCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/SliderCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/StepperCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/StepperCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/StepperCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/StepperCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/SwipeViewCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/SwipeViewCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/SwipeViewCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/SwipeViewCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/SwitchCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/SwitchCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/SwitchCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/SwitchCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/TimePickerCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/TimePickerCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/TimePickerCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/TimePickerCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Elements/WebViewCoreGalleryPage.cs b/src/Controls/tests/TestCases/Elements/WebViewCoreGalleryPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Elements/WebViewCoreGalleryPage.cs rename to src/Controls/tests/TestCases/Elements/WebViewCoreGalleryPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/GenericValueConverter.cs b/src/Controls/tests/TestCases/GenericValueConverter.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/GenericValueConverter.cs rename to src/Controls/tests/TestCases/GenericValueConverter.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla28570.cs b/src/Controls/tests/TestCases/Issues/Bugzilla28570.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla28570.cs rename to src/Controls/tests/TestCases/Issues/Bugzilla28570.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla35127.cs b/src/Controls/tests/TestCases/Issues/Bugzilla35127.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla35127.cs rename to src/Controls/tests/TestCases/Issues/Bugzilla35127.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla41415.cs b/src/Controls/tests/TestCases/Issues/Bugzilla41415.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla41415.cs rename to src/Controls/tests/TestCases/Issues/Bugzilla41415.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla44461.cs b/src/Controls/tests/TestCases/Issues/Bugzilla44461.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla44461.cs rename to src/Controls/tests/TestCases/Issues/Bugzilla44461.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla49069.cs b/src/Controls/tests/TestCases/Issues/Bugzilla49069.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Bugzilla49069.cs rename to src/Controls/tests/TestCases/Issues/Bugzilla49069.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/GroupListViewHeaderIndexOutOfRange.cs b/src/Controls/tests/TestCases/Issues/GroupListViewHeaderIndexOutOfRange.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/GroupListViewHeaderIndexOutOfRange.cs rename to src/Controls/tests/TestCases/Issues/GroupListViewHeaderIndexOutOfRange.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/HideSoftInputOnTappedPage.cs b/src/Controls/tests/TestCases/Issues/HideSoftInputOnTappedPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/HideSoftInputOnTappedPage.cs rename to src/Controls/tests/TestCases/Issues/HideSoftInputOnTappedPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/IsInvokeRequiredRaceCondition.cs b/src/Controls/tests/TestCases/Issues/IsInvokeRequiredRaceCondition.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/IsInvokeRequiredRaceCondition.cs rename to src/Controls/tests/TestCases/Issues/IsInvokeRequiredRaceCondition.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue10234.cs b/src/Controls/tests/TestCases/Issues/Issue10234.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue10234.cs rename to src/Controls/tests/TestCases/Issues/Issue10234.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue10947.xaml b/src/Controls/tests/TestCases/Issues/Issue10947.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue10947.xaml rename to src/Controls/tests/TestCases/Issues/Issue10947.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue10947.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue10947.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue10947.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue10947.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue11501.cs b/src/Controls/tests/TestCases/Issues/Issue11501.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue11501.cs rename to src/Controls/tests/TestCases/Issues/Issue11501.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue12211.xaml b/src/Controls/tests/TestCases/Issues/Issue12211.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue12211.xaml rename to src/Controls/tests/TestCases/Issues/Issue12211.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue12211.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue12211.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue12211.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue12211.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue12567.cs b/src/Controls/tests/TestCases/Issues/Issue12567.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue12567.cs rename to src/Controls/tests/TestCases/Issues/Issue12567.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue14257.cs b/src/Controls/tests/TestCases/Issues/Issue14257.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue14257.cs rename to src/Controls/tests/TestCases/Issues/Issue14257.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue14557.cs b/src/Controls/tests/TestCases/Issues/Issue14557.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue14557.cs rename to src/Controls/tests/TestCases/Issues/Issue14557.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue14829.cs b/src/Controls/tests/TestCases/Issues/Issue14829.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue14829.cs rename to src/Controls/tests/TestCases/Issues/Issue14829.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue15357.xaml b/src/Controls/tests/TestCases/Issues/Issue15357.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue15357.xaml rename to src/Controls/tests/TestCases/Issues/Issue15357.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue15357.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue15357.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue15357.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue15357.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue15826.xaml b/src/Controls/tests/TestCases/Issues/Issue15826.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue15826.xaml rename to src/Controls/tests/TestCases/Issues/Issue15826.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue15826.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue15826.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue15826.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue15826.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue16386.cs b/src/Controls/tests/TestCases/Issues/Issue16386.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue16386.cs rename to src/Controls/tests/TestCases/Issues/Issue16386.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue16499.cs b/src/Controls/tests/TestCases/Issues/Issue16499.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue16499.cs rename to src/Controls/tests/TestCases/Issues/Issue16499.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue16787.cs b/src/Controls/tests/TestCases/Issues/Issue16787.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue16787.cs rename to src/Controls/tests/TestCases/Issues/Issue16787.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue16918.xaml b/src/Controls/tests/TestCases/Issues/Issue16918.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue16918.xaml rename to src/Controls/tests/TestCases/Issues/Issue16918.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue16918.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue16918.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue16918.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue16918.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17022.xaml b/src/Controls/tests/TestCases/Issues/Issue17022.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17022.xaml rename to src/Controls/tests/TestCases/Issues/Issue17022.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17022.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue17022.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17022.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue17022.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17347.cs b/src/Controls/tests/TestCases/Issues/Issue17347.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17347.cs rename to src/Controls/tests/TestCases/Issues/Issue17347.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17400.xaml b/src/Controls/tests/TestCases/Issues/Issue17400.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17400.xaml rename to src/Controls/tests/TestCases/Issues/Issue17400.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17400.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue17400.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17400.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue17400.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17453.xaml b/src/Controls/tests/TestCases/Issues/Issue17453.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17453.xaml rename to src/Controls/tests/TestCases/Issues/Issue17453.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17453.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue17453.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17453.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue17453.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17490.cs b/src/Controls/tests/TestCases/Issues/Issue17490.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17490.cs rename to src/Controls/tests/TestCases/Issues/Issue17490.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17610.xaml b/src/Controls/tests/TestCases/Issues/Issue17610.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17610.xaml rename to src/Controls/tests/TestCases/Issues/Issue17610.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17610.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue17610.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17610.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue17610.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17642.xaml b/src/Controls/tests/TestCases/Issues/Issue17642.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17642.xaml rename to src/Controls/tests/TestCases/Issues/Issue17642.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17642.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue17642.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17642.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue17642.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17694.cs b/src/Controls/tests/TestCases/Issues/Issue17694.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue17694.cs rename to src/Controls/tests/TestCases/Issues/Issue17694.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242.xaml b/src/Controls/tests/TestCases/Issues/Issue18242.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242.xaml rename to src/Controls/tests/TestCases/Issues/Issue18242.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18242.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18242.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242_2.xaml b/src/Controls/tests/TestCases/Issues/Issue18242_2.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242_2.xaml rename to src/Controls/tests/TestCases/Issues/Issue18242_2.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242_2.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18242_2.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242_2.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18242_2.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18282.xaml b/src/Controls/tests/TestCases/Issues/Issue18282.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18282.xaml rename to src/Controls/tests/TestCases/Issues/Issue18282.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18282.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18282.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18282.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18282.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18457.cs b/src/Controls/tests/TestCases/Issues/Issue18457.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18457.cs rename to src/Controls/tests/TestCases/Issues/Issue18457.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18617.xaml b/src/Controls/tests/TestCases/Issues/Issue18617.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18617.xaml rename to src/Controls/tests/TestCases/Issues/Issue18617.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18617.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18617.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18617.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18617.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18623.xaml b/src/Controls/tests/TestCases/Issues/Issue18623.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18623.xaml rename to src/Controls/tests/TestCases/Issues/Issue18623.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18623.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18623.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18623.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18623.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18645.xaml b/src/Controls/tests/TestCases/Issues/Issue18645.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18645.xaml rename to src/Controls/tests/TestCases/Issues/Issue18645.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18645.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18645.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18645.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18645.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18647.xaml b/src/Controls/tests/TestCases/Issues/Issue18647.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18647.xaml rename to src/Controls/tests/TestCases/Issues/Issue18647.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18647.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18647.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18647.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18647.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18675.xaml b/src/Controls/tests/TestCases/Issues/Issue18675.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18675.xaml rename to src/Controls/tests/TestCases/Issues/Issue18675.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18675.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18675.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18675.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18675.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18706.xaml b/src/Controls/tests/TestCases/Issues/Issue18706.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18706.xaml rename to src/Controls/tests/TestCases/Issues/Issue18706.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18706.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18706.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18706.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18706.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18716.xaml b/src/Controls/tests/TestCases/Issues/Issue18716.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18716.xaml rename to src/Controls/tests/TestCases/Issues/Issue18716.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18716.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18716.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18716.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18716.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740.xaml b/src/Controls/tests/TestCases/Issues/Issue18740.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740.xaml rename to src/Controls/tests/TestCases/Issues/Issue18740.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18740.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18740.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740Editor.xaml b/src/Controls/tests/TestCases/Issues/Issue18740Editor.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740Editor.xaml rename to src/Controls/tests/TestCases/Issues/Issue18740Editor.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740Editor.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18740Editor.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740Editor.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18740Editor.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740Entry.xaml b/src/Controls/tests/TestCases/Issues/Issue18740Entry.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740Entry.xaml rename to src/Controls/tests/TestCases/Issues/Issue18740Entry.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740Entry.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18740Entry.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740Entry.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18740Entry.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740SearchBar.xaml b/src/Controls/tests/TestCases/Issues/Issue18740SearchBar.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740SearchBar.xaml rename to src/Controls/tests/TestCases/Issues/Issue18740SearchBar.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740SearchBar.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18740SearchBar.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18740SearchBar.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18740SearchBar.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18751.xaml b/src/Controls/tests/TestCases/Issues/Issue18751.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18751.xaml rename to src/Controls/tests/TestCases/Issues/Issue18751.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18751.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18751.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18751.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18751.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18754.xaml b/src/Controls/tests/TestCases/Issues/Issue18754.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18754.xaml rename to src/Controls/tests/TestCases/Issues/Issue18754.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18754.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18754.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18754.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18754.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18896.xaml b/src/Controls/tests/TestCases/Issues/Issue18896.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18896.xaml rename to src/Controls/tests/TestCases/Issues/Issue18896.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue18896.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue18896.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue18896.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue18896.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19283.xaml b/src/Controls/tests/TestCases/Issues/Issue19283.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19283.xaml rename to src/Controls/tests/TestCases/Issues/Issue19283.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19283.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19283.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19283.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19283.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19329.xaml b/src/Controls/tests/TestCases/Issues/Issue19329.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19329.xaml rename to src/Controls/tests/TestCases/Issues/Issue19329.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19329.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19329.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19329.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19329.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19379.xaml b/src/Controls/tests/TestCases/Issues/Issue19379.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19379.xaml rename to src/Controls/tests/TestCases/Issues/Issue19379.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19379.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19379.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19379.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19379.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19509.xaml b/src/Controls/tests/TestCases/Issues/Issue19509.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19509.xaml rename to src/Controls/tests/TestCases/Issues/Issue19509.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19509.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19509.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19509.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19509.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19556.xaml b/src/Controls/tests/TestCases/Issues/Issue19556.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19556.xaml rename to src/Controls/tests/TestCases/Issues/Issue19556.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19556.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19556.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19556.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19556.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19592.xaml b/src/Controls/tests/TestCases/Issues/Issue19592.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19592.xaml rename to src/Controls/tests/TestCases/Issues/Issue19592.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19592.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19592.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19592.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19592.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19657.xaml b/src/Controls/tests/TestCases/Issues/Issue19657.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19657.xaml rename to src/Controls/tests/TestCases/Issues/Issue19657.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19657.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19657.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19657.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19657.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19786.xaml b/src/Controls/tests/TestCases/Issues/Issue19786.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19786.xaml rename to src/Controls/tests/TestCases/Issues/Issue19786.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19786.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19786.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19786.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19786.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19803.xaml b/src/Controls/tests/TestCases/Issues/Issue19803.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19803.xaml rename to src/Controls/tests/TestCases/Issues/Issue19803.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19803.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19803.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19803.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19803.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19926.xaml b/src/Controls/tests/TestCases/Issues/Issue19926.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19926.xaml rename to src/Controls/tests/TestCases/Issues/Issue19926.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19926.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19926.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19926.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19926.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19956.xaml b/src/Controls/tests/TestCases/Issues/Issue19956.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19956.xaml rename to src/Controls/tests/TestCases/Issues/Issue19956.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue19956.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue19956.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue19956.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue19956.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20156.xaml b/src/Controls/tests/TestCases/Issues/Issue20156.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20156.xaml rename to src/Controls/tests/TestCases/Issues/Issue20156.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20156.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20156.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20156.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue20156.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20199.xaml b/src/Controls/tests/TestCases/Issues/Issue20199.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20199.xaml rename to src/Controls/tests/TestCases/Issues/Issue20199.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20199.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20199.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20199.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue20199.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20294.xaml b/src/Controls/tests/TestCases/Issues/Issue20294.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20294.xaml rename to src/Controls/tests/TestCases/Issues/Issue20294.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20294.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20294.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20294.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue20294.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml b/src/Controls/tests/TestCases/Issues/Issue20439.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml rename to src/Controls/tests/TestCases/Issues/Issue20439.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20439.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue20439.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20842.xaml b/src/Controls/tests/TestCases/Issues/Issue20842.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20842.xaml rename to src/Controls/tests/TestCases/Issues/Issue20842.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20842.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20842.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20842.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue20842.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20903.xaml b/src/Controls/tests/TestCases/Issues/Issue20903.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20903.xaml rename to src/Controls/tests/TestCases/Issues/Issue20903.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20903.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue20903.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20903.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue20903.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20920.cs b/src/Controls/tests/TestCases/Issues/Issue20920.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue20920.cs rename to src/Controls/tests/TestCases/Issues/Issue20920.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21202.xaml b/src/Controls/tests/TestCases/Issues/Issue21202.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21202.xaml rename to src/Controls/tests/TestCases/Issues/Issue21202.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21202.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21202.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21202.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21202.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21314.xaml b/src/Controls/tests/TestCases/Issues/Issue21314.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21314.xaml rename to src/Controls/tests/TestCases/Issues/Issue21314.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21314.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21314.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21314.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21314.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21394.xaml b/src/Controls/tests/TestCases/Issues/Issue21394.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21394.xaml rename to src/Controls/tests/TestCases/Issues/Issue21394.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21394.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21394.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21394.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21394.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21513.xaml b/src/Controls/tests/TestCases/Issues/Issue21513.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21513.xaml rename to src/Controls/tests/TestCases/Issues/Issue21513.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21513.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21513.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21513.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21513.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21609.cs b/src/Controls/tests/TestCases/Issues/Issue21609.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21609.cs rename to src/Controls/tests/TestCases/Issues/Issue21609.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml b/src/Controls/tests/TestCases/Issues/Issue21630.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml rename to src/Controls/tests/TestCases/Issues/Issue21630.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21630.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21630.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml b/src/Controls/tests/TestCases/Issues/Issue21630_navPage.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml rename to src/Controls/tests/TestCases/Issues/Issue21630_navPage.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21630_navPage.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_navPage.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21630_navPage.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml b/src/Controls/tests/TestCases/Issues/Issue21630_shellPage.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml rename to src/Controls/tests/TestCases/Issues/Issue21630_shellPage.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21630_shellPage.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21630_shellPage.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21630_shellPage.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21631.xaml b/src/Controls/tests/TestCases/Issues/Issue21631.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21631.xaml rename to src/Controls/tests/TestCases/Issues/Issue21631.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21631.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21631.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21631.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21631.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21706.xaml b/src/Controls/tests/TestCases/Issues/Issue21706.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21706.xaml rename to src/Controls/tests/TestCases/Issues/Issue21706.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21706.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21706.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21706.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21706.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21711.cs b/src/Controls/tests/TestCases/Issues/Issue21711.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21711.cs rename to src/Controls/tests/TestCases/Issues/Issue21711.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml b/src/Controls/tests/TestCases/Issues/Issue21726.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml rename to src/Controls/tests/TestCases/Issues/Issue21726.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21726.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21726.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21726.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml b/src/Controls/tests/TestCases/Issues/Issue21846.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml rename to src/Controls/tests/TestCases/Issues/Issue21846.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21846.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21846.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml b/src/Controls/tests/TestCases/Issues/Issue21846Modal.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml rename to src/Controls/tests/TestCases/Issues/Issue21846Modal.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21846Modal.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21846Modal.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21846Modal.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml b/src/Controls/tests/TestCases/Issues/Issue21967.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml rename to src/Controls/tests/TestCases/Issues/Issue21967.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue21967.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue21967.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22000.xaml b/src/Controls/tests/TestCases/Issues/Issue22000.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22000.xaml rename to src/Controls/tests/TestCases/Issues/Issue22000.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22000.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue22000.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22000.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue22000.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22035.xaml b/src/Controls/tests/TestCases/Issues/Issue22035.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22035.xaml rename to src/Controls/tests/TestCases/Issues/Issue22035.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22035.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue22035.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22035.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue22035.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22035Page2.xaml b/src/Controls/tests/TestCases/Issues/Issue22035Page2.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22035Page2.xaml rename to src/Controls/tests/TestCases/Issues/Issue22035Page2.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22035Page2.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue22035Page2.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22035Page2.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue22035Page2.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22288.xaml b/src/Controls/tests/TestCases/Issues/Issue22288.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22288.xaml rename to src/Controls/tests/TestCases/Issues/Issue22288.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue22288.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue22288.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue22288.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue22288.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue3525.cs b/src/Controls/tests/TestCases/Issues/Issue3525.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue3525.cs rename to src/Controls/tests/TestCases/Issues/Issue3525.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue5191.xaml b/src/Controls/tests/TestCases/Issues/Issue5191.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue5191.xaml rename to src/Controls/tests/TestCases/Issues/Issue5191.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue5191.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue5191.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue5191.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue5191.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue5354.xaml b/src/Controls/tests/TestCases/Issues/Issue5354.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue5354.xaml rename to src/Controls/tests/TestCases/Issues/Issue5354.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue5354.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue5354.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue5354.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue5354.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue5555.cs b/src/Controls/tests/TestCases/Issues/Issue5555.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue5555.cs rename to src/Controls/tests/TestCases/Issues/Issue5555.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue5724.cs b/src/Controls/tests/TestCases/Issues/Issue5724.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue5724.cs rename to src/Controls/tests/TestCases/Issues/Issue5724.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue5924.xaml b/src/Controls/tests/TestCases/Issues/Issue5924.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue5924.xaml rename to src/Controls/tests/TestCases/Issues/Issue5924.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue5924.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue5924.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue5924.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue5924.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue7562.xaml b/src/Controls/tests/TestCases/Issues/Issue7562.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue7562.xaml rename to src/Controls/tests/TestCases/Issues/Issue7562.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue7562.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue7562.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue7562.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue7562.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue7823.xaml b/src/Controls/tests/TestCases/Issues/Issue7823.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue7823.xaml rename to src/Controls/tests/TestCases/Issues/Issue7823.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue7823.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue7823.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue7823.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue7823.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue7823Page2.xaml b/src/Controls/tests/TestCases/Issues/Issue7823Page2.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue7823Page2.xaml rename to src/Controls/tests/TestCases/Issues/Issue7823Page2.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue7823Page2.xaml.cs b/src/Controls/tests/TestCases/Issues/Issue7823Page2.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issue7823Page2.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issue7823Page2.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues15330.xaml b/src/Controls/tests/TestCases/Issues/Issues15330.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues15330.xaml rename to src/Controls/tests/TestCases/Issues/Issues15330.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues15330.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues15330.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues15330.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues15330.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues15815.xaml b/src/Controls/tests/TestCases/Issues/Issues15815.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues15815.xaml rename to src/Controls/tests/TestCases/Issues/Issues15815.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues15815.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues15815.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues15815.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues15815.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16094.xaml b/src/Controls/tests/TestCases/Issues/Issues16094.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues16094.xaml rename to src/Controls/tests/TestCases/Issues/Issues16094.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16094.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues16094.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues16094.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues16094.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16320.xaml b/src/Controls/tests/TestCases/Issues/Issues16320.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues16320.xaml rename to src/Controls/tests/TestCases/Issues/Issues16320.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16320.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues16320.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues16320.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues16320.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16321.xaml b/src/Controls/tests/TestCases/Issues/Issues16321.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues16321.xaml rename to src/Controls/tests/TestCases/Issues/Issues16321.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16321.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues16321.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues16321.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues16321.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16561.xaml b/src/Controls/tests/TestCases/Issues/Issues16561.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues16561.xaml rename to src/Controls/tests/TestCases/Issues/Issues16561.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues16561.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues16561.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues16561.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues16561.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues17366.xaml b/src/Controls/tests/TestCases/Issues/Issues17366.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues17366.xaml rename to src/Controls/tests/TestCases/Issues/Issues17366.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues17366.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues17366.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues17366.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues17366.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml b/src/Controls/tests/TestCases/Issues/Issues17789.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml rename to src/Controls/tests/TestCases/Issues/Issues17789.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues17789.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues17789.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues17789.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues18111.xaml b/src/Controls/tests/TestCases/Issues/Issues18111.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues18111.xaml rename to src/Controls/tests/TestCases/Issues/Issues18111.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issues18111.xaml.cs b/src/Controls/tests/TestCases/Issues/Issues18111.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/Issues18111.xaml.cs rename to src/Controls/tests/TestCases/Issues/Issues18111.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs b/src/Controls/tests/TestCases/Issues/RefreshViewPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/RefreshViewPage.cs rename to src/Controls/tests/TestCases/Issues/RefreshViewPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/ScrollChangeOrientation.cs b/src/Controls/tests/TestCases/Issues/ScrollChangeOrientation.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/ScrollChangeOrientation.cs rename to src/Controls/tests/TestCases/Issues/ScrollChangeOrientation.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewDelayedContent.cs b/src/Controls/tests/TestCases/Issues/ScrollViewDelayedContent.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewDelayedContent.cs rename to src/Controls/tests/TestCases/Issues/ScrollViewDelayedContent.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewDisableScroll.cs b/src/Controls/tests/TestCases/Issues/ScrollViewDisableScroll.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewDisableScroll.cs rename to src/Controls/tests/TestCases/Issues/ScrollViewDisableScroll.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewIsEnabled.cs b/src/Controls/tests/TestCases/Issues/ScrollViewIsEnabled.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewIsEnabled.cs rename to src/Controls/tests/TestCases/Issues/ScrollViewIsEnabled.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewNoContent.cs b/src/Controls/tests/TestCases/Issues/ScrollViewNoContent.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewNoContent.cs rename to src/Controls/tests/TestCases/Issues/ScrollViewNoContent.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewObjectDisposed.cs b/src/Controls/tests/TestCases/Issues/ScrollViewObjectDisposed.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/ScrollViewObjectDisposed.cs rename to src/Controls/tests/TestCases/Issues/ScrollViewObjectDisposed.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/SoftInputExtensionsPage.cs b/src/Controls/tests/TestCases/Issues/SoftInputExtensionsPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/SoftInputExtensionsPage.cs rename to src/Controls/tests/TestCases/Issues/SoftInputExtensionsPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/TestContentPage.cs b/src/Controls/tests/TestCases/Issues/TestContentPage.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/TestContentPage.cs rename to src/Controls/tests/TestCases/Issues/TestContentPage.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/XFIssue2681.cs b/src/Controls/tests/TestCases/Issues/XFIssue2681.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Issues/XFIssue2681.cs rename to src/Controls/tests/TestCases/Issues/XFIssue2681.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/MainPage.xaml b/src/Controls/tests/TestCases/MainPage.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/MainPage.xaml rename to src/Controls/tests/TestCases/MainPage.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/MainPage.xaml.cs b/src/Controls/tests/TestCases/MainPage.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/MainPage.xaml.cs rename to src/Controls/tests/TestCases/MainPage.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/MauiProgram.cs b/src/Controls/tests/TestCases/MauiProgram.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/MauiProgram.cs rename to src/Controls/tests/TestCases/MauiProgram.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/MultiBindingHack.cs b/src/Controls/tests/TestCases/MultiBindingHack.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/MultiBindingHack.cs rename to src/Controls/tests/TestCases/MultiBindingHack.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Android/AndroidManifest.xml b/src/Controls/tests/TestCases/Platforms/Android/AndroidManifest.xml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Android/AndroidManifest.xml rename to src/Controls/tests/TestCases/Platforms/Android/AndroidManifest.xml diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Android/MainActivity.cs b/src/Controls/tests/TestCases/Platforms/Android/MainActivity.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Android/MainActivity.cs rename to src/Controls/tests/TestCases/Platforms/Android/MainActivity.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Android/MainApplication.cs b/src/Controls/tests/TestCases/Platforms/Android/MainApplication.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Android/MainApplication.cs rename to src/Controls/tests/TestCases/Platforms/Android/MainApplication.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/MacCatalyst/AppDelegate.cs b/src/Controls/tests/TestCases/Platforms/MacCatalyst/AppDelegate.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/MacCatalyst/AppDelegate.cs rename to src/Controls/tests/TestCases/Platforms/MacCatalyst/AppDelegate.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/MacCatalyst/Info.plist b/src/Controls/tests/TestCases/Platforms/MacCatalyst/Info.plist similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/MacCatalyst/Info.plist rename to src/Controls/tests/TestCases/Platforms/MacCatalyst/Info.plist diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/MacCatalyst/Main.cs b/src/Controls/tests/TestCases/Platforms/MacCatalyst/Main.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/MacCatalyst/Main.cs rename to src/Controls/tests/TestCases/Platforms/MacCatalyst/Main.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Tizen/Main.cs b/src/Controls/tests/TestCases/Platforms/Tizen/Main.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Tizen/Main.cs rename to src/Controls/tests/TestCases/Platforms/Tizen/Main.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Tizen/tizen-manifest.xml b/src/Controls/tests/TestCases/Platforms/Tizen/tizen-manifest.xml similarity index 95% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Tizen/tizen-manifest.xml rename to src/Controls/tests/TestCases/Platforms/Tizen/tizen-manifest.xml index 76e9ba8c6a9f..419d1b00e01f 100644 --- a/src/Controls/samples/Controls.Sample.UITests/Platforms/Tizen/tizen-manifest.xml +++ b/src/Controls/tests/TestCases/Platforms/Tizen/tizen-manifest.xml @@ -1,7 +1,7 @@  - + xhdpi/appicon.xhigh.png xhdpi/appicon.xhigh.png hdpi/appicon.high.png diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/App.xaml b/src/Controls/tests/TestCases/Platforms/Windows/App.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/App.xaml rename to src/Controls/tests/TestCases/Platforms/Windows/App.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/App.xaml.cs b/src/Controls/tests/TestCases/Platforms/Windows/App.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/App.xaml.cs rename to src/Controls/tests/TestCases/Platforms/Windows/App.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/Package.appxmanifest b/src/Controls/tests/TestCases/Platforms/Windows/Package.appxmanifest similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/Package.appxmanifest rename to src/Controls/tests/TestCases/Platforms/Windows/Package.appxmanifest diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/PlatformMethods.cs b/src/Controls/tests/TestCases/Platforms/Windows/PlatformMethods.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/PlatformMethods.cs rename to src/Controls/tests/TestCases/Platforms/Windows/PlatformMethods.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/app.manifest b/src/Controls/tests/TestCases/Platforms/Windows/app.manifest similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/Windows/app.manifest rename to src/Controls/tests/TestCases/Platforms/Windows/app.manifest diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/iOS/AppDelegate.cs b/src/Controls/tests/TestCases/Platforms/iOS/AppDelegate.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/iOS/AppDelegate.cs rename to src/Controls/tests/TestCases/Platforms/iOS/AppDelegate.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/iOS/Info.plist b/src/Controls/tests/TestCases/Platforms/iOS/Info.plist similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/iOS/Info.plist rename to src/Controls/tests/TestCases/Platforms/iOS/Info.plist diff --git a/src/Controls/samples/Controls.Sample.UITests/Platforms/iOS/Main.cs b/src/Controls/tests/TestCases/Platforms/iOS/Main.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Platforms/iOS/Main.cs rename to src/Controls/tests/TestCases/Platforms/iOS/Main.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Properties/launchSettings.json b/src/Controls/tests/TestCases/Properties/launchSettings.json similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Properties/launchSettings.json rename to src/Controls/tests/TestCases/Properties/launchSettings.json diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/AppIcons/appicon.svg b/src/Controls/tests/TestCases/Resources/AppIcons/appicon.svg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/AppIcons/appicon.svg rename to src/Controls/tests/TestCases/Resources/AppIcons/appicon.svg diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/AppIcons/appicon_foreground.svg b/src/Controls/tests/TestCases/Resources/AppIcons/appicon_foreground.svg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/AppIcons/appicon_foreground.svg rename to src/Controls/tests/TestCases/Resources/AppIcons/appicon_foreground.svg diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Fonts/OpenSans-Regular.ttf b/src/Controls/tests/TestCases/Resources/Fonts/OpenSans-Regular.ttf similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Fonts/OpenSans-Regular.ttf rename to src/Controls/tests/TestCases/Resources/Fonts/OpenSans-Regular.ttf diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/animated_heart.gif b/src/Controls/tests/TestCases/Resources/Images/animated_heart.gif similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/animated_heart.gif rename to src/Controls/tests/TestCases/Resources/Images/animated_heart.gif diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/dotnet_bot.svg b/src/Controls/tests/TestCases/Resources/Images/dotnet_bot.svg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/dotnet_bot.svg rename to src/Controls/tests/TestCases/Resources/Images/dotnet_bot.svg diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/dotnet_bot_resized.svg b/src/Controls/tests/TestCases/Resources/Images/dotnet_bot_resized.svg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/dotnet_bot_resized.svg rename to src/Controls/tests/TestCases/Resources/Images/dotnet_bot_resized.svg diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/groceries.png b/src/Controls/tests/TestCases/Resources/Images/groceries.png similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/groceries.png rename to src/Controls/tests/TestCases/Resources/Images/groceries.png diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/menu_entry_settings_210.svg b/src/Controls/tests/TestCases/Resources/Images/menu_entry_settings_210.svg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/menu_entry_settings_210.svg rename to src/Controls/tests/TestCases/Resources/Images/menu_entry_settings_210.svg diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/menu_entry_settings_40.svg b/src/Controls/tests/TestCases/Resources/Images/menu_entry_settings_40.svg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/menu_entry_settings_40.svg rename to src/Controls/tests/TestCases/Resources/Images/menu_entry_settings_40.svg diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/oasis.jpg b/src/Controls/tests/TestCases/Resources/Images/oasis.jpg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/oasis.jpg rename to src/Controls/tests/TestCases/Resources/Images/oasis.jpg diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/photo21314.jpg b/src/Controls/tests/TestCases/Resources/Images/photo21314.jpg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/photo21314.jpg rename to src/Controls/tests/TestCases/Resources/Images/photo21314.jpg diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Images/shopping_cart.png b/src/Controls/tests/TestCases/Resources/Images/shopping_cart.png similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Images/shopping_cart.png rename to src/Controls/tests/TestCases/Resources/Images/shopping_cart.png diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Raw/dotnetmaui.pdf b/src/Controls/tests/TestCases/Resources/Raw/dotnetmaui.pdf similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Raw/dotnetmaui.pdf rename to src/Controls/tests/TestCases/Resources/Raw/dotnetmaui.pdf diff --git a/src/Controls/samples/Controls.Sample.UITests/Resources/Splash/splash.svg b/src/Controls/tests/TestCases/Resources/Splash/splash.svg similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Resources/Splash/splash.svg rename to src/Controls/tests/TestCases/Resources/Splash/splash.svg diff --git a/src/Controls/samples/Controls.Sample.UITests/SandboxShell.xaml b/src/Controls/tests/TestCases/SandboxShell.xaml similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/SandboxShell.xaml rename to src/Controls/tests/TestCases/SandboxShell.xaml diff --git a/src/Controls/samples/Controls.Sample.UITests/SandboxShell.xaml.cs b/src/Controls/tests/TestCases/SandboxShell.xaml.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/SandboxShell.xaml.cs rename to src/Controls/tests/TestCases/SandboxShell.xaml.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/TestBuilder.cs b/src/Controls/tests/TestCases/TestBuilder.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/TestBuilder.cs rename to src/Controls/tests/TestCases/TestBuilder.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/TestCases.cs b/src/Controls/tests/TestCases/TestCases.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/TestCases.cs rename to src/Controls/tests/TestCases/TestCases.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Utils/GarbageCollectionHelper.cs b/src/Controls/tests/TestCases/Utils/GarbageCollectionHelper.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Utils/GarbageCollectionHelper.cs rename to src/Controls/tests/TestCases/Utils/GarbageCollectionHelper.cs diff --git a/src/Controls/samples/Controls.Sample.UITests/Utils/Utils.cs b/src/Controls/tests/TestCases/Utils/Utils.cs similarity index 100% rename from src/Controls/samples/Controls.Sample.UITests/Utils/Utils.cs rename to src/Controls/tests/TestCases/Utils/Utils.cs diff --git a/src/Controls/tests/UITests/Axis.cs b/src/Controls/tests/UITests/Axis.cs deleted file mode 100644 index 2492da1c99a1..000000000000 --- a/src/Controls/tests/UITests/Axis.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Microsoft.Maui.AppiumTests -{ - internal enum Axis - { - X, - Y, - Z - } -} \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue22288.cs b/src/Controls/tests/UITests/Tests/Issues/Issue22288.cs deleted file mode 100644 index a5e8722495b7..000000000000 --- a/src/Controls/tests/UITests/Tests/Issues/Issue22288.cs +++ /dev/null @@ -1,34 +0,0 @@ -using NUnit.Framework; -using UITest.Appium; -using UITest.Core; - -namespace Microsoft.Maui.AppiumTests.Issues -{ - public class Issue22288 : _IssuesUITest - { - public Issue22288(TestDevice device) : base(device) { } - - public override string Issue => "Top Button Content Causes Infinite Layout"; - - [Test] - [Category(UITestCategories.Button)] - public void AppDoesntFreezeWhenRotatingDevice() - { - this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows }); - try - { - App.SetOrientationPortrait(); - var portraitRect = App.WaitForElement("outerScrollView").GetRect(); - App.SetOrientationLandscape(); - var landscapeRect = App.WaitForElement("outerScrollView").GetRect(); - - Assert.Greater(landscapeRect.Width, portraitRect.Width); - - } - finally - { - App.SetOrientationPortrait(); - } - } - } -} \ No newline at end of file diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs b/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs deleted file mode 100644 index cf265205451a..000000000000 --- a/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Maui.Controls.Sample; -using NUnit.Framework; -using UITest.Core; - -namespace Microsoft.Maui.AppiumTests -{ - public class KeyboardScrollingNonScrollingPageSmallTitlesTests : UITest - { - const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles"; - public KeyboardScrollingNonScrollingPageSmallTitlesTests(TestDevice device) - : base(device) - { - } - - protected override void FixtureSetup() - { - base.FixtureSetup(); - App.NavigateToGallery(KeyboardScrollingGallery); - } - - // [Test] - // public void EntriesScrollingPageTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EntriesScrollingTest(App, KeyboardScrollingGallery); - // } - - // [Test] - // public void EditorsScrollingPageTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EditorsScrollingTest(App, KeyboardScrollingGallery); - // } - - // [Test] - // public void EntryNextEditorTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EntryNextEditorScrollingTest(App, KeyboardScrollingGallery); - // } - } -} diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs b/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs deleted file mode 100644 index 7eb93d60cf51..000000000000 --- a/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Maui.Controls.Sample; -using NUnit.Framework; -using UITest.Core; - -namespace Microsoft.Maui.AppiumTests -{ - public class KeyboardScrollingScrollingPageLargeTitlesTests : UITest - { - const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Large Titles"; - public KeyboardScrollingScrollingPageLargeTitlesTests(TestDevice device) - : base(device) - { - } - - protected override void FixtureSetup() - { - base.FixtureSetup(); - App.NavigateToGallery(KeyboardScrollingGallery); - } - - // [Test] - // public void EntriesScrollingPageTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EntriesScrollingTest(App, KeyboardScrollingGallery); - // } - - // [Test] - // public void EditorsScrollingPageTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EditorsScrollingTest(App, KeyboardScrollingGallery); - // } - - // [Test] - // public void EntryNextEditorTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EntryNextEditorScrollingTest(App, KeyboardScrollingGallery); - // } - } -} diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs b/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs deleted file mode 100644 index 94ce78e53723..000000000000 --- a/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Maui.Controls.Sample; -using NUnit.Framework; -using UITest.Core; - -namespace Microsoft.Maui.AppiumTests -{ - public class KeyboardScrollingScrollingPageSmallTitlesTests : UITest - { - const string KeyboardScrollingGallery = "Keyboard Scrolling Gallery - Scrolling Page / Small Titles"; - public KeyboardScrollingScrollingPageSmallTitlesTests(TestDevice device) - : base(device) - { - } - - protected override void FixtureSetup() - { - base.FixtureSetup(); - App.NavigateToGallery(KeyboardScrollingGallery); - } - - // [Test] - // public void EntriesScrollingPageTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EntriesScrollingTest(App, KeyboardScrollingGallery); - // } - - // [Test] - // public void EditorsScrollingPageTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EditorsScrollingTest(App, KeyboardScrollingGallery); - // } - - // [Test] - // public void EntryNextEditorTest() - // { - // this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows }, KeyboardScrolling.IgnoreMessage); - // KeyboardScrolling.EntryNextEditorScrollingTest(App, KeyboardScrollingGallery); - // } - } -}