From 8250131e10a855d5ee20050d8e5f0d0a2e68eadc Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 14 Nov 2021 00:52:26 +0100 Subject: [PATCH] Rename integration tests now they're not win32-only. --- Avalonia.sln | 2 +- .../AutomationTests.cs | 2 +- .../Avalonia.IntegrationTests.Appium.csproj} | 0 .../ButtonTests.cs | 2 +- .../CheckBoxTests.cs | 2 +- .../ComboBoxTests.cs | 2 +- .../DefaultCollection.cs | 2 +- .../ElementExtensions.cs | 2 +- .../MenuTests.cs | 2 +- .../Properties/AssemblyInfo.cs | 0 .../TestAppFixture.cs | 2 +- .../xunit.runner.json | 0 12 files changed, 9 insertions(+), 9 deletions(-) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/AutomationTests.cs (96%) rename tests/{Avalonia.IntegrationTests.Win32/Avalonia.IntegrationTests.Win32.csproj => Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj} (100%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/ButtonTests.cs (97%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/CheckBoxTests.cs (97%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/ComboBoxTests.cs (96%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/DefaultCollection.cs (76%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/ElementExtensions.cs (95%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/MenuTests.cs (94%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/Properties/AssemblyInfo.cs (100%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/TestAppFixture.cs (98%) rename tests/{Avalonia.IntegrationTests.Win32 => Avalonia.IntegrationTests.Appium}/xunit.runner.json (100%) diff --git a/Avalonia.sln b/Avalonia.sln index d8f202d38e..f0c4ecb832 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -232,7 +232,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniMvvm", "samples\MiniMvv EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTestApp", "samples\IntegrationTestApp\IntegrationTestApp.csproj", "{676D6BFD-029D-4E43-BFC7-3892265CE251}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.IntegrationTests.Win32", "tests\Avalonia.IntegrationTests.Win32\Avalonia.IntegrationTests.Win32.csproj", "{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.IntegrationTests.Appium", "tests\Avalonia.IntegrationTests.Appium\Avalonia.IntegrationTests.Appium.csproj", "{F2CE566B-E7F6-447A-AB1A-3F574A6FE43A}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution diff --git a/tests/Avalonia.IntegrationTests.Win32/AutomationTests.cs b/tests/Avalonia.IntegrationTests.Appium/AutomationTests.cs similarity index 96% rename from tests/Avalonia.IntegrationTests.Win32/AutomationTests.cs rename to tests/Avalonia.IntegrationTests.Appium/AutomationTests.cs index 42fc019e72..38e4a70e88 100644 --- a/tests/Avalonia.IntegrationTests.Win32/AutomationTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/AutomationTests.cs @@ -1,7 +1,7 @@ using OpenQA.Selenium.Appium; using Xunit; -namespace Avalonia.IntegrationTests.Win32 +namespace Avalonia.IntegrationTests.Appium { [Collection("Default")] public class AutomationTests diff --git a/tests/Avalonia.IntegrationTests.Win32/Avalonia.IntegrationTests.Win32.csproj b/tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj similarity index 100% rename from tests/Avalonia.IntegrationTests.Win32/Avalonia.IntegrationTests.Win32.csproj rename to tests/Avalonia.IntegrationTests.Appium/Avalonia.IntegrationTests.Appium.csproj diff --git a/tests/Avalonia.IntegrationTests.Win32/ButtonTests.cs b/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs similarity index 97% rename from tests/Avalonia.IntegrationTests.Win32/ButtonTests.cs rename to tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs index d44d1db1a2..1bae5b1069 100644 --- a/tests/Avalonia.IntegrationTests.Win32/ButtonTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs @@ -1,7 +1,7 @@ using OpenQA.Selenium.Appium; using Xunit; -namespace Avalonia.IntegrationTests.Win32 +namespace Avalonia.IntegrationTests.Appium { [Collection("Default")] public class ButtonTests diff --git a/tests/Avalonia.IntegrationTests.Win32/CheckBoxTests.cs b/tests/Avalonia.IntegrationTests.Appium/CheckBoxTests.cs similarity index 97% rename from tests/Avalonia.IntegrationTests.Win32/CheckBoxTests.cs rename to tests/Avalonia.IntegrationTests.Appium/CheckBoxTests.cs index 71be603dc9..02e7ac60c4 100644 --- a/tests/Avalonia.IntegrationTests.Win32/CheckBoxTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/CheckBoxTests.cs @@ -1,7 +1,7 @@ using OpenQA.Selenium.Appium; using Xunit; -namespace Avalonia.IntegrationTests.Win32 +namespace Avalonia.IntegrationTests.Appium { [Collection("Default")] public class CheckBoxTests diff --git a/tests/Avalonia.IntegrationTests.Win32/ComboBoxTests.cs b/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs similarity index 96% rename from tests/Avalonia.IntegrationTests.Win32/ComboBoxTests.cs rename to tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs index b920974b5c..c5ddb14d4b 100644 --- a/tests/Avalonia.IntegrationTests.Win32/ComboBoxTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs @@ -1,7 +1,7 @@ using OpenQA.Selenium.Appium; using Xunit; -namespace Avalonia.IntegrationTests.Win32 +namespace Avalonia.IntegrationTests.Appium { [Collection("Default")] public class ComboBoxTests diff --git a/tests/Avalonia.IntegrationTests.Win32/DefaultCollection.cs b/tests/Avalonia.IntegrationTests.Appium/DefaultCollection.cs similarity index 76% rename from tests/Avalonia.IntegrationTests.Win32/DefaultCollection.cs rename to tests/Avalonia.IntegrationTests.Appium/DefaultCollection.cs index 1c8f09a430..bb2dd1fbec 100644 --- a/tests/Avalonia.IntegrationTests.Win32/DefaultCollection.cs +++ b/tests/Avalonia.IntegrationTests.Appium/DefaultCollection.cs @@ -1,6 +1,6 @@ using Xunit; -namespace Avalonia.IntegrationTests.Win32 +namespace Avalonia.IntegrationTests.Appium { [CollectionDefinition("Default")] public class DefaultCollection : ICollectionFixture diff --git a/tests/Avalonia.IntegrationTests.Win32/ElementExtensions.cs b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs similarity index 95% rename from tests/Avalonia.IntegrationTests.Win32/ElementExtensions.cs rename to tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs index ac92cd0c5d..8949aa9208 100644 --- a/tests/Avalonia.IntegrationTests.Win32/ElementExtensions.cs +++ b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs @@ -2,7 +2,7 @@ using System; using System.Runtime.InteropServices; using OpenQA.Selenium.Appium; -namespace Avalonia.IntegrationTests.Win32 +namespace Avalonia.IntegrationTests.Appium { internal static class ElementExtensions { diff --git a/tests/Avalonia.IntegrationTests.Win32/MenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs similarity index 94% rename from tests/Avalonia.IntegrationTests.Win32/MenuTests.cs rename to tests/Avalonia.IntegrationTests.Appium/MenuTests.cs index c95bc405e8..1e43330ae2 100644 --- a/tests/Avalonia.IntegrationTests.Win32/MenuTests.cs +++ b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs @@ -1,7 +1,7 @@ using OpenQA.Selenium.Appium; using Xunit; -namespace Avalonia.IntegrationTests.Win32 +namespace Avalonia.IntegrationTests.Appium { [Collection("Default")] public class MenuTests diff --git a/tests/Avalonia.IntegrationTests.Win32/Properties/AssemblyInfo.cs b/tests/Avalonia.IntegrationTests.Appium/Properties/AssemblyInfo.cs similarity index 100% rename from tests/Avalonia.IntegrationTests.Win32/Properties/AssemblyInfo.cs rename to tests/Avalonia.IntegrationTests.Appium/Properties/AssemblyInfo.cs diff --git a/tests/Avalonia.IntegrationTests.Win32/TestAppFixture.cs b/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs similarity index 98% rename from tests/Avalonia.IntegrationTests.Win32/TestAppFixture.cs rename to tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs index 761787872f..f1b8d5773b 100644 --- a/tests/Avalonia.IntegrationTests.Win32/TestAppFixture.cs +++ b/tests/Avalonia.IntegrationTests.Appium/TestAppFixture.cs @@ -7,7 +7,7 @@ using OpenQA.Selenium.Appium.Enums; using OpenQA.Selenium.Appium.Mac; using OpenQA.Selenium.Appium.Windows; -namespace Avalonia.IntegrationTests.Win32 +namespace Avalonia.IntegrationTests.Appium { public class TestAppFixture : IDisposable { diff --git a/tests/Avalonia.IntegrationTests.Win32/xunit.runner.json b/tests/Avalonia.IntegrationTests.Appium/xunit.runner.json similarity index 100% rename from tests/Avalonia.IntegrationTests.Win32/xunit.runner.json rename to tests/Avalonia.IntegrationTests.Appium/xunit.runner.json