Commit b30d19af authored by David Kline's avatar David Kline Committed by GitHub
Browse files

Merge pull request #111 from Microsoft/HymanMatt 

Make web socket events actual events
parents ccda3057 403353a3

WindowsDevicePortalWrapper/TestAppXbox/Program.cs

+2 −2
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ namespace XboxWdpDriver 
                        ManualResetEvent runningProcessesReceived = new ManualResetEvent(false);



                        WebSocketMessageReceivedEventHandler<RunningProcesses> runningProcessesReceivedHandler =

                            delegate(object sender, WebSocketMessageReceivedEventArgs<RunningProcesses> runningProccesesArgs)

                            delegate(DevicePortal sender, WebSocketMessageReceivedEventArgs<RunningProcesses> runningProccesesArgs)

                        {

                            if (runningProccesesArgs.Message != null)

                            {
@@ -295,7 +295,7 @@ namespace XboxWdpDriver 
                        ManualResetEvent systemPerfReceived = new ManualResetEvent(false);



                        WebSocketMessageReceivedEventHandler<SystemPerformanceInformation> systemPerfReceivedHandler =

                            delegate(object sender, WebSocketMessageReceivedEventArgs<SystemPerformanceInformation> sysPerfInfoArgs)

                            delegate(DevicePortal sender, WebSocketMessageReceivedEventArgs<SystemPerformanceInformation> sysPerfInfoArgs)

                        {

                            if (sysPerfInfoArgs.Message != null)

                            {

WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests.Core 
            ManualResetEvent runningProcessesReceived = new ManualResetEvent(false);

            RunningProcesses runningProcesses = null;



            WindowsDevicePortal.WebSocketMessageReceivedEventHandler<RunningProcesses> runningProcessesReceivedHandler = delegate(object sender,

            WindowsDevicePortal.WebSocketMessageReceivedEventHandler<RunningProcesses> runningProcessesReceivedHandler = delegate(DevicePortal sender,

            WebSocketMessageReceivedEventArgs<RunningProcesses> args)

            {

                if (args.Message != null)
@@ -99,7 +99,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests.Core 
            ManualResetEvent systemPerfReceived = new ManualResetEvent(false);

            SystemPerformanceInformation systemPerfInfo = null;



            WebSocketMessageReceivedEventHandler<SystemPerformanceInformation> systemPerfReceivedHandler = delegate(object sender,

            WebSocketMessageReceivedEventHandler<SystemPerformanceInformation> systemPerfReceivedHandler = delegate(DevicePortal sender,

            WebSocketMessageReceivedEventArgs<SystemPerformanceInformation> args)

            {

                if (args.Message != null)

WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs

+2 −2
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
            ManualResetEvent runningProcessesReceived = new ManualResetEvent(false);

            RunningProcesses runningProcesses = null;



            WindowsDevicePortal.WebSocketMessageReceivedEventHandler<RunningProcesses> runningProcessesReceivedHandler = delegate(object sender,

            WindowsDevicePortal.WebSocketMessageReceivedEventHandler<RunningProcesses> runningProcessesReceivedHandler = delegate(DevicePortal sender,

            WebSocketMessageReceivedEventArgs<RunningProcesses> args)

            {

                if (args.Message != null)
@@ -335,7 +335,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
            ManualResetEvent systemPerfReceived = new ManualResetEvent(false);

            SystemPerformanceInformation systemPerfInfo = null;



            WindowsDevicePortal.WebSocketMessageReceivedEventHandler<SystemPerformanceInformation> systemPerfReceivedHandler = delegate(object sender,

            WindowsDevicePortal.WebSocketMessageReceivedEventHandler<SystemPerformanceInformation> systemPerfReceivedHandler = delegate(DevicePortal sender,

            WebSocketMessageReceivedEventArgs<SystemPerformanceInformation> args)

            {

                if (args.Message != null)

WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs

+7 −15
Original line number Diff line number Diff line
@@ -39,20 +39,12 @@ namespace Microsoft.Tools.WindowsDevicePortal 
        /// <summary>

        /// Gets or sets the running processes message received handler.

        /// </summary>

        public WebSocketMessageReceivedEventHandler<RunningProcesses> RunningProcessesMessageReceived

        {

            get;

            set;

        }

        public event WebSocketMessageReceivedEventHandler<RunningProcesses> RunningProcessesMessageReceived;



        /// <summary>

        /// Gets or sets the system perf message received handler.

        /// </summary>

        public WebSocketMessageReceivedEventHandler<SystemPerformanceInformation> SystemPerfMessageReceived

        {

            get;

            set;

        }

        public event WebSocketMessageReceivedEventHandler<SystemPerformanceInformation> SystemPerfMessageReceived;



        /// <summary>

        /// Gets the collection of processes running on the device.
@@ -127,7 +119,7 @@ namespace Microsoft.Tools.WindowsDevicePortal 
                this.systemPerfWebSocket = new WebSocket<SystemPerformanceInformation>(this.deviceConnection, this.ServerCertificateValidation);

#endif



                this.systemPerfWebSocket.WebSocketMessageReceived += this.SystemPerfMessageReceived;

                this.systemPerfWebSocket.WebSocketMessageReceived += this.SystemPerfReceivedHandler;

            }

            else

            {
@@ -157,10 +149,10 @@ namespace Microsoft.Tools.WindowsDevicePortal 
        /// <summary>

        /// Handler for the processes received event that passes the event to the RunningProcessesMessageReceived handler.

        /// </summary>

        /// <param name="sender">The object sending the event.</param>

        /// <param name="sender">The <see cref="WebSocket{RunningProcesses}"/> object sending the event.</param>

        /// <param name="args">The event data.</param>

        private void RunningProcessesReceivedHandler(

            object sender,

            WebSocket<RunningProcesses> sender,

            WebSocketMessageReceivedEventArgs<RunningProcesses> args)

        {

            if (args.Message != null)
@@ -174,10 +166,10 @@ namespace Microsoft.Tools.WindowsDevicePortal 
        /// <summary>

        /// Handler for the system performance information received event that passes the event to the SystemPerfMessageReceived handler.

        /// </summary>

        /// <param name="sender">The object sending the event.</param>

        /// <param name="sender">The <see cref="WebSocket{SystemPerformanceInformation}"/> object sending the event.</param>

        /// <param name="args">The event data.</param>

        private void SystemPerfReceivedHandler(

            object sender,

            WebSocket<SystemPerformanceInformation> sender,

            WebSocketMessageReceivedEventArgs<SystemPerformanceInformation> args)

        {

            if (args.Message != null)

WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs

+2 −2
Original line number Diff line number Diff line
@@ -321,8 +321,8 @@ namespace Microsoft.Tools.WindowsDevicePortal 
                ManualResetEvent streamReceived = new ManualResetEvent(false);

                Stream stream = null;



                WindowsDevicePortal.WebSocketMessageReceivedEventHandler<Stream> streamReceivedHandler =

                    delegate(object sender, WebSocketMessageReceivedEventArgs<Stream> args)

                WindowsDevicePortal.WebSocketStreamReceivedEventInternalHandler<object> streamReceivedHandler =

                    delegate(WebSocket<object> sender, WebSocketMessageReceivedEventArgs<Stream> args)

                {

                    if (args.Message != null)

                    {