Attachment 278976 Details for Bug 475082

[patch] Part of fix, with test

popup-button-focusable.patch (text/plain), 6.69 KB, created by Sanford Armstrong on 2009-03-12 01:56:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sanford Armstrong

Created: 2009-03-12 01:56:14 UTC

Size: 6.69 KB

patch

obsolete

>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/PopupButtonProvider.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/PopupButtonProvider.cs	(revision 129115)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/PopupButtonProvider.cs	(working copy)
>@@ -59,6 +59,8 @@
> 				return Catalog.GetString ("menu item");
> 			else if (propertyId == AEIds.LabeledByProperty.Id)
> 				return null;
>+			else if (propertyId == AEIds.IsKeyboardFocusableProperty.Id)
>+				return Control.CanFocus;
> 			else
> 				return base.GetProviderPropertyValue (propertyId);
> 		}
>Index: UiaAtkBridge/Test/AtkTest/AtkTester.cs
>===================================================================
>--- UiaAtkBridge/Test/AtkTest/AtkTester.cs	(revision 129115)
>+++ UiaAtkBridge/Test/AtkTest/AtkTester.cs	(working copy)
>@@ -1876,7 +1876,7 @@
> 				missingTypesMsg + " .. " + superfluousTypesMsg);
> 		}
> 		
>-		protected void States (Atk.Object accessible, params Atk.StateType [] expected)
>+		public static void States (Atk.Object accessible, params Atk.StateType [] expected)
> 		{
> 			List <Atk.StateType> expectedStates = new List <Atk.StateType> (expected);
> 			List <Atk.StateType> missingStates = new List <Atk.StateType> ();
>Index: UiaAtkBridge/Test/UiaAtkBridgeTest/DialogTester.cs
>===================================================================
>--- UiaAtkBridge/Test/UiaAtkBridgeTest/DialogTester.cs	(revision 129115)
>+++ UiaAtkBridge/Test/UiaAtkBridgeTest/DialogTester.cs	(working copy)
>@@ -38,25 +38,49 @@
> 		[Test]
> 		public void OpenFileDialog ()
> 		{
>-			TestDialog (new SWF.OpenFileDialog ());
>+			using (var runner = new DialogRunner (new SWF.OpenFileDialog ())) {
>+				VerifyBasicProperties (runner.Dialog);
>+
>+				UiaAtkBridge.Window dialogAdapter =
>+					BridgeTester.GetAdapterForWidget (runner.Dialog) as UiaAtkBridge.Window;
>+
>+				Atk.Object popupButtonPanelAdapter = dialogAdapter.RefAccessibleChild (10);
>+				Assert.AreEqual (6, popupButtonPanelAdapter.NAccessibleChildren, "PopupButtonPanel (toolbar) should have 6 children");
>+
>+				Atk.Object popupButtonAdapter1 = popupButtonPanelAdapter.RefAccessibleChild (0).RefAccessibleChild (0);
>+				AtkTester.States (popupButtonAdapter1,
>+				                  Atk.StateType.Enabled,
>+				                  Atk.StateType.Selectable,
>+				                  Atk.StateType.Focusable,
>+				                  Atk.StateType.Sensitive,
>+				                  Atk.StateType.Showing,
>+				                  Atk.StateType.Visible);
>+				// TODO: Simulate selecting so we can teset Selected/Focused
>+			}
> 		}
> 
> 		[Test]
> 		public void SaveFileDialog ()
> 		{
>-			TestDialog (new SWF.SaveFileDialog ());
>+			using (var runner = new DialogRunner (new SWF.SaveFileDialog ())) {
>+				VerifyBasicProperties (runner.Dialog);
>+			}
> 		}
> 
> 		[Test]
> 		public void ColorDialog ()
> 		{
>-			TestDialog (new SWF.ColorDialog ());
>+			using (var runner = new DialogRunner (new SWF.ColorDialog ())) {
>+				VerifyBasicProperties (runner.Dialog);
>+			}
> 		}
> 
> 		[Test]
> 		public void FontDialog ()
> 		{
>-			TestDialog (new SWF.FontDialog ());
>+			using (var runner = new DialogRunner (new SWF.FontDialog ())) {
>+				VerifyBasicProperties (runner.Dialog);
>+			}
> 		}
> 
> 		[Test]
>@@ -70,54 +94,71 @@
> 			} catch (System.Exception e) {
> 				exception = e;
> 			}
>-			TestDialog (new SWF.ThreadExceptionDialog (exception));
>+
>+			using (var runner = new DialogRunner (new SWF.ThreadExceptionDialog (exception))) {
>+				VerifyBasicProperties (runner.Dialog);
>+			}
> 		}
> 
> 		
>-		static void TestDialog (System.ComponentModel.Component dialog)
>+		private void VerifyBasicProperties (System.ComponentModel.Component dialog)
> 		{
>-			new DialogTesterInner (dialog).Test ();
>+			UiaAtkBridge.Window dialogAdapter = BridgeTester.GetAdapterForWidget (dialog) as UiaAtkBridge.Window;
>+			Assert.IsNotNull (dialogAdapter, "dialogAdapter has a different type than Window");
>+			Assert.AreEqual (dialogAdapter.Role, Atk.Role.Dialog, "dialog should have dialog role");
>+			Assert.IsTrue (dialogAdapter.NAccessibleChildren > 0, "dialog should have children");
> 		}
>-
>-		private class DialogTesterInner {
>-			System.ComponentModel.Component dialog;
>-			Thread th;
>+	}
> 	
>-			internal DialogTesterInner (System.ComponentModel.Component dialog)
>-			{
>-				this.dialog = dialog;
>-			}
>+	public class DialogRunner : IDisposable
>+	{
>+		private SWF.CommonDialog commonDialog;
>+		private SWF.ThreadExceptionDialog threadExceptionDialog;
>+		private Thread dialogThread;
>+		
>+		public DialogRunner (System.ComponentModel.Component dialog)
>+		{
>+			commonDialog = dialog as SWF.CommonDialog;
>+			if (commonDialog == null)
>+				threadExceptionDialog = dialog as SWF.ThreadExceptionDialog;
>+			if (commonDialog == null && threadExceptionDialog == null)
>+				throw new ArgumentException ("Unsupported dialog type: " + dialog);
> 			
>-			internal void Test ()
>-			{
>-				th = new Thread (new ThreadStart (Show));
>-				th.SetApartmentState (ApartmentState.STA);
>-				try {
>-					th.Start ();
>-					Thread.Sleep (10000);
>-					UiaAtkBridge.Window dialogAdapter = BridgeTester.GetAdapterForWidget (dialog) as UiaAtkBridge.Window;
>-					Assert.IsNotNull (dialogAdapter, "dialogAdapter has a different type than Window");
>-					Assert.AreEqual (dialogAdapter.Role, Atk.Role.Dialog, "dialog should have dialog role");
>-					Assert.IsTrue (dialogAdapter.NAccessibleChildren > 0, "dialog should have children");
>+			dialogThread = new Thread (new ThreadStart (Show));
>+			dialogThread.Start ();
>+			Thread.Sleep (10000);
>+		}
>+
>+		public void Dispose ()
>+		{
>+			if (commonDialog != null)
>+				commonDialog.Dispose ();
>+			else if (threadExceptionDialog != null) {
>+				if (threadExceptionDialog.InvokeRequired) {
>+					threadExceptionDialog.BeginInvoke (new SWF.MethodInvoker (Dispose));
>+					return;
> 				}
>-				finally {
>-					dialog.Dispose ();
>-					th.Abort ();
>-				}
>+				threadExceptionDialog.Close ();
>+				threadExceptionDialog.Dispose ();
> 			}
>-	
>-			private void Show ()
>-			{
>-				if (dialog is SWF.CommonDialog)
>-					((SWF.CommonDialog)dialog).ShowDialog ();
>-				else if (dialog is SWF.ThreadExceptionDialog)
>-					((SWF.ThreadExceptionDialog)dialog).ShowDialog ();
>-				else
>-					throw new NotSupportedException ("Unsupported dialog type: " + dialog);
>+
>+			if (dialogThread != null)
>+				dialogThread.Abort ();
>+		}
>+
>+		private void Show ()
>+		{
>+			if (commonDialog != null)
>+				commonDialog.ShowDialog ();
>+			else if (threadExceptionDialog != null)
>+				threadExceptionDialog.ShowDialog ();
>+		}
>+
>+		public System.ComponentModel.Component Dialog {
>+			get {
>+				return (System.ComponentModel.Component) commonDialog ??
>+					(System.ComponentModel.Component) threadExceptionDialog;
> 			}
> 		}
> 	}
>-	
>-	
>-
> }

Actions: View | Diff

Attachments on bug 475082: 278976