From 6c7da6fd2b9598b246079ebf8dcb2dfdb654e1f8 Mon Sep 17 00:00:00 2001
From: "Dr.Rx" <david.rey@nventive.com>
Date: Wed, 8 Jan 2020 18:37:11 -0500
Subject: [PATCH] Add right tapped event support in pointer test bench

---
 .../GestureRecognizerTests/PointersEvents.xaml       | 12 ++++++++++++
 .../GestureRecognizerTests/PointersEvents.xaml.cs    |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml
index a4d4217151..03543d4e33 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml
@@ -342,6 +342,18 @@
 					Content="Handle event"
 					Margin="20, 0"
 					Visibility="{Binding ElementName=_gestureDoubleTapped, Path=IsOn}"/>
+				<ToggleSwitch
+					x:Name="_gestureRightTapped" 
+					Header="Right tapped"
+					OnContent="Subscribed to right tap"
+					OffContent="Right tap disabled"
+					Toggled="OnConfigChanged"
+					IsOn="False" />
+				<CheckBox
+					x:Name="_gestureRightTappedHandle" 
+					Content="Handle event"
+					Margin="20, 0"
+					Visibility="{Binding ElementName=_gestureRightTapped, Path=IsOn}"/>
 
 
 				<Slider
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml.cs
index 4e81c5c211..0b1d25dc63 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Input/GestureRecognizerTests/PointersEvents.xaml.cs
@@ -49,6 +49,7 @@ namespace UITests.Shared.Windows_UI_Input.GestureRecognizer
 		private readonly ManipulationCompletedEventHandler _logManipulationCompleted;
 		private readonly TappedEventHandler _logTapped;
 		private readonly DoubleTappedEventHandler _logDoubleTapped;
+		private readonly RightTappedEventHandler _logRightTapped;
 
 		private bool _isReady;
 
@@ -77,6 +78,7 @@ namespace UITests.Shared.Windows_UI_Input.GestureRecognizer
 			_logManipulationCompleted = new ManipulationCompletedEventHandler(CreateHandler(ManipulationCompletedEvent, "Manip completed", _manipCompletedHandle));
 			_logTapped = new TappedEventHandler(CreateHandler(TappedEvent, "Tapped", _gestureTappedHandle));
 			_logDoubleTapped = new DoubleTappedEventHandler(CreateHandler(DoubleTappedEvent, "DoubleTapped", _gestureDoubleTappedHandle));
+			_logRightTapped = new RightTappedEventHandler(CreateHandler(RightTappedEvent, "RightTapped", _gestureRightTappedHandle));
 
 			_log.ItemsSource = _eventLog;
 			_pointerType.ItemsSource = Enum.GetNames(typeof(PointerDeviceType));
@@ -162,6 +164,7 @@ namespace UITests.Shared.Windows_UI_Input.GestureRecognizer
 			target.RemoveHandler(ManipulationCompletedEvent, _logManipulationCompleted);
 			target.RemoveHandler(TappedEvent, _logTapped);
 			target.RemoveHandler(DoubleTappedEvent, _logDoubleTapped);
+			target.RemoveHandler(RightTappedEvent, _logRightTapped);
 
 			if (allEvents || _ptEntered.IsOn)
 				target.AddHandler(PointerEnteredEvent, _logPointerEntered, handledToo);
@@ -191,6 +194,8 @@ namespace UITests.Shared.Windows_UI_Input.GestureRecognizer
 				target.AddHandler(TappedEvent, _logTapped, handledToo);
 			if (allEvents || _gestureDoubleTapped.IsOn)
 				target.AddHandler(DoubleTappedEvent, _logDoubleTapped, handledToo);
+			if (allEvents || _gestureRightTapped.IsOn)
+				target.AddHandler(RightTappedEvent, _logRightTapped, handledToo);
 		}
 
 		private (EventValidity, string error) Validate(object snd, RoutedEvent evt, RoutedEventArgs args)
@@ -329,6 +334,8 @@ namespace UITests.Shared.Windows_UI_Input.GestureRecognizer
 						return $"{Src(tapped)} | hd={tapped.Handled} | position={F(tapped.GetPosition(Sender as UIElement))}";
 					case DoubleTappedRoutedEventArgs doubleTapped:
 						return $"{Src(doubleTapped)} | hd={doubleTapped.Handled} | position={F(doubleTapped.GetPosition(Sender as UIElement))}";
+					case RightTappedRoutedEventArgs rightTapped:
+						return $"{Src(rightTapped)} | hd={rightTapped.Handled} | position={F(rightTapped.GetPosition(Sender as UIElement))}";
 
 					default:
 						return string.Empty;