Remove duplicate versions of tests (dotnet#24611)

kubaflo · Sep 7, 2024 · 336f7f4 · 336f7f4
1 parent bcba26f
commit 336f7f4
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 89 deletions.
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla28570.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla28570.cs
@@ -1,29 +1,31 @@
-#if ANDROID
+#if !ANDROID
 using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
 namespace Microsoft.Maui.TestCases.Tests.Issues
 {
-	public class Bugzilla28570 : _IssuesUITest
+	[Category(UITestCategories.ScrollView)]
+	[Category(UITestCategories.Compatibility)]
+	public class Bugzilla28570UITests : _IssuesUITest
 	{
-		public Bugzilla28570(TestDevice testDevice) : base(testDevice)
+		public Bugzilla28570UITests(TestDevice device)
+			: base(device)
 		{
 		}
 
 		public override string Issue => "https://bugzilla.xamarin.com/show_bug.cgi?id=28570";
 
+		// Bugzilla28570 (src\Compatibility\ControlGallery\src\Issues.Shared\Bugzilla28570.cs)
 		[Test]
-		[Category(UITestCategories.Navigation)]
-		[Category(UITestCategories.Compatibility)]
-		[FailsOnAndroid("Scroll to end not working.")]
+		[FailsOnAndroid("This test is failing, likely due to product issue")]
 		public void Bugzilla28570Test()
 		{
-			App.WaitForElement("Tap");
-			App.Screenshot("At test page");
+			App.WaitForElement ("Tap");
+			App.Screenshot ("At test page");
 			App.Tap("Tap");
 
-			App.WaitForElement("28570Target");
+			App.WaitForElement ("28570Target");
 		}
 	}
 }

diff --git a/...Issues/ScrollViewUITests.Bugzilla35127.cs → ...hared.Tests/Tests/Issues/Bugzilla35127.cs b/...Issues/ScrollViewUITests.Bugzilla35127.cs → ...hared.Tests/Tests/Issues/Bugzilla35127.cs
@@ -1,11 +1,13 @@
-using NUnit.Framework;
+#if !IOS && !MACCATALYST
+using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
+	[Category(UITestCategories.Compatibility)]
 	public class Bugzilla35127UITests : _IssuesUITest
 	{
 		public Bugzilla35127UITests(TestDevice device)
@@ -27,4 +29,5 @@ public void Issue35127Test()
 			App.WaitForNoElement("Click Me?");
 		}
 	}
-}
+}
+#endif
diff --git a/...Issues/ScrollViewUITests.Bugzilla41415.cs → ...hared.Tests/Tests/Issues/Bugzilla41415.cs b/...Issues/ScrollViewUITests.Bugzilla41415.cs → ...hared.Tests/Tests/Issues/Bugzilla41415.cs
@@ -3,9 +3,10 @@
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
+	[Category(UITestCategories.Compatibility)]
 	public class Bugzilla41415UITests : _IssuesUITest
 	{
 		const string ButtonId = "ClickId";
@@ -19,6 +20,8 @@ public Bugzilla41415UITests(TestDevice device)
 
 		// Bugzilla41415 (src\Compatibility\ControlGallery\src\Issues.Shared\Bugzilla41415.cs)
 		[Test]
+		[FailsOnIOS("This test is failing, likely due to product issue")]
+		[FailsOnMac("This test is failing, likely due to product issue")]
 		public void Bugzilla41415Test()
 		{
 			// This test is failing, likely due to product issue

diff --git a/...Issues/ScrollViewUITests.Bugzilla44461.cs → ...hared.Tests/Tests/Issues/Bugzilla44461.cs b/...Issues/ScrollViewUITests.Bugzilla44461.cs → ...hared.Tests/Tests/Issues/Bugzilla44461.cs
@@ -1,11 +1,13 @@
-using NUnit.Framework;
+#if ANDROID
+using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
+	[Category(UITestCategories.Compatibility)]
 	public class Bugzilla44461UITests : _IssuesUITest
 	{
 		public Bugzilla44461UITests(TestDevice device)
@@ -38,4 +40,5 @@ public void Bugzilla44461Test()
 			return (initialPosition, finalPosition);
 		}
 	}
-}
+}
+#endif
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla49069.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Bugzilla49069.cs
@@ -4,19 +4,18 @@
 
 namespace Microsoft.Maui.TestCases.Tests.Issues
 {
-	public class Bugzilla49069 : _IssuesUITest
+	[Category(UITestCategories.ScrollView)]
+	public class Bugzilla49069UITests : _IssuesUITest
 	{
-		public Bugzilla49069(TestDevice testDevice) : base(testDevice)
+		public Bugzilla49069UITests(TestDevice device)
+			: base(device)
 		{
 		}
 
 		public override string Issue => "Java.Lang.ArrayIndexOutOfBoundsException when rendering long Label on Android";
 
+		// Bugzilla49069 (src\Compatibility\ControlGallery\src\Issues.Shared\Bugzilla49069.cs)
 		[Test]
-		[Category(UITestCategories.Label)]
-		[Category(UITestCategories.Compatibility)]
-		[FailsOnIOS]
-		[FailsOnMac]
 		public void Bugzilla49069Test()
 		{
 			App.WaitForElement("lblLong");

diff --git a/...ollViewUITests.ScrollChangeOrientation.cs → ...s/Tests/Issues/ScrollChangeOrientation.cs b/...ollViewUITests.ScrollChangeOrientation.cs → ...s/Tests/Issues/ScrollChangeOrientation.cs
@@ -3,7 +3,7 @@
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
 	public class ScrollChangeOrientationUITests : _IssuesUITest

diff --git a/...llViewUITests.ScrollViewDelayedContent.cs → .../Tests/Issues/ScrollViewDelayedContent.cs b/...llViewUITests.ScrollViewDelayedContent.cs → .../Tests/Issues/ScrollViewDelayedContent.cs
@@ -1,8 +1,9 @@
-using NUnit.Framework;
+#if !MACCATALYST && !IOS
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
 	public class ScrollViewDelayedContentUITests : _IssuesUITest
@@ -28,4 +29,5 @@ public async Task MeasuringEmptyScrollViewDoesNotCrash()
 			App.WaitForNoElement("Foo");
 		}
 	}
-}
+}
+#endif
diff --git a/...ollViewUITests.ScrollViewDisableScroll.cs → ...s/Tests/Issues/ScrollViewDisableScroll.cs b/...ollViewUITests.ScrollViewDisableScroll.cs → ...s/Tests/Issues/ScrollViewDisableScroll.cs
@@ -1,8 +1,9 @@
-using NUnit.Framework;
+#if !MACCATALYST && !IOS && !ANDROID && !WINDOWS
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
 	public class ScrollViewDisableScrollUITests : _IssuesUITest
@@ -53,4 +54,5 @@ public void ScrollEnabled()
 			App.WaitForNoElement(FirstItemMark, timeout: TimeSpan.FromSeconds(5));
 		}
 	}
-}
+}
+#endif
diff --git a/.../ScrollViewUITests.ScrollViewIsEnabled.cs → ...Tests/Tests/Issues/ScrollViewIsEnabled.cs b/.../ScrollViewUITests.ScrollViewIsEnabled.cs → ...Tests/Tests/Issues/ScrollViewIsEnabled.cs
@@ -1,9 +1,10 @@
-using NUnit.Framework;
+#if !IOS && !MACCATALYST
+using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
 	public class ScrollViewIsEnabledTests : _IssuesUITest
@@ -120,4 +121,5 @@ public void ScrollViewInitiallyNotEnabledThenEnabled()
 			this.Back();
 		}
 	}
-}
+}
+#endif
diff --git a/.../ScrollViewUITests.ScrollViewNoContent.cs → ...Tests/Tests/Issues/ScrollViewNoContent.cs b/.../ScrollViewUITests.ScrollViewNoContent.cs → ...Tests/Tests/Issues/ScrollViewNoContent.cs
@@ -2,7 +2,7 @@
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
 	public class ScrollViewNoContentUITests : _IssuesUITest

diff --git a/...llViewUITests.ScrollViewObjectDisposed.cs → .../Tests/Issues/ScrollViewObjectDisposed.cs b/...llViewUITests.ScrollViewObjectDisposed.cs → .../Tests/Issues/ScrollViewObjectDisposed.cs
@@ -1,8 +1,9 @@
-using NUnit.Framework;
+#if !ANDROID && !WINDOWS
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
-namespace Microsoft.Maui.TestCases.Tests
+namespace Microsoft.Maui.TestCases.Tests.Issues
 {
 	[Category(UITestCategories.ScrollView)]
 	public class ScrollViewObjectDisposedUITests : _IssuesUITest
@@ -27,4 +28,5 @@ public void ScrollViewObjectDisposedTest()
 			App.WaitForElement("Success");
 		}
 	}
-}
+}
+#endif
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla28570.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla28570.cs
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla49069.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/ScrollViewUITests.Bugzilla49069.cs