Attachment #278976 for bug #475082

View | Details | Raw Unified | Return to bug 475082
Collapse All | Expand All

Lines 59-64 Link Here

(-)UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/PopupButtonProvider.cs (+2 lines)
59	return Catalog.GetString ("menu item");	59	return Catalog.GetString ("menu item");
60	else if (propertyId == AEIds.LabeledByProperty.Id)	60	else if (propertyId == AEIds.LabeledByProperty.Id)
61	return null;	61	return null;
		62	else if (propertyId == AEIds.IsKeyboardFocusableProperty.Id)
		63	return Control.CanFocus;
62	else	64	else
63	return base.GetProviderPropertyValue (propertyId);	65	return base.GetProviderPropertyValue (propertyId);
64	}	66	}

Lines 1876-1882 Link Here

(-)UiaAtkBridge/Test/AtkTest/AtkTester.cs (-1 / +1 lines)
1876	missingTypesMsg + " .. " + superfluousTypesMsg);	1876	missingTypesMsg + " .. " + superfluousTypesMsg);
1877	}	1877	}
1878		1878
1879	protected void States (Atk.Object accessible, params Atk.StateType [] expected)	1879	public static void States (Atk.Object accessible, params Atk.StateType [] expected)
1880	{	1880	{
1881	List <Atk.StateType> expectedStates = new List <Atk.StateType> (expected);	1881	List <Atk.StateType> expectedStates = new List <Atk.StateType> (expected);
1882	List <Atk.StateType> missingStates = new List <Atk.StateType> ();	1882	List <Atk.StateType> missingStates = new List <Atk.StateType> ();




		[Test]
		public void 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 ()
		{
			using (var runner = new DialogRunner (new SWF.SaveFileDialog ())) {
				VerifyBasicProperties (runner.Dialog);
			}
		}

		[Test]
		public void ColorDialog ()
		{
			using (var runner = new DialogRunner (new SWF.ColorDialog ())) {
				VerifyBasicProperties (runner.Dialog);
			}
		}

		[Test]
		public void FontDialog ()
		{
			using (var runner = new DialogRunner (new SWF.FontDialog ())) {
				VerifyBasicProperties (runner.Dialog);
			}
		}

		[Test]

			} catch (System.Exception e) {
				exception = e;
			}

			using (var runner = new DialogRunner (new SWF.ThreadExceptionDialog (exception))) {
				VerifyBasicProperties (runner.Dialog);
			}
		}

		
		private void VerifyBasicProperties (System.ComponentModel.Component dialog)
		{
			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;
	
	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);
			
			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;
				}
				threadExceptionDialog.Close ();
				threadExceptionDialog.Dispose ();
					th.Abort ();
				}
			}

			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;
			}
		}
	}
	
	

}

Return to bug 475082

Lines 38-62 Link Here

(-)UiaAtkBridge/Test/UiaAtkBridgeTest/DialogTester.cs (-42 / +83 lines)
38	[Test]	38	[Test]
39	public void OpenFileDialog ()	39	public void OpenFileDialog ()
40	{	40	{
41	TestDialog (new SWF.OpenFileDialog ());	41	using (var runner = new DialogRunner (new SWF.OpenFileDialog ())) {
		42	VerifyBasicProperties (runner.Dialog);
		43
		44	UiaAtkBridge.Window dialogAdapter =
		45	BridgeTester.GetAdapterForWidget (runner.Dialog) as UiaAtkBridge.Window;
		46
		47	Atk.Object popupButtonPanelAdapter = dialogAdapter.RefAccessibleChild (10);
		48	Assert.AreEqual (6, popupButtonPanelAdapter.NAccessibleChildren, "PopupButtonPanel (toolbar) should have 6 children");
		49
		50	Atk.Object popupButtonAdapter1 = popupButtonPanelAdapter.RefAccessibleChild (0).RefAccessibleChild (0);
		51	AtkTester.States (popupButtonAdapter1,
		52	Atk.StateType.Enabled,
		53	Atk.StateType.Selectable,
		54	Atk.StateType.Focusable,
		55	Atk.StateType.Sensitive,
		56	Atk.StateType.Showing,
		57	Atk.StateType.Visible);
		58	// TODO: Simulate selecting so we can teset Selected/Focused
		59	}
42	}	60	}
43		61
44	[Test]	62	[Test]
45	public void SaveFileDialog ()	63	public void SaveFileDialog ()
46	{	64	{
47	TestDialog (new SWF.SaveFileDialog ());	65	using (var runner = new DialogRunner (new SWF.SaveFileDialog ())) {
		66	VerifyBasicProperties (runner.Dialog);
		67	}
48	}	68	}
49		69
50	[Test]	70	[Test]
51	public void ColorDialog ()	71	public void ColorDialog ()
52	{	72	{
53	TestDialog (new SWF.ColorDialog ());	73	using (var runner = new DialogRunner (new SWF.ColorDialog ())) {
		74	VerifyBasicProperties (runner.Dialog);
		75	}
54	}	76	}
55		77
56	[Test]	78	[Test]
57	public void FontDialog ()	79	public void FontDialog ()
58	{	80	{
59	TestDialog (new SWF.FontDialog ());	81	using (var runner = new DialogRunner (new SWF.FontDialog ())) {
		82	VerifyBasicProperties (runner.Dialog);
		83	}
60	}	84	}
61		85
62	[Test]	86	[Test]
Lines 70-123 Link Here
70	} catch (System.Exception e) {	94	} catch (System.Exception e) {
71	exception = e;	95	exception = e;
72	}	96	}
73	TestDialog (new SWF.ThreadExceptionDialog (exception));	97
		98	using (var runner = new DialogRunner (new SWF.ThreadExceptionDialog (exception))) {
		99	VerifyBasicProperties (runner.Dialog);
		100	}
74	}	101	}
75		102
76		103
77	static void TestDialog (System.ComponentModel.Component dialog)	104	private void VerifyBasicProperties (System.ComponentModel.Component dialog)
78	{	105	{
79	new DialogTesterInner (dialog).Test ();	106	UiaAtkBridge.Window dialogAdapter = BridgeTester.GetAdapterForWidget (dialog) as UiaAtkBridge.Window;
		107	Assert.IsNotNull (dialogAdapter, "dialogAdapter has a different type than Window");
		108	Assert.AreEqual (dialogAdapter.Role, Atk.Role.Dialog, "dialog should have dialog role");
		109	Assert.IsTrue (dialogAdapter.NAccessibleChildren > 0, "dialog should have children");
80	}	110	}
81		111	}
82	private class DialogTesterInner {
83	System.ComponentModel.Component dialog;
84	Thread th;
85		112
86	internal DialogTesterInner (System.ComponentModel.Component dialog)	113	public class DialogRunner : IDisposable
87	{	114	{
88	this.dialog = dialog;	115	private SWF.CommonDialog commonDialog;
89	}	116	private SWF.ThreadExceptionDialog threadExceptionDialog;
		117	private Thread dialogThread;
		118
		119	public DialogRunner (System.ComponentModel.Component dialog)
		120	{
		121	commonDialog = dialog as SWF.CommonDialog;
		122	if (commonDialog == null)
		123	threadExceptionDialog = dialog as SWF.ThreadExceptionDialog;
		124	if (commonDialog == null && threadExceptionDialog == null)
		125	throw new ArgumentException ("Unsupported dialog type: " + dialog);
90		126
91	internal void Test ()	127	dialogThread = new Thread (new ThreadStart (Show));
92	{	128	dialogThread.Start ();
93	th = new Thread (new ThreadStart (Show));	129	Thread.Sleep (10000);
94	th.SetApartmentState (ApartmentState.STA);	130	}
95	try {	131
96	th.Start ();	132	public void Dispose ()
97	Thread.Sleep (10000);	133	{
98	UiaAtkBridge.Window dialogAdapter = BridgeTester.GetAdapterForWidget (dialog) as UiaAtkBridge.Window;	134	if (commonDialog != null)
99	Assert.IsNotNull (dialogAdapter, "dialogAdapter has a different type than Window");	135	commonDialog.Dispose ();
100	Assert.AreEqual (dialogAdapter.Role, Atk.Role.Dialog, "dialog should have dialog role");	136	else if (threadExceptionDialog != null) {
101	Assert.IsTrue (dialogAdapter.NAccessibleChildren > 0, "dialog should have children");	137	if (threadExceptionDialog.InvokeRequired) {
		138	threadExceptionDialog.BeginInvoke (new SWF.MethodInvoker (Dispose));
		139	return;
102	}	140	}
103	finally {	141	threadExceptionDialog.Close ();
104	dialog.Dispose ();	142	threadExceptionDialog.Dispose ();
105	th.Abort ();
106	}
107	}	143	}
108		144
109	private void Show ()	145	if (dialogThread != null)
110	{	146	dialogThread.Abort ();
111	if (dialog is SWF.CommonDialog)	147	}
112	((SWF.CommonDialog)dialog).ShowDialog ();	148
113	else if (dialog is SWF.ThreadExceptionDialog)	149	private void Show ()
114	((SWF.ThreadExceptionDialog)dialog).ShowDialog ();	150	{
115	else	151	if (commonDialog != null)
116	throw new NotSupportedException ("Unsupported dialog type: " + dialog);	152	commonDialog.ShowDialog ();
		153	else if (threadExceptionDialog != null)
		154	threadExceptionDialog.ShowDialog ();
		155	}
		156
		157	public System.ComponentModel.Component Dialog {
		158	get {
		159	return (System.ComponentModel.Component) commonDialog ??
		160	(System.ComponentModel.Component) threadExceptionDialog;
117	}	161	}
118	}	162	}
119	}	163	}
120
121
122
123	}	164	}