Attachment 304536 Details for Bug 485268

[patch] Proposed patch

errorbridge.diff (text/plain), 2.55 KB, created by Andres Aragoneses on 2009-07-11 04:42:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andres Aragoneses

Created: 2009-07-11 04:42:06 UTC

Size: 2.55 KB

patch

obsolete

>Index: UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs
>===================================================================
>--- UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs	(revision 137740)
>+++ UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs	(working copy)
>@@ -116,9 +116,16 @@
> 			AutomationInteropProvider.RaiseAutomationEvent (null, null, null);
> 		}
> 		
>+		public static void OnError (string message)
>+		{
>+			Assert.Fail (message);
>+		}
>+		
> 		[TestFixtureSetUp]
> 		public virtual void BridgeTesterInit ()
> 		{
>+			Mono.UIAutomation.Services.Log.ErrorHapenned += OnError;
>+			
> 			InitializeA11y ();
> 			
> 			form.Show ();
>Index: UIAutomation/UIAutomationBridge/Mono.UIAutomation.Services/Log.cs
>===================================================================
>--- UIAutomation/UIAutomationBridge/Mono.UIAutomation.Services/Log.cs	(revision 137740)
>+++ UIAutomation/UIAutomationBridge/Mono.UIAutomation.Services/Log.cs	(working copy)
>@@ -56,6 +56,8 @@
> 				} catch { }
> 			}
> 		}
>+		
>+		public static event Action<string> ErrorHapenned;
> 
> 		public static void Info (string message)
> 		{
>@@ -111,30 +113,34 @@
> #region Private Methods
> 		private static void PrintMessage (LogLevel level, string message, object[] args)
> 		{
>-			if ((int)currentLogLevel > (int)level)
>-				return;
>-
> 			// Code from Banshee under the MIT/X11 License
>-			Console.Error.Write ("[{0} {1:00}:{2:00}:{3:00}.{4:000}] ",
>-			                     GetLogLevelString (level),
>-			                     DateTime.Now.Hour, DateTime.Now.Minute,
>-			                     DateTime.Now.Second, DateTime.Now.Millisecond); 
>-
>+			string msg = String.Format ("[{0} {1:00}:{2:00}:{3:00}.{4:000}] ",
>+			                            GetLogLevelString (level),
>+			                            DateTime.Now.Hour, DateTime.Now.Minute,
>+			                            DateTime.Now.Second, DateTime.Now.Millisecond);
>+			
> 			if (args == null)
>-				Console.Error.WriteLine (message);
>+				msg += message;
> 			else
>-				Console.Error.WriteLine (message, args);
>+				msg += String.Format (message, args);
>+			
>+			if ((int)currentLogLevel > (int)level)
>+				Console.Error.WriteLine (msg);
>+			
>+			Action<string> handler = ErrorHapenned;
>+			if (handler != null && level == LogLevel.Error)
>+				handler (msg);
> 		}
> 
> 		private static string GetLogLevelString (LogLevel level)
> 		{
> 			switch (level) {
> 			case LogLevel.Information:
>-				return "Info ";
>+				return "Info";
> 			case LogLevel.Debug:
> 				return "Debug";
> 			case LogLevel.Warning:
>-				return "Warn ";
>+				return "Warn";
> 			case LogLevel.Error:
> 				return "Error";
> 			}

Actions: View | Diff

Attachments on bug 485268: 304536