- simplify

dotnet · Apr 24, 2024 · b942a6f · b942a6f
1 parent d97adbf
commit b942a6f
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 102 deletions.
diff --git a/src/Controls/tests/UITests/Tests/BorderUITests.cs b/src/Controls/tests/UITests/Tests/BorderUITests.cs
@@ -19,12 +19,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(BorderGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		// TODO: Enable this as a test once fully working
 		//[Test]
 		//[Category(UITestCategories.Border)]

diff --git a/src/Controls/tests/UITests/Tests/CarouselViewUITests.cs b/src/Controls/tests/UITests/Tests/CarouselViewUITests.cs
@@ -19,12 +19,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(CarouselViewGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		[Test]
 		[Category(UITestCategories.CarouselView)]
 		public async Task CarouselViewSetPosition()

diff --git a/src/Controls/tests/UITests/Tests/CoreGalleryBasePageTest.cs b/src/Controls/tests/UITests/Tests/CoreGalleryBasePageTest.cs
@@ -33,20 +33,6 @@ protected override void FixtureSetup()
 			}
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			try
-			{
-				this.Reset();
-			}
-			catch (Exception e)
-			{
-				var name = TestContext.CurrentContext.Test.MethodName ?? TestContext.CurrentContext.Test.Name;
-				TestContext.Error.WriteLine($">>>>> {DateTime.Now} The FixtureTeardown threw an exception during {name}.{Environment.NewLine}Exception details: {e}");
-			}
-		}
-
 		protected abstract void NavigateToGallery();
 	}
 }
diff --git a/src/Controls/tests/UITests/Tests/DragAndDropUITests.cs b/src/Controls/tests/UITests/Tests/DragAndDropUITests.cs
@@ -20,12 +20,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(DragAndDropGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		[Test]
 		[Category(UITestCategories.Gestures)]
 		public void DragEvents()

diff --git a/src/Controls/tests/UITests/Tests/GestureRecognizerUITests.cs b/src/Controls/tests/UITests/Tests/GestureRecognizerUITests.cs
@@ -19,12 +19,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(GestureRecognizerGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		[Test]
 		[Category(UITestCategories.Gestures)]
 		public void PointerGestureTest()

diff --git a/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs b/src/Controls/tests/UITests/Tests/Issues/_IssuesUITest.cs
@@ -34,20 +34,6 @@ protected override void FixtureSetup()
 			}
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			try
-			{
-				Reset();
-			}
-			catch (Exception e)
-			{
-				var name = TestContext.CurrentContext.Test.MethodName ?? TestContext.CurrentContext.Test.Name;
-				TestContext.Error.WriteLine($">>>>> {DateTime.Now} The FixtureTeardown threw an exception during {name}.{Environment.NewLine}Exception details: {e}");
-			}
-		}
-
 		public abstract string Issue { get; }
 
 		private void NavigateToIssue(string issue)

diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingGridTests.cs b/src/Controls/tests/UITests/Tests/KeyboardScrollingGridTests.cs
@@ -18,12 +18,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		[Test]
 		public void GridStarRowScrollingTest()
 		{

diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs b/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageLargeTitlesTests.cs
@@ -18,12 +18,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		[Test]
 		public void EntriesScrollingPageTest()
 		{

diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs b/src/Controls/tests/UITests/Tests/KeyboardScrollingNonScrollingPageSmallTitlesTests.cs
@@ -18,12 +18,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		// [Test]
 		// public void EntriesScrollingPageTest()
 		// {

diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs b/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageLargeTitlesTests.cs
@@ -18,12 +18,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		// [Test]
 		// public void EntriesScrollingPageTest()
 		// {

diff --git a/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs b/src/Controls/tests/UITests/Tests/KeyboardScrollingScrollingPageSmallTitlesTests.cs
@@ -18,12 +18,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(KeyboardScrollingGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		// [Test]
 		// public void EntriesScrollingPageTest()
 		// {

diff --git a/src/Controls/tests/UITests/Tests/ScrollViewUITests.cs b/src/Controls/tests/UITests/Tests/ScrollViewUITests.cs
@@ -20,12 +20,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(LayoutGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		[Test]
 		[Category(UITestCategories.ScrollView)]
 		[Description("Scroll element to the start")]

diff --git a/src/Controls/tests/UITests/Tests/SliderUITests.cs b/src/Controls/tests/UITests/Tests/SliderUITests.cs
@@ -19,12 +19,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(SliderGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		[Test]
 		[Category(UITestCategories.Slider)]
 		[Description("Set different slider values")]

diff --git a/src/Controls/tests/UITests/Tests/SwipeViewUITests.cs b/src/Controls/tests/UITests/Tests/SwipeViewUITests.cs
@@ -24,12 +24,6 @@ protected override void FixtureSetup()
 			App.NavigateToGallery(ScrollViewGallery);
 		}
 
-		protected override void FixtureTeardown()
-		{
-			base.FixtureTeardown();
-			this.Back();
-		}
-
 		[Test]
 		[Category(UITestCategories.SwipeView)]
 		[Description("Swipe to right the SwipeView")]

diff --git a/src/TestUtils/src/UITest.NUnit/UITestBase.cs b/src/TestUtils/src/UITest.NUnit/UITestBase.cs
@@ -49,8 +49,15 @@ protected virtual void FixtureSetup()
 
 		protected virtual void FixtureTeardown()
 		{
-			var name = TestContext.CurrentContext.Test.MethodName ?? TestContext.CurrentContext.Test.Name;
-			TestContext.Progress.WriteLine($">>>>> {DateTime.Now} {nameof(FixtureTeardown)} for {name}");
+			try
+			{
+				Reset();
+			}
+			catch (Exception e)
+			{
+				var name = TestContext.CurrentContext.Test.MethodName ?? TestContext.CurrentContext.Test.Name;
+				TestContext.Error.WriteLine($">>>>> {DateTime.Now} The FixtureTeardown threw an exception during {name}.{Environment.NewLine}Exception details: {e}");
+			}
 		}
 
 		[TearDown]