Commit 8f4ba71a authored by Jason Williams's avatar Jason Williams Committed by GitHub
Browse files

Merge pull request #95 from Microsoft/HymanMatt 

Renamed HttpOperations to HttpMethods and have ApplyHttpHeaders use it
parents bf9735cd c8cc9a4d

WindowsDevicePortalWrapper/MockDataGenerator/Program.cs

+6 −6
Original line number Diff line number Diff line
@@ -113,16 +113,16 @@ namespace MockDataGenerator 


            if (parameters.HasParameter("endpoint"))

            {

                HttpOperations httpOperation = HttpOperations.Get;

                HttpMethods httpMethod = HttpMethods.Get;

                string endpoint = parameters.GetParameterValue("endpoint");



                if (endpoint.StartsWith(WebSocketOpertionPrefix, StringComparison.OrdinalIgnoreCase))

                {

                    httpOperation = HttpOperations.WebSocket;

                    httpMethod = HttpMethods.WebSocket;

                    endpoint = endpoint.Substring(WebSocketOpertionPrefix.Length);

                }



                Task saveResponseTask = portal.SaveEndpointResponseToFile(endpoint, directory, httpOperation);

                Task saveResponseTask = portal.SaveEndpointResponseToFile(endpoint, directory, httpMethod);

                saveResponseTask.Wait();

            }

            else
@@ -130,17 +130,17 @@ namespace MockDataGenerator 
                foreach (string endpoint in Endpoints)

                {

                    string finalEndpoint = endpoint;

                    HttpOperations httpOperation = HttpOperations.Get;

                    HttpMethods httpMethod = HttpMethods.Get;



                    if (endpoint.StartsWith(WebSocketOpertionPrefix, StringComparison.OrdinalIgnoreCase))

                    {

                        httpOperation = HttpOperations.WebSocket;

                        httpMethod = HttpMethods.WebSocket;

                        finalEndpoint = endpoint.Substring(WebSocketOpertionPrefix.Length);

                    }



                    try

                    {

                        Task saveResponseTask = portal.SaveEndpointResponseToFile(finalEndpoint, directory, httpOperation);

                        Task saveResponseTask = portal.SaveEndpointResponseToFile(finalEndpoint, directory, httpMethod);

                        saveResponseTask.Wait();

                    }

                    catch (Exception e)

WindowsDevicePortalWrapper/UnitTestProject/Core/AppFileExplorerTests.cs

+7 −7
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 


            response.Content = content;



            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.KnownFoldersApi, response, HttpOperations.Get);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.KnownFoldersApi, response, HttpMethods.Get);



            Task<KnownFolders> getKnownFoldersTask = TestHelpers.Portal.GetKnownFolders();

            getKnownFoldersTask.Wait();
@@ -69,7 +69,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 


            response.Content = content;



            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFilesApi, response, HttpOperations.Get);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFilesApi, response, HttpMethods.Get);



            Task<FolderContents> getFolderContentsTask = TestHelpers.Portal.GetFolderContents("KnownFolderOne");

            getFolderContentsTask.Wait();
@@ -117,7 +117,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
            HttpContent content = new StreamContent(stream);

            response.Content = content;



            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpOperations.Get);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpMethods.Get);



            Task<Stream> getFileTask = TestHelpers.Portal.GetFile("knownfolder", "FileToDownload.txt", "SubFolder\\SubFolder2");

            getFileTask.Wait();
@@ -135,7 +135,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
        {

            HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.OK);



            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpOperations.Post);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpMethods.Post);



            Task uploadFileTask = TestHelpers.Portal.UploadFile("knownfolder", "MockData\\Defaults\\api_os_devicefamily_Default.dat", "SubFolder\\SubFolder2");

            uploadFileTask.Wait();
@@ -152,7 +152,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
        {

            HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.OK);



            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpOperations.Post);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpMethods.Post);



            try

            {
@@ -175,7 +175,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
        {

            HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.OK);



            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpOperations.Delete);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpMethods.Delete);



            Task deleteFileTask = TestHelpers.Portal.DeleteFile("knownfolder", "FileToDelete.txt", "SubFolder\\SubFolder2");

            deleteFileTask.Wait();
@@ -191,7 +191,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
        {

            HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.OK);



            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RenameFileApi, response, HttpOperations.Post);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RenameFileApi, response, HttpMethods.Post);



            Task renameFileTask = TestHelpers.Portal.RenameFile("knownfolder", "FileToRename.txt", "NewFileName.txt", "SubFolder\\SubFolder2");

            renameFileTask.Wait();

WindowsDevicePortalWrapper/UnitTestProject/Core/OsInformationTests.cs

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
        [TestMethod]

        public void OsInformationTest()

        {

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.MachineNameApi, HttpOperations.Get);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.MachineNameApi, HttpMethods.Get);



            Task<string> getNameTask = TestHelpers.Portal.GetDeviceName();

            getNameTask.Wait();

WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests.Core 
        [TestMethod]

        public void GetRunningProcessesTest()

        {

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RunningProcessApi, HttpOperations.Get);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RunningProcessApi, HttpMethods.Get);



            Task<RunningProcesses> getRunningProcessesTask = TestHelpers.Portal.GetRunningProcesses();

            getRunningProcessesTask.Wait();
@@ -40,7 +40,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests.Core 
        [TestMethod]

        public void GetRunningProcessesWebSocketTest()

        {

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RunningProcessApi, HttpOperations.WebSocket);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RunningProcessApi, HttpMethods.WebSocket);



            ManualResetEvent runningProcessesReceived = new ManualResetEvent(false);

            RunningProcesses runningProcesses = null;
@@ -78,7 +78,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests.Core 
        [TestMethod]

        public void GetSystemPerfTest()

        {

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SystemPerfApi, HttpOperations.Get);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SystemPerfApi, HttpMethods.Get);



            Task<SystemPerformanceInformation> getSystemPerfTask = TestHelpers.Portal.GetSystemPerf();

            getSystemPerfTask.Wait();
@@ -94,7 +94,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests.Core 
        [TestMethod]

        public void GetSystemPerfWebSocketTest()

        {

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SystemPerfApi, HttpOperations.WebSocket);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SystemPerfApi, HttpMethods.WebSocket);



            ManualResetEvent systemPerfReceived = new ManualResetEvent(false);

            SystemPerformanceInformation systemPerfInfo = null;

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

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ namespace Microsoft.Tools.WindowsDevicePortal.Tests 
        /// <param name="operatingSystemVersion">The version of the OS we are targeting.</param>

        public static void VerifyOsInformation(string operatingSystemVersion)

        {

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.MachineNameApi, DevicePortalPlatforms.XboxOne, operatingSystemVersion, HttpOperations.Get);

            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.MachineNameApi, DevicePortalPlatforms.XboxOne, operatingSystemVersion, HttpMethods.Get);



            Task<string> getNameTask = TestHelpers.Portal.GetDeviceName();

            getNameTask.Wait();