diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e87a115 --- /dev/null +++ b/LICENSE @@ -0,0 +1,363 @@ +Mozilla Public License, version 2.0 + +1. Definitions + +1.1. "Contributor" + + means each individual or legal entity that creates, contributes to the + creation of, or owns Covered Software. + +1.2. "Contributor Version" + + means the combination of the Contributions of others (if any) used by a + Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + + means Source Code Form to which the initial Contributor has attached the + notice in Exhibit A, the Executable Form of such Source Code Form, and + Modifications of such Source Code Form, in each case including portions + thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + a. that the initial Contributor has attached the notice described in + Exhibit B to the Covered Software; or + + b. that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the terms of + a Secondary License. + +1.6. "Executable Form" + + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + + means a work that combines Covered Software with other material, in a + separate file or files, that is not Covered Software. + +1.8. "License" + + means this document. + +1.9. "Licensable" + + means having the right to grant, to the maximum extent possible, whether + at the time of the initial grant or subsequently, any and all of the + rights conveyed by this License. + +1.10. "Modifications" + + means any of the following: + + a. any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered Software; or + + b. any new file in Source Code Form that contains any Covered Software. + +1.11. "Patent Claims" of a Contributor + + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the License, + by the making, using, selling, offering for sale, having made, import, + or transfer of either its Contributions or its Contributor Version. + +1.12. "Secondary License" + + means either the GNU General Public License, Version 2.0, the GNU Lesser + General Public License, Version 2.1, the GNU Affero General Public + License, Version 3.0, or any later versions of those licenses. + +1.13. "Source Code Form" + + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that controls, is + controlled by, or is under common control with You. For purposes of this + definition, "control" means (a) the power, direct or indirect, to cause + the direction or management of such entity, whether by contract or + otherwise, or (b) ownership of more than fifty percent (50%) of the + outstanding shares or beneficial ownership of such entity. + + +2. License Grants and Conditions + +2.1. Grants + + Each Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license: + + a. under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + + b. under Patent Claims of such Contributor to make, use, sell, offer for + sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + + The licenses granted in Section 2.1 with respect to any Contribution + become effective for each Contribution on the date the Contributor first + distributes such Contribution. + +2.3. Limitations on Grant Scope + + The licenses granted in this Section 2 are the only rights granted under + this License. No additional rights or licenses will be implied from the + distribution or licensing of Covered Software under this License. + Notwithstanding Section 2.1(b) above, no patent license is granted by a + Contributor: + + a. for any code that a Contributor has removed from Covered Software; or + + b. for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + + c. under Patent Claims infringed by Covered Software in the absence of + its Contributions. + + This License does not grant any rights in the trademarks, service marks, + or logos of any Contributor (except as may be necessary to comply with + the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + + No Contributor makes additional grants as a result of Your choice to + distribute the Covered Software under a subsequent version of this + License (see Section 10.2) or under the terms of a Secondary License (if + permitted under the terms of Section 3.3). + +2.5. Representation + + Each Contributor represents that the Contributor believes its + Contributions are its original creation(s) or it has sufficient rights to + grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + + This License is not intended to limit any rights You have under + applicable copyright doctrines of fair use, fair dealing, or other + equivalents. + +2.7. Conditions + + Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in + Section 2.1. + + +3. Responsibilities + +3.1. Distribution of Source Form + + All distribution of Covered Software in Source Code Form, including any + Modifications that You create or to which You contribute, must be under + the terms of this License. You must inform recipients that the Source + Code Form of the Covered Software is governed by the terms of this + License, and how they can obtain a copy of this License. You may not + attempt to alter or restrict the recipients' rights in the Source Code + Form. + +3.2. Distribution of Executable Form + + If You distribute Covered Software in Executable Form then: + + a. such Covered Software must also be made available in Source Code Form, + as described in Section 3.1, and You must inform recipients of the + Executable Form how they can obtain a copy of such Source Code Form by + reasonable means in a timely manner, at a charge no more than the cost + of distribution to the recipient; and + + b. You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter the + recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + + You may create and distribute a Larger Work under terms of Your choice, + provided that You also comply with the requirements of this License for + the Covered Software. If the Larger Work is a combination of Covered + Software with a work governed by one or more Secondary Licenses, and the + Covered Software is not Incompatible With Secondary Licenses, this + License permits You to additionally distribute such Covered Software + under the terms of such Secondary License(s), so that the recipient of + the Larger Work may, at their option, further distribute the Covered + Software under the terms of either this License or such Secondary + License(s). + +3.4. Notices + + You may not remove or alter the substance of any license notices + (including copyright notices, patent notices, disclaimers of warranty, or + limitations of liability) contained within the Source Code Form of the + Covered Software, except that You may alter any license notices to the + extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + + You may choose to offer, and to charge a fee for, warranty, support, + indemnity or liability obligations to one or more recipients of Covered + Software. However, You may do so only on Your own behalf, and not on + behalf of any Contributor. You must make it absolutely clear that any + such warranty, support, indemnity, or liability obligation is offered by + You alone, and You hereby agree to indemnify every Contributor for any + liability incurred by such Contributor as a result of warranty, support, + indemnity or liability terms You offer. You may include additional + disclaimers of warranty and limitations of liability specific to any + jurisdiction. + +4. Inability to Comply Due to Statute or Regulation + + If it is impossible for You to comply with any of the terms of this License + with respect to some or all of the Covered Software due to statute, + judicial order, or regulation then You must: (a) comply with the terms of + this License to the maximum extent possible; and (b) describe the + limitations and the code they affect. Such description must be placed in a + text file included with all distributions of the Covered Software under + this License. Except to the extent prohibited by statute or regulation, + such description must be sufficiently detailed for a recipient of ordinary + skill to be able to understand it. + +5. Termination + +5.1. The rights granted under this License will terminate automatically if You + fail to comply with any of its terms. However, if You become compliant, + then the rights granted under this License from a particular Contributor + are reinstated (a) provisionally, unless and until such Contributor + explicitly and finally terminates Your grants, and (b) on an ongoing + basis, if such Contributor fails to notify You of the non-compliance by + some reasonable means prior to 60 days after You have come back into + compliance. Moreover, Your grants from a particular Contributor are + reinstated on an ongoing basis if such Contributor notifies You of the + non-compliance by some reasonable means, this is the first time You have + received notice of non-compliance with this License from such + Contributor, and You become compliant prior to 30 days after Your receipt + of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent + infringement claim (excluding declaratory judgment actions, + counter-claims, and cross-claims) alleging that a Contributor Version + directly or indirectly infringes any patent, then the rights granted to + You by any and all Contributors for the Covered Software under Section + 2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user + license agreements (excluding distributors and resellers) which have been + validly granted by You or Your distributors under this License prior to + termination shall survive termination. + +6. Disclaimer of Warranty + + Covered Software is provided under this License on an "as is" basis, + without warranty of any kind, either expressed, implied, or statutory, + including, without limitation, warranties that the Covered Software is free + of defects, merchantable, fit for a particular purpose or non-infringing. + The entire risk as to the quality and performance of the Covered Software + is with You. Should any Covered Software prove defective in any respect, + You (not any Contributor) assume the cost of any necessary servicing, + repair, or correction. This disclaimer of warranty constitutes an essential + part of this License. No use of any Covered Software is authorized under + this License except under this disclaimer. + +7. Limitation of Liability + + Under no circumstances and under no legal theory, whether tort (including + negligence), contract, or otherwise, shall any Contributor, or anyone who + distributes Covered Software as permitted above, be liable to You for any + direct, indirect, special, incidental, or consequential damages of any + character including, without limitation, damages for lost profits, loss of + goodwill, work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses, even if such party shall have been + informed of the possibility of such damages. This limitation of liability + shall not apply to liability for death or personal injury resulting from + such party's negligence to the extent applicable law prohibits such + limitation. Some jurisdictions do not allow the exclusion or limitation of + incidental or consequential damages, so this exclusion and limitation may + not apply to You. + +8. Litigation + + Any litigation relating to this License may be brought only in the courts + of a jurisdiction where the defendant maintains its principal place of + business and such litigation shall be governed by laws of that + jurisdiction, without reference to its conflict-of-law provisions. Nothing + in this Section shall prevent a party's ability to bring cross-claims or + counter-claims. + +9. Miscellaneous + + This License represents the complete agreement concerning the subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. Any law or regulation which provides that + the language of a contract shall be construed against the drafter shall not + be used to construe this License against a Contributor. + + +10. Versions of the License + +10.1. New Versions + + Mozilla Foundation is the license steward. Except as provided in Section + 10.3, no one other than the license steward has the right to modify or + publish new versions of this License. Each version will be given a + distinguishing version number. + +10.2. Effect of New Versions + + You may distribute the Covered Software under the terms of the version + of the License under which You originally received the Covered Software, + or under the terms of any subsequent version published by the license + steward. + +10.3. Modified Versions + + If you create software not governed by this License, and you want to + create a new license for such software, you may create and use a + modified version of this License if you rename the license and remove + any references to the name of the license steward (except to note that + such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary + Licenses If You choose to distribute Source Code Form that is + Incompatible With Secondary Licenses under the terms of this version of + the License, the notice described in Exhibit B of this License must be + attached. + +Exhibit A - Source Code Form License Notice + + This Source Code Form is subject to the + terms of the Mozilla Public License, v. + 2.0. If a copy of the MPL was not + distributed with this file, You can + obtain one at + http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular file, +then You may include the notice in a location (such as a LICENSE file in a +relevant directory) where a recipient would be likely to look for such a +notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice + + This Source Code Form is "Incompatible + With Secondary Licenses", as defined by + the Mozilla Public License, v. 2.0. + diff --git a/README.md b/README.md index e7f73eb..1b5f5c5 100644 --- a/README.md +++ b/README.md @@ -1,50 +1,71 @@ -Windows Universal App Driver -============================ +# Winium for Store Apps +[![Inner Server NuGet downloads](https://img.shields.io/nuget/dt/Winium.StoreApps.InnerServer.svg?style=flat-square)](https://www.nuget.org/packages/Winium.StoreApps.InnerServer/) +[![Inner Server NuGet version](https://img.shields.io/nuget/v/Winium.StoreApps.InnerServer.svg?style=flat-square)](https://www.nuget.org/packages/Winium.StoreApps.InnerServer/) -Selenium Driver for automated testing of Windows Universal applications. +Winium.StoreApps is an open source, test automation tool for Windows Store apps, tested on emulators (currently only testing of Windows Phone apps is supported). -This repository hosts the code for the Windows Phone driver. You can use it for testing of native Windows Phone 8.1 applications. Currently it implements only limited subset of [WebDriver JSON Wire Protocol](https://code.google.com/p/selenium/wiki/JsonWireProtocol) and supports testing only via an emulator (Windows Phone 8.1). +## Supported Platforms +- Windows Phone 8.1 -Driver consists of two parts: the Driver (selenium based) and InnerServer (for application). To run tests you will need to add `WindowsUniversalAppDriver.InnerServer` to the app you want to test and start `WindowsUniversalAppDriver` (Remote WebDriver to send Json Wire Protocol commands to). +For Windows Phone 8 Silverlight test automation tool see [Windows Phone Driver](https://github.com/2gis/winphonedriver). +For Windows Desktop (WPF, WinForms) test automation tool see [Winium Desktop](https://github.com/2gis/cruciatus). -Requirements to run tests using Windows Phone driver ---------------------------------------------------- +## Why Winium? +As said by appium: +> - You can write tests with your favorite dev tools using any WebDriver-compatible language such as Java, Objective-C, JavaScript with Node.js (in promise, callback or generator flavors), PHP, Python, Ruby, C#, Clojure, or Perl with the Selenium WebDriver API and language-specific client libraries. +> - You can use any testing framework. +## Requirements * Windows 8 or higher +* Visual Studio 2013 with Update 2 or higher * Windows phone 8.1 SDK -* You will also need Visual Studio 2013 with Update 2 or higher to build driver. - -Usage ------ -1. Build solution -2. In tested app project, add reference to `WindowsUniversalAppDriver.InnerServer` (from https://www.nuget.org/packages/WindowsUniversalAppDriver.InnerServer) -3. In your app’s source code locate place where `RootFrame` is set (usually in `PrepareApplication` if you use `Caliburn.Micro` or App.xaml.cs for vanilla app) and add - - ```cs - AutomationServer.Instance.InitializeAndStart(RootFrame); - ``` - - or (will include driver only for debug build) - - ```cs - #if DEBUG - AutomationServer.Instance.InitializeAndStart(RootFrame); - #endif // DEBUG - ``` - - where `RootFrame` is visual root of application. - -4. Write your tests using you favorite language. In your test use `app` desired capability to set path to tested app's appx file (python example). - ```python - ... - self.driver = webdriver.Remote( - command_executor = 'http://localhost:9999', - desired_capabilities={ - "app": r"C:\testApp.appx" - }) - ... - # find all Textblock elements - blocks= self.driver.find_elements_by_tag_name("System.Windows.Controls.TextBlock") - ``` -5. Start WindowsUniversalAppDriver.exe -6. Run your tests + +You can get Visual Studio and SDK form Microsoft [here](https://dev.windows.com/en-us/develop/download-phone-sdk). + +## Quick Start +**App under test (AUT)** is application that you would like to test. + +1. Add reference to `Winium.StoreApps.InnerServer` in AUT project ([install NuGet package](https://www.nuget.org/packages/Winium.StoreApps.InnerServer/) or build project yourself) + +2. In your AUT's source code locate place where `Frame` is set (usually in `MainPageOnLoaded` for vanilla app or `PrepareApplication` if you use `Caliburn.Micro`) add + + ```cs + AutomationServer.Instance.InitializeAndStart(Frame); + ``` + + or (will include driver only for debug build) + + ```cs + #if DEBUG + AutomationServer.Instance.InitializeAndStart(Frame); + #endif // DEBUG + ``` + + where `Frame` is visual root of application. + +3. Write your tests using you favorite language. In your tests use `app` [desired capability](https://github.com/2gis/Winium.StoreApps/wiki/Capabilities) to set path to tested app's appx file. Here is python example: + ```python + # put it in setUp + self.driver = webdriver.Remote(command_executor='http://localhost:9999', + desired_capabilities={'app': 'C:\\testApp.appx'}) + # ut it in test method body + element = self.driver.find_element_by_id('SetButton') + element.click() + assert 'CARAMBA' == self.driver.find_element_by_id('MyTextBox').text + ``` + +4. Start `Winium.StoreApps.Driver.exe` ([download release from github](https://github.com/2gis/Winium.StoreApps/releases) or build it yourself) + +5. Run your tests and watch the magic happening + +## Writing tests +Essentially, Winium.StoreApps supports limited subset of [WebDriver JSON Wire Protocol](https://code.google.com/p/selenium/wiki/JsonWireProtocol), which means that you can write tests just like you would write for Selenium or Appium, here are some [docs](http://docs.seleniumhq.org/docs/03_webdriver.jsp). +For test samples look at [our functional tests](https://github.com/2gis/Winium.StoreApps/tree/master/Winium/TestApp.Test/py-functional). + + +## How it works +Winium.StoreApps consists of two essential parts: + +1. **Winium.StoreApps.Driver** implements Selenium Remote WebDriver and listens for JsonWireProtocol commands. It is responsible for launching emulator, deploying AUT, simulating input, forwarding commands to `Winium.StoreApps.InnerServer`, etc. + +2. **Winium.StoreApps.InnerServer** (the one that should be embedded into AUT) communicates with `Winium.StoreApps.Driver.exe` and executes different commands, like finding elements, getting or setting text values, properties, etc., inside your application. diff --git a/WindowsUniversalAppDriver/NugetPublish.bat b/WindowsUniversalAppDriver/NugetPublish.bat deleted file mode 100644 index f321943..0000000 --- a/WindowsUniversalAppDriver/NugetPublish.bat +++ /dev/null @@ -1,5 +0,0 @@ -REM delete existing nuget packages -del *.nupkg -set NUGET=.\.nuget\nuget.exe -%NUGET% pack .\WindowsUniversalAppDriver.InnerServer\WindowsUniversalAppDriver.InnerServer.csproj -IncludeReferencedProjects -Prop Configuration=Release -%NUGET% push *.nupkg \ No newline at end of file diff --git a/WindowsUniversalAppDriver/TestApp.Test/py-functional/README.md b/WindowsUniversalAppDriver/TestApp.Test/py-functional/README.md deleted file mode 100644 index 0aeb569..0000000 --- a/WindowsUniversalAppDriver/TestApp.Test/py-functional/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# Functional tests for Windows Universal App Driver -Functional tests for Windows Universal App Driver written in python. - -## Usage - -1. Build Windows Universal App Driver solution. -2. Make store package from TestApp. -3. Run tests - -```cmd -REM Run WindowsUniversalAppDriver.exe -start ..\..\WindowsUniversalAppDriver\bin\Debug\WindowsUniversalAppDriver.exe - -REM Run tests -pip install -r requirements.txt -py.test tests --tb=native -s - -taskkill /im WindowsUniversalAppDriver.exe /f -``` \ No newline at end of file diff --git a/WindowsUniversalAppDriver/TestApp.Test/py-functional/run_tests.bat b/WindowsUniversalAppDriver/TestApp.Test/py-functional/run_tests.bat deleted file mode 100644 index 1719aab..0000000 --- a/WindowsUniversalAppDriver/TestApp.Test/py-functional/run_tests.bat +++ /dev/null @@ -1,8 +0,0 @@ -REM Run WindowsUniversalAppDriver.exe -start ..\..\WindowsUniversalAppDriver\bin\Debug\WindowsUniversalAppDriver.exe - -REM Run tests -pip install -r requirements.txt -py.test tests --tb=native -s - -taskkill /im WindowsUniversalAppDriver.exe /f \ No newline at end of file diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.nuspec b/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.nuspec deleted file mode 100644 index 306bfab..0000000 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.nuspec +++ /dev/null @@ -1,24 +0,0 @@ - - - - WindowsUniversalAppDriver.InnerServer - 0.1.9 - 2GIS - 2GIS - https://github.com/2gis/windows-universal-app-driver - false - Inner server. Part of Windows Universal App Driver (Selenium Driver) for automated testing of Windows Universal applications. - - Version 0.1.9 - + Add delete the session request handler - - Fix driver responses - * Internal improvements - Version 0.1.8 - + Add GetElementTagName command (https://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/name) - Version 0.1.7 - - Fix 'attribute: set' script always throw exceptions - - Copyright © 2015 - - - \ No newline at end of file diff --git a/WindowsUniversalAppDriver/.nuget/NuGet.Config b/Winium/.nuget/NuGet.Config similarity index 100% rename from WindowsUniversalAppDriver/.nuget/NuGet.Config rename to Winium/.nuget/NuGet.Config diff --git a/WindowsUniversalAppDriver/.nuget/NuGet.targets b/Winium/.nuget/NuGet.targets similarity index 100% rename from WindowsUniversalAppDriver/.nuget/NuGet.targets rename to Winium/.nuget/NuGet.targets diff --git a/Winium/NugetPublish.bat b/Winium/NugetPublish.bat new file mode 100644 index 0000000..69a5409 --- /dev/null +++ b/Winium/NugetPublish.bat @@ -0,0 +1,5 @@ +REM delete existing nuget packages +del *.nupkg +set NUGET=.\.nuget\nuget.exe +%NUGET% pack .\Winium.StoreApps.InnerServer\Winium.StoreApps.InnerServer.csproj -IncludeReferencedProjects -Prop Configuration=Release +%NUGET% push *.nupkg \ No newline at end of file diff --git a/WindowsUniversalAppDriver/Settings.StyleCop b/Winium/Settings.StyleCop similarity index 100% rename from WindowsUniversalAppDriver/Settings.StyleCop rename to Winium/Settings.StyleCop diff --git a/WindowsUniversalAppDriver/TestApp.Test/py-functional/.gitignore b/Winium/TestApp.Test/py-functional/.gitignore similarity index 100% rename from WindowsUniversalAppDriver/TestApp.Test/py-functional/.gitignore rename to Winium/TestApp.Test/py-functional/.gitignore diff --git a/Winium/TestApp.Test/py-functional/README.md b/Winium/TestApp.Test/py-functional/README.md new file mode 100644 index 0000000..046e8ac --- /dev/null +++ b/Winium/TestApp.Test/py-functional/README.md @@ -0,0 +1,8 @@ +# Functional tests for Windows Universal App Driver +Functional tests for Windows Universal App Driver written in python. + +## Usage + +1. Build Windows Universal App Driver solution. +2. Make store package from TestApp. +3. Run tests `run_tests.bat` \ No newline at end of file diff --git a/WindowsUniversalAppDriver/TestApp.Test/py-functional/config.py b/Winium/TestApp.Test/py-functional/config.py similarity index 67% rename from WindowsUniversalAppDriver/TestApp.Test/py-functional/config.py rename to Winium/TestApp.Test/py-functional/config.py index 912e640..99d7bef 100644 --- a/WindowsUniversalAppDriver/TestApp.Test/py-functional/config.py +++ b/Winium/TestApp.Test/py-functional/config.py @@ -2,7 +2,7 @@ import os BASE_DIR = os.path.dirname(os.path.dirname(__file__)) -APPX_PATH = '..\\TestApp/TestApp.WindowsPhone\\AppPackages\\TestApp.WindowsPhone_1.0.0.0_AnyCPU_Debug_Test\\' \ +APPX_PATH = '..\\TestApp\\TestApp.WindowsPhone\\AppPackages\\TestApp.WindowsPhone_1.0.0.0_AnyCPU_Debug_Test\\' \ 'TestApp.WindowsPhone_1.0.0.0_AnyCPU_Debug.appx' DESIRED_CAPABILITIES = { diff --git a/WindowsUniversalAppDriver/TestApp.Test/py-functional/requirements.txt b/Winium/TestApp.Test/py-functional/requirements.txt similarity index 100% rename from WindowsUniversalAppDriver/TestApp.Test/py-functional/requirements.txt rename to Winium/TestApp.Test/py-functional/requirements.txt diff --git a/Winium/TestApp.Test/py-functional/run_tests.bat b/Winium/TestApp.Test/py-functional/run_tests.bat new file mode 100644 index 0000000..f318a27 --- /dev/null +++ b/Winium/TestApp.Test/py-functional/run_tests.bat @@ -0,0 +1,8 @@ +REM Run Winium.StoreApps.Driver.exe +start ..\..\Winium.StoreApps.Driver\bin\Debug\Winium.StoreApps.Driver.exe + +REM Run tests +pip install -r requirements.txt +py.test tests --tb=native -s + +taskkill /im Winium.StoreApps.Driver.exe /f \ No newline at end of file diff --git a/WindowsUniversalAppDriver/TestApp.Test/py-functional/tests/__init__.py b/Winium/TestApp.Test/py-functional/tests/__init__.py similarity index 100% rename from WindowsUniversalAppDriver/TestApp.Test/py-functional/tests/__init__.py rename to Winium/TestApp.Test/py-functional/tests/__init__.py diff --git a/WindowsUniversalAppDriver/TestApp.Test/py-functional/tests/test_commands.py b/Winium/TestApp.Test/py-functional/tests/test_commands.py similarity index 100% rename from WindowsUniversalAppDriver/TestApp.Test/py-functional/tests/test_commands.py rename to Winium/TestApp.Test/py-functional/tests/test_commands.py diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Shared/App.xaml b/Winium/TestApp/TestApp.Shared/App.xaml similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Shared/App.xaml rename to Winium/TestApp/TestApp.Shared/App.xaml diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Shared/App.xaml.cs b/Winium/TestApp/TestApp.Shared/App.xaml.cs similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Shared/App.xaml.cs rename to Winium/TestApp/TestApp.Shared/App.xaml.cs diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Shared/TestApp.Shared.projitems b/Winium/TestApp/TestApp.Shared/TestApp.Shared.projitems similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Shared/TestApp.Shared.projitems rename to Winium/TestApp/TestApp.Shared/TestApp.Shared.projitems diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Shared/TestApp.Shared.shproj b/Winium/TestApp/TestApp.Shared/TestApp.Shared.shproj similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Shared/TestApp.Shared.shproj rename to Winium/TestApp/TestApp.Shared/TestApp.Shared.shproj diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/Assets/Logo.scale-100.png b/Winium/TestApp/TestApp.Windows/Assets/Logo.scale-100.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/Assets/Logo.scale-100.png rename to Winium/TestApp/TestApp.Windows/Assets/Logo.scale-100.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/Assets/SmallLogo.scale-100.png b/Winium/TestApp/TestApp.Windows/Assets/SmallLogo.scale-100.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/Assets/SmallLogo.scale-100.png rename to Winium/TestApp/TestApp.Windows/Assets/SmallLogo.scale-100.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/Assets/SplashScreen.scale-100.png b/Winium/TestApp/TestApp.Windows/Assets/SplashScreen.scale-100.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/Assets/SplashScreen.scale-100.png rename to Winium/TestApp/TestApp.Windows/Assets/SplashScreen.scale-100.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/Assets/StoreLogo.scale-100.png b/Winium/TestApp/TestApp.Windows/Assets/StoreLogo.scale-100.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/Assets/StoreLogo.scale-100.png rename to Winium/TestApp/TestApp.Windows/Assets/StoreLogo.scale-100.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/MainPage.xaml b/Winium/TestApp/TestApp.Windows/MainPage.xaml similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/MainPage.xaml rename to Winium/TestApp/TestApp.Windows/MainPage.xaml diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/MainPage.xaml.cs b/Winium/TestApp/TestApp.Windows/MainPage.xaml.cs similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/MainPage.xaml.cs rename to Winium/TestApp/TestApp.Windows/MainPage.xaml.cs diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/Package.appxmanifest b/Winium/TestApp/TestApp.Windows/Package.appxmanifest similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/Package.appxmanifest rename to Winium/TestApp/TestApp.Windows/Package.appxmanifest diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/Properties/AssemblyInfo.cs b/Winium/TestApp/TestApp.Windows/Properties/AssemblyInfo.cs similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/Properties/AssemblyInfo.cs rename to Winium/TestApp/TestApp.Windows/Properties/AssemblyInfo.cs diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.Windows/TestApp.Windows.csproj b/Winium/TestApp/TestApp.Windows/TestApp.Windows.csproj similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.Windows/TestApp.Windows.csproj rename to Winium/TestApp/TestApp.Windows/TestApp.Windows.csproj diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/Logo.scale-240.png b/Winium/TestApp/TestApp.WindowsPhone/Assets/Logo.scale-240.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/Logo.scale-240.png rename to Winium/TestApp/TestApp.WindowsPhone/Assets/Logo.scale-240.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/SmallLogo.scale-240.png b/Winium/TestApp/TestApp.WindowsPhone/Assets/SmallLogo.scale-240.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/SmallLogo.scale-240.png rename to Winium/TestApp/TestApp.WindowsPhone/Assets/SmallLogo.scale-240.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/SplashScreen.scale-240.png b/Winium/TestApp/TestApp.WindowsPhone/Assets/SplashScreen.scale-240.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/SplashScreen.scale-240.png rename to Winium/TestApp/TestApp.WindowsPhone/Assets/SplashScreen.scale-240.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/Square71x71Logo.scale-240.png b/Winium/TestApp/TestApp.WindowsPhone/Assets/Square71x71Logo.scale-240.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/Square71x71Logo.scale-240.png rename to Winium/TestApp/TestApp.WindowsPhone/Assets/Square71x71Logo.scale-240.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/StoreLogo.scale-240.png b/Winium/TestApp/TestApp.WindowsPhone/Assets/StoreLogo.scale-240.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/StoreLogo.scale-240.png rename to Winium/TestApp/TestApp.WindowsPhone/Assets/StoreLogo.scale-240.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/WideLogo.scale-240.png b/Winium/TestApp/TestApp.WindowsPhone/Assets/WideLogo.scale-240.png similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Assets/WideLogo.scale-240.png rename to Winium/TestApp/TestApp.WindowsPhone/Assets/WideLogo.scale-240.png diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/MainPage.xaml b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/MainPage.xaml rename to Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs similarity index 98% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs rename to Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs index 9c9af50..ff1b022 100644 --- a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs +++ b/Winium/TestApp/TestApp.WindowsPhone/MainPage.xaml.cs @@ -9,7 +9,7 @@ namespace TestApp using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Navigation; - using WindowsUniversalAppDriver.InnerServer; + using Winium.StoreApps.InnerServer; /// /// An empty page that can be used on its own or navigated to within a Frame. diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Package.appxmanifest b/Winium/TestApp/TestApp.WindowsPhone/Package.appxmanifest similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Package.appxmanifest rename to Winium/TestApp/TestApp.WindowsPhone/Package.appxmanifest diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Properties/AssemblyInfo.cs b/Winium/TestApp/TestApp.WindowsPhone/Properties/AssemblyInfo.cs similarity index 100% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/Properties/AssemblyInfo.cs rename to Winium/TestApp/TestApp.WindowsPhone/Properties/AssemblyInfo.cs diff --git a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/TestApp.WindowsPhone.csproj b/Winium/TestApp/TestApp.WindowsPhone/TestApp.WindowsPhone.csproj similarity index 97% rename from WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/TestApp.WindowsPhone.csproj rename to Winium/TestApp/TestApp.WindowsPhone/TestApp.WindowsPhone.csproj index 888decf..80c879f 100644 --- a/WindowsUniversalAppDriver/TestApp/TestApp.WindowsPhone/TestApp.WindowsPhone.csproj +++ b/Winium/TestApp/TestApp.WindowsPhone/TestApp.WindowsPhone.csproj @@ -83,9 +83,9 @@ - + {e8683025-e703-4293-aa7e-3a9a3555bc40} - WindowsUniversalAppDriver.InnerServer + Winium.StoreApps.InnerServer diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.sln.DotSettings b/Winium/WindowsUniversalAppDriver.sln.DotSettings similarity index 100% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.sln.DotSettings rename to Winium/WindowsUniversalAppDriver.sln.DotSettings diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Command.cs b/Winium/Winium.StoreApps.Common/Command.cs similarity index 97% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Command.cs rename to Winium/Winium.StoreApps.Common/Command.cs index cd62ac4..82333a2 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Command.cs +++ b/Winium/Winium.StoreApps.Common/Command.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.Common +namespace Winium.StoreApps.Common { #region diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/CommandInfo.cs b/Winium/Winium.StoreApps.Common/CommandInfo.cs similarity index 93% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/CommandInfo.cs rename to Winium/Winium.StoreApps.Common/CommandInfo.cs index 72b4d47..e85b3a3 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/CommandInfo.cs +++ b/Winium/Winium.StoreApps.Common/CommandInfo.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.Common +namespace Winium.StoreApps.Common { public class CommandInfo { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/CommandResponse.cs b/Winium/Winium.StoreApps.Common/CommandResponse.cs similarity index 74% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/CommandResponse.cs rename to Winium/Winium.StoreApps.Common/CommandResponse.cs index 9bbb155..a2b6e7d 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/CommandResponse.cs +++ b/Winium/Winium.StoreApps.Common/CommandResponse.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.Common +namespace Winium.StoreApps.Common { #region @@ -8,10 +8,16 @@ public class CommandResponse { - public HttpStatusCode HttpStatusCode { get; set; } + #region Public Properties public string Content { get; set; } + public HttpStatusCode HttpStatusCode { get; set; } + + #endregion + + #region Public Methods and Operators + public static CommandResponse Create(HttpStatusCode code, string content) { return new CommandResponse { HttpStatusCode = code, Content = content }; @@ -19,7 +25,9 @@ public static CommandResponse Create(HttpStatusCode code, string content) public override string ToString() { - return string.Format("{0}: {1}", this.HttpStatusCode, Content); + return string.Format("{0}: {1}", this.HttpStatusCode, this.Content); } + + #endregion } } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/DriverCommand.cs b/Winium/Winium.StoreApps.Common/DriverCommand.cs similarity index 99% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/DriverCommand.cs rename to Winium/Winium.StoreApps.Common/DriverCommand.cs index b7d53de..40391f6 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/DriverCommand.cs +++ b/Winium/Winium.StoreApps.Common/DriverCommand.cs @@ -1,5 +1,5 @@ // Copied from OpenQA -namespace WindowsUniversalAppDriver.Common +namespace Winium.StoreApps.Common { /// /// Values describing the list of commands understood by a remote server using the JSON wire protocol. diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Exceptions/AutomationException.cs b/Winium/Winium.StoreApps.Common/Exceptions/AutomationException.cs similarity index 95% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Exceptions/AutomationException.cs rename to Winium/Winium.StoreApps.Common/Exceptions/AutomationException.cs index aa1607c..58909c2 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Exceptions/AutomationException.cs +++ b/Winium/Winium.StoreApps.Common/Exceptions/AutomationException.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.Common.Exceptions +namespace Winium.StoreApps.Common.Exceptions { #region diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Exceptions/InnerDriverRequestException.cs b/Winium/Winium.StoreApps.Common/Exceptions/InnerDriverRequestException.cs similarity index 91% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Exceptions/InnerDriverRequestException.cs rename to Winium/Winium.StoreApps.Common/Exceptions/InnerDriverRequestException.cs index f047c23..dca7762 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Exceptions/InnerDriverRequestException.cs +++ b/Winium/Winium.StoreApps.Common/Exceptions/InnerDriverRequestException.cs @@ -1,8 +1,12 @@ -namespace WindowsUniversalAppDriver.Common.Exceptions +namespace Winium.StoreApps.Common.Exceptions { + #region + using System; using System.Net; + #endregion + public class InnerDriverRequestException : Exception { #region Constructors and Destructors diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/HttpResponseHelper.cs b/Winium/Winium.StoreApps.Common/HttpResponseHelper.cs similarity index 97% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/HttpResponseHelper.cs rename to Winium/Winium.StoreApps.Common/HttpResponseHelper.cs index ac9c885..4496168 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/HttpResponseHelper.cs +++ b/Winium/Winium.StoreApps.Common/HttpResponseHelper.cs @@ -1,9 +1,13 @@ -namespace WindowsUniversalAppDriver.Common +namespace Winium.StoreApps.Common { + #region + using System.Collections.Generic; using System.Net; using System.Text; + #endregion + public static class HttpResponseHelper { #region Constants @@ -42,6 +46,11 @@ public static Dictionary StatusCodeDescriptors #region Public Methods and Operators + public static bool IsClientError(int code) + { + return code >= 400 && code < 500; + } + public static string ResponseString(HttpStatusCode statusCode, string content) { var contentType = IsClientError((int)statusCode) ? PlainTextContentType : JsonContentType; @@ -59,11 +68,6 @@ public static string ResponseString(HttpStatusCode statusCode, string content) return responseString.ToString(); } - public static bool IsClientError(int code) - { - return code >= 400 && code < 500; - } - #endregion } } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/JsonWireClasses.cs b/Winium/Winium.StoreApps.Common/JsonWireClasses.cs similarity index 92% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/JsonWireClasses.cs rename to Winium/Winium.StoreApps.Common/JsonWireClasses.cs index fda6c52..49e3ab0 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/JsonWireClasses.cs +++ b/Winium/Winium.StoreApps.Common/JsonWireClasses.cs @@ -1,10 +1,12 @@ // -namespace WindowsUniversalAppDriver.Common +namespace Winium.StoreApps.Common { - using System.Collections.Generic; + #region using Newtonsoft.Json; + #endregion + public class JsonWebElementContent { #region Constructors and Destructors diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Properties/AssemblyInfo.cs b/Winium/Winium.StoreApps.Common/Properties/AssemblyInfo.cs similarity index 80% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Properties/AssemblyInfo.cs rename to Winium/Winium.StoreApps.Common/Properties/AssemblyInfo.cs index 660b1f8..b075b41 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/Properties/AssemblyInfo.cs +++ b/Winium/Winium.StoreApps.Common/Properties/AssemblyInfo.cs @@ -1,27 +1,29 @@ -using System.Resources; +#region + using System.Reflection; +using System.Resources; + +#endregion // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("WindowsUniversalAppDriver.Common")] +[assembly: AssemblyTitle("Winium.StoreApps.Common")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WindowsUniversalAppDriver.Common")] +[assembly: AssemblyProduct("Winium.StoreApps.Common")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: NeutralResourcesLanguage("en")] // Version information for an assembly consists of the following four values: -// // Major Version // Minor Version // Build Number // Revision -// // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.*")] +[assembly: AssemblyVersion("1.0.*")] diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/ResponseStatus.cs b/Winium/Winium.StoreApps.Common/ResponseStatus.cs similarity index 94% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/ResponseStatus.cs rename to Winium/Winium.StoreApps.Common/ResponseStatus.cs index 5cb5727..ab8cb47 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/ResponseStatus.cs +++ b/Winium/Winium.StoreApps.Common/ResponseStatus.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.Common +namespace Winium.StoreApps.Common { public enum ResponseStatus { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/WindowsUniversalAppDriver.Common.csproj b/Winium/Winium.StoreApps.Common/Winium.StoreApps.Common.csproj similarity index 96% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/WindowsUniversalAppDriver.Common.csproj rename to Winium/Winium.StoreApps.Common/Winium.StoreApps.Common.csproj index ceb1a90..1144dd8 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/WindowsUniversalAppDriver.Common.csproj +++ b/Winium/Winium.StoreApps.Common/Winium.StoreApps.Common.csproj @@ -8,8 +8,8 @@ {3C8D0B9C-576B-4778-97B1-6839AA944AEE} Library Properties - WindowsUniversalAppDriver.Common - WindowsUniversalAppDriver.Common + Winium.StoreApps.Common + Winium.StoreApps.Common en-US 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/packages.config b/Winium/Winium.StoreApps.Common/packages.config similarity index 100% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.Common/packages.config rename to Winium/Winium.StoreApps.Common/packages.config diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/App.config b/Winium/Winium.StoreApps.Driver/App.config similarity index 100% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/App.config rename to Winium/Winium.StoreApps.Driver/App.config diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Automator/Automator.cs b/Winium/Winium.StoreApps.Driver/Automator/Automator.cs similarity index 96% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/Automator/Automator.cs rename to Winium/Winium.StoreApps.Driver/Automator/Automator.cs index e85e33a..8ddbd8e 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Automator/Automator.cs +++ b/Winium/Winium.StoreApps.Driver/Automator/Automator.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.Automator +namespace Winium.StoreApps.Driver.Automator { #region @@ -9,8 +9,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.EmulatorHelpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.Driver.EmulatorHelpers; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Automator/Capabilities.cs b/Winium/Winium.StoreApps.Driver/Automator/Capabilities.cs similarity index 96% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/Automator/Capabilities.cs rename to Winium/Winium.StoreApps.Driver/Automator/Capabilities.cs index 649a7f1..3e627cb 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Automator/Capabilities.cs +++ b/Winium/Winium.StoreApps.Driver/Automator/Capabilities.cs @@ -1,10 +1,14 @@ -namespace WindowsUniversalAppDriver.Automator +namespace Winium.StoreApps.Driver.Automator { + #region + using System.Collections.Generic; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; + #endregion + internal class Capabilities { #region Constructors and Destructors @@ -37,15 +41,15 @@ public static string PlatformName [JsonProperty("app")] public string App { get; set; } - [JsonProperty("files")] - public Dictionary Files { get; set; } - [JsonProperty("debugConnectToRunningApp")] public bool DebugConnectToRunningApp { get; set; } [JsonProperty("deviceName")] public string DeviceName { get; set; } + [JsonProperty("files")] + public Dictionary Files { get; set; } + [JsonProperty("innerPort")] public int InnerPort { get; set; } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutorDispatchTable.cs b/Winium/Winium.StoreApps.Driver/CommandExecutorDispatchTable.cs similarity index 88% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutorDispatchTable.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutorDispatchTable.cs index 1664066..5dc9016 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutorDispatchTable.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutorDispatchTable.cs @@ -1,12 +1,16 @@ -namespace WindowsUniversalAppDriver +namespace Winium.StoreApps.Driver { + #region + using System; using System.Collections.Generic; using System.Linq; using System.Reflection; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.CommandExecutors; + using Winium.StoreApps.Common; + using Winium.StoreApps.Driver.CommandExecutors; + + #endregion internal class CommandExecutorDispatchTable { @@ -50,7 +54,7 @@ private void ConstructDispatcherTable() this.commandExecutorsRepository = new Dictionary(); // TODO: bad const - const string ExecutorsNamespace = "WindowsUniversalAppDriver.CommandExecutors"; + const string ExecutorsNamespace = "Winium.StoreApps.Driver.CommandExecutors"; var q = (from t in Assembly.GetExecutingAssembly().GetTypes() diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ClickElementExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/ClickElementExecutor.cs similarity index 91% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ClickElementExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/ClickElementExecutor.cs index 4f6b935..8aef706 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ClickElementExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/ClickElementExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { internal class ClickElementExecutor : CommandExecutorBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CloseExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/CloseExecutor.cs similarity index 88% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CloseExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/CloseExecutor.cs index abd3619..ebd747c 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CloseExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/CloseExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { internal class CloseExecutor : CommandExecutorBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CommandExecutorBase.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/CommandExecutorBase.cs similarity index 92% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CommandExecutorBase.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/CommandExecutorBase.cs index 42b78b7..cf89732 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CommandExecutorBase.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/CommandExecutorBase.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region @@ -7,9 +7,9 @@ using Newtonsoft.Json; - using WindowsUniversalAppDriver.Automator; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + using Winium.StoreApps.Driver.Automator; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CommandExecutorForward.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/CommandExecutorForward.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CommandExecutorForward.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/CommandExecutorForward.cs index 1c97c1e..f392807 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/CommandExecutorForward.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/CommandExecutorForward.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { internal class CommandExecutorForward : CommandExecutorBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ExecuteScriptExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/ExecuteScriptExecutor.cs similarity index 85% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ExecuteScriptExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/ExecuteScriptExecutor.cs index 539f7ef..8e2d6bc 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ExecuteScriptExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/ExecuteScriptExecutor.cs @@ -1,20 +1,51 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { - #region using + #region using System.Windows.Forms; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; - using Newtonsoft.Json; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + #endregion internal class ExecuteScriptExecutor : CommandExecutorBase { #region Methods + internal void ExecuteMobileScript(string command) + { + switch (command) + { + case "start": + this.Automator.EmulatorController.TypeKey(Keys.F2); + break; + case "search": + this.Automator.EmulatorController.TypeKey(Keys.F3); + break; + default: + const string url = + "https://github.com/2gis/windows-universal-app-driver/wiki/Command-Execute-Script#press-hardware-button"; + var msg = string.Format( + "Unknown 'mobile:' script command '{0}'. See {1} for supported commands.", + command ?? string.Empty, + url); + throw new AutomationException(msg, ResponseStatus.JavaScriptError); + } + } + + internal void ForwardCommand() + { + var responseBody = this.Automator.CommandForwarder.ForwardCommand(this.ExecutedCommand); + var deserializeObject = JsonConvert.DeserializeObject(responseBody); + if (deserializeObject.Status != ResponseStatus.Success) + { + throw new AutomationException(deserializeObject.Value.ToString(), ResponseStatus.JavaScriptError); + } + } + protected override string DoImpl() { string command; @@ -45,35 +76,6 @@ protected override string DoImpl() return this.JsonResponse(); } - - internal void ExecuteMobileScript(string command) - { - switch (command) - { - case "start": - this.Automator.EmulatorController.TypeKey(Keys.F2); - break; - case "search": - this.Automator.EmulatorController.TypeKey(Keys.F3); - break; - default: - const string url = - "https://github.com/2gis/windows-universal-app-driver/wiki/Command-Execute-Script#press-hardware-button"; - var msg = string.Format("Unknown 'mobile:' script command '{0}'. See {1} for supported commands.", - command ?? string.Empty, url); - throw new AutomationException(msg, ResponseStatus.JavaScriptError); - } - } - - internal void ForwardCommand() - { - var responseBody = this.Automator.CommandForwarder.ForwardCommand(this.ExecutedCommand); - var deserializeObject = JsonConvert.DeserializeObject(responseBody); - if (deserializeObject.Status != ResponseStatus.Success) - { - throw new AutomationException(deserializeObject.Value.ToString(), ResponseStatus.JavaScriptError); - } - } #endregion } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetCurrentWindowHandleExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/GetCurrentWindowHandleExecutor.cs similarity index 79% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetCurrentWindowHandleExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/GetCurrentWindowHandleExecutor.cs index b39d640..71e1908 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetCurrentWindowHandleExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/GetCurrentWindowHandleExecutor.cs @@ -1,8 +1,8 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region - using WindowsUniversalAppDriver.Common; + using Winium.StoreApps.Common; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetOrientationExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/GetOrientationExecutor.cs similarity index 75% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetOrientationExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/GetOrientationExecutor.cs index fcee555..e7c7360 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetOrientationExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/GetOrientationExecutor.cs @@ -1,10 +1,14 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { + #region + using System; using Newtonsoft.Json; - using WindowsUniversalAppDriver.Common; + using Winium.StoreApps.Common; + + #endregion internal class GetOrientationExecutor : CommandExecutorBase { @@ -18,7 +22,9 @@ protected override string DoImpl() if (deserializeObject.Status == ResponseStatus.Success) { var value = deserializeObject.Value.ToString(); - orientation = value.StartsWith("landscape", StringComparison.OrdinalIgnoreCase) ? "LANDSCAPE" : "PORTRAIT"; + orientation = value.StartsWith("landscape", StringComparison.OrdinalIgnoreCase) + ? "LANDSCAPE" + : "PORTRAIT"; } return this.JsonResponse(ResponseStatus.Success, orientation); diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetWindowSizeExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/GetWindowSizeExecutor.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetWindowSizeExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/GetWindowSizeExecutor.cs index 43005c0..f1cebd1 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GetWindowSizeExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/GetWindowSizeExecutor.cs @@ -1,8 +1,12 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { + #region + using System.Collections.Generic; - using WindowsUniversalAppDriver.Common; + using Winium.StoreApps.Common; + + #endregion internal class GetWindowSizeExecutor : CommandExecutorBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GoBackExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/GoBackExecutor.cs similarity index 87% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GoBackExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/GoBackExecutor.cs index 9fb22c0..29e719d 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/GoBackExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/GoBackExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseClickExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/MouseClickExecutor.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseClickExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/MouseClickExecutor.cs index 9930c5b..b319067 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseClickExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/MouseClickExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { internal class MouseClickExecutor : CommandExecutorBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseDownExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/MouseDownExecutor.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseDownExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/MouseDownExecutor.cs index ea84472..23165fc 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseDownExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/MouseDownExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { internal class MouseDownExecutor : CommandExecutorBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseMoveToExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/MouseMoveToExecutor.cs similarity index 92% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseMoveToExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/MouseMoveToExecutor.cs index c40e4b3..c76730f 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseMoveToExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/MouseMoveToExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region @@ -6,7 +6,7 @@ using System.Drawing; using System.Globalization; - using WindowsUniversalAppDriver.Automator; + using Winium.StoreApps.Driver.Automator; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseUpExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/MouseUpExecutor.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseUpExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/MouseUpExecutor.cs index 34fafdf..02969e0 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/MouseUpExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/MouseUpExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { internal class MouseUpExecutor : CommandExecutorBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/NewSessionExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/NewSessionExecutor.cs similarity index 94% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/NewSessionExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/NewSessionExecutor.cs index e644cf0..99c0195 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/NewSessionExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/NewSessionExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region @@ -10,9 +10,9 @@ using Newtonsoft.Json; - using WindowsUniversalAppDriver.Automator; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.EmulatorHelpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.Driver.Automator; + using Winium.StoreApps.Driver.EmulatorHelpers; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/QuitExecuter.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/QuitExecuter.cs similarity index 87% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/QuitExecuter.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/QuitExecuter.cs index 2ad29f3..ad514f4 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/QuitExecuter.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/QuitExecuter.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { internal class QuitExecutor : CommandExecutorBase { @@ -11,7 +11,6 @@ protected override string DoImpl() // TODO quit should close all open windows (apps) and possible close the emulator this.Automator.Deployer.Uninstall(); } - return this.JsonResponse(); } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ScreenshotExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/ScreenshotExecutor.cs similarity index 74% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ScreenshotExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/ScreenshotExecutor.cs index 9aa4992..ebb0f51 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/ScreenshotExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/ScreenshotExecutor.cs @@ -1,6 +1,10 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { - using WindowsUniversalAppDriver.Common; + #region + + using Winium.StoreApps.Common; + + #endregion internal class ScreenshotExecutor : CommandExecutorBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/SendKeysToElementExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/SendKeysToElementExecutor.cs similarity index 97% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/SendKeysToElementExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/SendKeysToElementExecutor.cs index bec8cf8..bbbff92 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/SendKeysToElementExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/SendKeysToElementExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchFlickExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/TouchFlickExecutor.cs similarity index 92% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchFlickExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/TouchFlickExecutor.cs index 818e87f..5ae574e 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchFlickExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/TouchFlickExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region @@ -6,8 +6,8 @@ using System.Drawing; using System.Globalization; - using WindowsUniversalAppDriver.Automator; - using WindowsUniversalAppDriver.EmulatorHelpers; + using Winium.StoreApps.Driver.Automator; + using Winium.StoreApps.Driver.EmulatorHelpers; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchScrollExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/TouchScrollExecutor.cs similarity index 89% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchScrollExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/TouchScrollExecutor.cs index d18d6c6..065de06 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchScrollExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/TouchScrollExecutor.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region @@ -6,8 +6,8 @@ using System.Drawing; using System.Globalization; - using WindowsUniversalAppDriver.Automator; - using WindowsUniversalAppDriver.EmulatorHelpers; + using Winium.StoreApps.Driver.Automator; + using Winium.StoreApps.Driver.EmulatorHelpers; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchSingleTapExecutor.cs b/Winium/Winium.StoreApps.Driver/CommandExecutors/TouchSingleTapExecutor.cs similarity index 82% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchSingleTapExecutor.cs rename to Winium/Winium.StoreApps.Driver/CommandExecutors/TouchSingleTapExecutor.cs index 8dd015f..2f28d6f 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandExecutors/TouchSingleTapExecutor.cs +++ b/Winium/Winium.StoreApps.Driver/CommandExecutors/TouchSingleTapExecutor.cs @@ -1,9 +1,9 @@ -namespace WindowsUniversalAppDriver.CommandExecutors +namespace Winium.StoreApps.Driver.CommandExecutors { #region - using WindowsUniversalAppDriver.Automator; - using WindowsUniversalAppDriver.EmulatorHelpers; + using Winium.StoreApps.Driver.Automator; + using Winium.StoreApps.Driver.EmulatorHelpers; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandLineOptions.cs b/Winium/Winium.StoreApps.Driver/CommandLineOptions.cs similarity index 79% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandLineOptions.cs rename to Winium/Winium.StoreApps.Driver/CommandLineOptions.cs index 727e185..9060cce 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/CommandLineOptions.cs +++ b/Winium/Winium.StoreApps.Driver/CommandLineOptions.cs @@ -1,13 +1,18 @@ -namespace WindowsUniversalAppDriver +namespace Winium.StoreApps.Driver { + #region + using CommandLine; using CommandLine.Text; + #endregion + internal class CommandLineOptions { #region Public Properties - [Option("log-path", Required = false, HelpText = "write server log to file instead of stdout, increases log level to INFO")] + [Option("log-path", Required = false, + HelpText = "write server log to file instead of stdout, increases log level to INFO")] public string LogPath { get; set; } [Option("port", Required = false, HelpText = "port to listen on")] diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/Deployer81.cs b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/Deployer81.cs similarity index 87% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/Deployer81.cs rename to Winium/Winium.StoreApps.Driver/EmulatorHelpers/Deployer81.cs index 29008c1..5f69116 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/Deployer81.cs +++ b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/Deployer81.cs @@ -1,6 +1,8 @@ // Library needed to connect to the Windows Phone X Emulator -namespace WindowsUniversalAppDriver.EmulatorHelpers +namespace Winium.StoreApps.Driver.EmulatorHelpers { + #region + using System; using System.Collections.Generic; using System.Globalization; @@ -12,6 +14,8 @@ namespace WindowsUniversalAppDriver.EmulatorHelpers using Microsoft.SmartDevice.Connectivity.Interface; using Microsoft.SmartDevice.MultiTargeting.Connectivity; + #endregion + /// /// App Deploy for 8.1 or greater (uses Microsoft.Phone.Tools.Deploy shipped with Microsoft SDKs\Windows Phone\v8.1\Tools\AppDeploy) /// @@ -20,11 +24,11 @@ public class Deployer81 : IDeployer { #region Fields - private readonly DeviceInfo deviceInfo; + private readonly string appPath; private readonly ConnectableDevice connectableDevice; - private readonly string appPath; + private readonly DeviceInfo deviceInfo; private IAppManifestInfo appManifestInfo; @@ -54,9 +58,10 @@ public Deployer81(string desiredDevice, string appPath) this.deviceInfo = devices.First(x => !x.ToString().Equals("Device")); } - var propertyInfo = deviceInfo.GetType().GetTypeInfo().GetDeclaredProperty("DeviceId"); - var deviceId = (string)propertyInfo.GetValue(deviceInfo); - this.connectableDevice = new MultiTargetingConnectivity(CultureInfo.CurrentUICulture.LCID).GetConnectableDevice(deviceId); + var propertyInfo = this.deviceInfo.GetType().GetTypeInfo().GetDeclaredProperty("DeviceId"); + var deviceId = (string)propertyInfo.GetValue(this.deviceInfo); + this.connectableDevice = + new MultiTargetingConnectivity(CultureInfo.CurrentUICulture.LCID).GetConnectableDevice(deviceId); Logger.Info("Target emulator: {0}", this.DeviceName); } @@ -79,17 +84,27 @@ public string DeviceName public void Install() { - this.appManifestInfo = Utils.ReadAppManifestInfoFromPackage(appPath); - - Utils.InstallApplication(this.deviceInfo, this.appManifestInfo, DeploymentOptions.None, appPath); + this.appManifestInfo = Utils.ReadAppManifestInfoFromPackage(this.appPath); + + Utils.InstallApplication(this.deviceInfo, this.appManifestInfo, DeploymentOptions.None, this.appPath); var device = this.connectableDevice.Connect(true); - this.application = device.GetApplication(appManifestInfo.ProductId); + this.application = device.GetApplication(this.appManifestInfo.ProductId); device.Activate(); - + Logger.Info("Successfully deployed using Microsoft.Phone.Tools.Deploy"); } + public void Launch() + { + this.application.Launch(); + } + + public void ReciveFiles(Dictionary files) + { + throw new NotImplementedException("Deployer81.ReciveFiles"); + } + public void SendFiles(Dictionary files) { if (files == null || !files.Any()) @@ -111,16 +126,6 @@ public void SendFiles(Dictionary files) } } - public void ReciveFiles(Dictionary files) - { - throw new NotImplementedException("Deployer81.ReciveFiles"); - } - - public void Launch() - { - this.application.Launch(); - } - public void Terminate() { throw new NotImplementedException("Deployer81.Terminate"); @@ -129,7 +134,7 @@ public void Terminate() public void Uninstall() { if (this.application == null) - { + { Logger.Debug("Could not uninstall application that is already uninstalled."); return; } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/EmulatorController.cs b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/EmulatorController.cs similarity index 97% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/EmulatorController.cs rename to Winium/Winium.StoreApps.Driver/EmulatorHelpers/EmulatorController.cs index 65dc802..2b79705 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/EmulatorController.cs +++ b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/EmulatorController.cs @@ -1,5 +1,7 @@ -namespace WindowsUniversalAppDriver.EmulatorHelpers +namespace Winium.StoreApps.Driver.EmulatorHelpers { + #region + using System; using System.Drawing; using System.Drawing.Imaging; @@ -11,8 +13,10 @@ using Microsoft.Xde.Common; using Microsoft.Xde.Wmi; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + + #endregion internal class EmulatorController { @@ -161,11 +165,6 @@ public bool PhonePointVisibleOnScreen(Point phonePoint) return phoneScreen.Contains(phonePoint); } - public void TypeKey(Keys key) - { - this.emulatorVm.TypeKey(key); - } - public string TakeScreenshot() { var size = this.emulatorVm.GetCurrentResolution(); @@ -176,6 +175,11 @@ public string TakeScreenshot() return base64; } + public void TypeKey(Keys key) + { + this.emulatorVm.TypeKey(key); + } + #endregion #region Methods diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/FlickGesture.cs b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/FlickGesture.cs similarity index 91% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/FlickGesture.cs rename to Winium/Winium.StoreApps.Driver/EmulatorHelpers/FlickGesture.cs index b7aceca..c068eac 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/FlickGesture.cs +++ b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/FlickGesture.cs @@ -1,9 +1,13 @@ -namespace WindowsUniversalAppDriver.EmulatorHelpers +namespace Winium.StoreApps.Driver.EmulatorHelpers { + #region + using System; using System.Collections.Generic; using System.Drawing; + #endregion + internal class FlickGesture : IGesture { #region Constants @@ -17,7 +21,8 @@ internal class FlickGesture : IGesture public FlickGesture(Point startPoint, int xOffset, int yOffset, double speed) { this.StartPosition = startPoint; - this.PeriodBetweenPoints = TimeSpan.FromMilliseconds(this.Distance() / (NumberOfIntermediatePoints + 1) / speed); + this.PeriodBetweenPoints = + TimeSpan.FromMilliseconds(this.Distance() / (NumberOfIntermediatePoints + 1) / speed); this.EndPosition = new Point(startPoint.X + xOffset, startPoint.Y + yOffset); } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/IDeployer.cs b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/IDeployer.cs similarity index 85% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/IDeployer.cs rename to Winium/Winium.StoreApps.Driver/EmulatorHelpers/IDeployer.cs index 7cc7964..cc78de7 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/IDeployer.cs +++ b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/IDeployer.cs @@ -1,7 +1,11 @@ -namespace WindowsUniversalAppDriver.EmulatorHelpers +namespace Winium.StoreApps.Driver.EmulatorHelpers { + #region + using System.Collections.Generic; + #endregion + internal interface IDeployer { #region Public Properties @@ -14,11 +18,11 @@ internal interface IDeployer void Install(); - void SendFiles(Dictionary files); + void Launch(); void ReciveFiles(Dictionary files); - void Launch(); + void SendFiles(Dictionary files); void Terminate(); diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/IGesture.cs b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/IGesture.cs similarity index 81% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/IGesture.cs rename to Winium/Winium.StoreApps.Driver/EmulatorHelpers/IGesture.cs index 32569cf..0f00e67 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/IGesture.cs +++ b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/IGesture.cs @@ -1,9 +1,13 @@ -namespace WindowsUniversalAppDriver.EmulatorHelpers +namespace Winium.StoreApps.Driver.EmulatorHelpers { + #region + using System; using System.Collections.Generic; using System.Drawing; + #endregion + internal interface IGesture { #region Public Properties diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/ScrollGesture.cs b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/ScrollGesture.cs similarity index 96% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/ScrollGesture.cs rename to Winium/Winium.StoreApps.Driver/EmulatorHelpers/ScrollGesture.cs index 7bce612..f56eeba 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/ScrollGesture.cs +++ b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/ScrollGesture.cs @@ -1,9 +1,13 @@ -namespace WindowsUniversalAppDriver.EmulatorHelpers +namespace Winium.StoreApps.Driver.EmulatorHelpers { + #region + using System; using System.Collections.Generic; using System.Drawing; + #endregion + internal class ScrollGesture : IGesture { #region Constructors and Destructors diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/TapGesture.cs b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/TapGesture.cs similarity index 90% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/TapGesture.cs rename to Winium/Winium.StoreApps.Driver/EmulatorHelpers/TapGesture.cs index 05ac9fe..081b2de 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/EmulatorHelpers/TapGesture.cs +++ b/Winium/Winium.StoreApps.Driver/EmulatorHelpers/TapGesture.cs @@ -1,9 +1,13 @@ -namespace WindowsUniversalAppDriver.EmulatorHelpers +namespace Winium.StoreApps.Driver.EmulatorHelpers { + #region + using System; using System.Collections.Generic; using System.Drawing; + #endregion + internal class TapGesture : IGesture { #region Constructors and Destructors diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/HttpRequest.cs b/Winium/Winium.StoreApps.Driver/HttpRequest.cs similarity index 98% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/HttpRequest.cs rename to Winium/Winium.StoreApps.Driver/HttpRequest.cs index 2f7f195..1095489 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/HttpRequest.cs +++ b/Winium/Winium.StoreApps.Driver/HttpRequest.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver +namespace Winium.StoreApps.Driver { #region diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Listener.cs b/Winium/Winium.StoreApps.Driver/Listener.cs similarity index 98% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/Listener.cs rename to Winium/Winium.StoreApps.Driver/Listener.cs index 9044e04..cb979cd 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Listener.cs +++ b/Winium/Winium.StoreApps.Driver/Listener.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver +namespace Winium.StoreApps.Driver { #region @@ -8,7 +8,7 @@ using System.Net; using System.Net.Sockets; - using WindowsUniversalAppDriver.Common; + using Winium.StoreApps.Common; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Logger.cs b/Winium/Winium.StoreApps.Driver/Logger.cs similarity index 95% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/Logger.cs rename to Winium/Winium.StoreApps.Driver/Logger.cs index 0d93dc7..4199301 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Logger.cs +++ b/Winium/Winium.StoreApps.Driver/Logger.cs @@ -1,10 +1,14 @@ -namespace WindowsUniversalAppDriver +namespace Winium.StoreApps.Driver { + #region + using System.ComponentModel; using NLog; using NLog.Targets; + #endregion + internal static class Logger { #region Constants @@ -19,10 +23,6 @@ internal static class Logger #endregion - #region Constructors and Destructors - - #endregion - #region Public Methods and Operators public static void Debug([Localizable(false)] string message, params object[] args) diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Program.cs b/Winium/Winium.StoreApps.Driver/Program.cs similarity index 94% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/Program.cs rename to Winium/Winium.StoreApps.Driver/Program.cs index 8a77ef0..024a171 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Program.cs +++ b/Winium/Winium.StoreApps.Driver/Program.cs @@ -1,7 +1,11 @@ -namespace WindowsUniversalAppDriver +namespace Winium.StoreApps.Driver { + #region + using System; + #endregion + internal class Program { #region Methods diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Properties/AssemblyInfo.cs b/Winium/Winium.StoreApps.Driver/Properties/AssemblyInfo.cs similarity index 78% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/Properties/AssemblyInfo.cs rename to Winium/Winium.StoreApps.Driver/Properties/AssemblyInfo.cs index 75e92e9..75478fd 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Properties/AssemblyInfo.cs +++ b/Winium/Winium.StoreApps.Driver/Properties/AssemblyInfo.cs @@ -1,14 +1,18 @@ -using System.Reflection; +#region + +using System.Reflection; using System.Runtime.InteropServices; +#endregion + // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("WindowsUniversalAppDriver")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("Winium.StoreApps.Driver")] +[assembly: AssemblyDescription("Selenium Remote WebDriver implementation for test automation of Windows StoreApps.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WindowsUniversalAppDriver")] +[assembly: AssemblyProduct("Winium.StoreApps.Driver")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -22,14 +26,12 @@ [assembly: Guid("b284b43c-0ce7-4615-b297-47eb98293089")] // Version information for an assembly consists of the following four values: -// // Major Version // Minor Version // Build Number // Revision -// // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Requester.cs b/Winium/Winium.StoreApps.Driver/Requester.cs similarity index 96% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/Requester.cs rename to Winium/Winium.StoreApps.Driver/Requester.cs index e8dae8e..ed1004a 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/Requester.cs +++ b/Winium/Winium.StoreApps.Driver/Requester.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver +namespace Winium.StoreApps.Driver { #region @@ -10,8 +10,8 @@ using Newtonsoft.Json; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/UriDispatchTables.cs b/Winium/Winium.StoreApps.Driver/UriDispatchTables.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/UriDispatchTables.cs rename to Winium/Winium.StoreApps.Driver/UriDispatchTables.cs index 953d7ed..f7b0c69 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/UriDispatchTables.cs +++ b/Winium/Winium.StoreApps.Driver/UriDispatchTables.cs @@ -1,12 +1,12 @@ -namespace WindowsUniversalAppDriver +namespace Winium.StoreApps.Driver { - #region using + #region using System; using System.Collections.Generic; using System.Reflection; - using WindowsUniversalAppDriver.Common; + using Winium.StoreApps.Common; #endregion @@ -90,45 +90,25 @@ private void ConstructDispatcherTables(Uri prefix) private void InitializeCommandDictionary() { - this.commandDictionary.Add( - DriverCommand.DefineDriverMapping, - new CommandInfo("POST", "/config/drivers")); - this.commandDictionary.Add( - DriverCommand.Status, - new CommandInfo("GET", "/status")); - this.commandDictionary.Add( - DriverCommand.NewSession, - new CommandInfo("POST", "/session")); - this.commandDictionary.Add( - DriverCommand.GetSessionList, - new CommandInfo("GET", "/sessions")); + this.commandDictionary.Add(DriverCommand.DefineDriverMapping, new CommandInfo("POST", "/config/drivers")); + this.commandDictionary.Add(DriverCommand.Status, new CommandInfo("GET", "/status")); + this.commandDictionary.Add(DriverCommand.NewSession, new CommandInfo("POST", "/session")); + this.commandDictionary.Add(DriverCommand.GetSessionList, new CommandInfo("GET", "/sessions")); this.commandDictionary.Add( DriverCommand.GetSessionCapabilities, new CommandInfo("GET", "/session/{sessionId}")); - this.commandDictionary.Add( - DriverCommand.Quit, - new CommandInfo("DELETE", "/session/{sessionId}")); + this.commandDictionary.Add(DriverCommand.Quit, new CommandInfo("DELETE", "/session/{sessionId}")); this.commandDictionary.Add( DriverCommand.GetCurrentWindowHandle, new CommandInfo("GET", "/session/{sessionId}/window_handle")); this.commandDictionary.Add( DriverCommand.GetWindowHandles, new CommandInfo("GET", "/session/{sessionId}/window_handles")); - this.commandDictionary.Add( - DriverCommand.GetCurrentUrl, - new CommandInfo("GET", "/session/{sessionId}/url")); - this.commandDictionary.Add( - DriverCommand.Get, - new CommandInfo("POST", "/session/{sessionId}/url")); - this.commandDictionary.Add( - DriverCommand.GoForward, - new CommandInfo("POST", "/session/{sessionId}/forward")); - this.commandDictionary.Add( - DriverCommand.GoBack, - new CommandInfo("POST", "/session/{sessionId}/back")); - this.commandDictionary.Add( - DriverCommand.Refresh, - new CommandInfo("POST", "/session/{sessionId}/refresh")); + this.commandDictionary.Add(DriverCommand.GetCurrentUrl, new CommandInfo("GET", "/session/{sessionId}/url")); + this.commandDictionary.Add(DriverCommand.Get, new CommandInfo("POST", "/session/{sessionId}/url")); + this.commandDictionary.Add(DriverCommand.GoForward, new CommandInfo("POST", "/session/{sessionId}/forward")); + this.commandDictionary.Add(DriverCommand.GoBack, new CommandInfo("POST", "/session/{sessionId}/back")); + this.commandDictionary.Add(DriverCommand.Refresh, new CommandInfo("POST", "/session/{sessionId}/refresh")); this.commandDictionary.Add( DriverCommand.ExecuteScript, new CommandInfo("POST", "/session/{sessionId}/execute")); @@ -150,9 +130,7 @@ private void InitializeCommandDictionary() this.commandDictionary.Add( DriverCommand.GetAllCookies, new CommandInfo("GET", "/session/{sessionId}/cookie")); - this.commandDictionary.Add( - DriverCommand.AddCookie, - new CommandInfo("POST", "/session/{sessionId}/cookie")); + this.commandDictionary.Add(DriverCommand.AddCookie, new CommandInfo("POST", "/session/{sessionId}/cookie")); this.commandDictionary.Add( DriverCommand.DeleteAllCookies, new CommandInfo("DELETE", "/session/{sessionId}/cookie")); @@ -162,9 +140,7 @@ private void InitializeCommandDictionary() this.commandDictionary.Add( DriverCommand.GetPageSource, new CommandInfo("GET", "/session/{sessionId}/source")); - this.commandDictionary.Add( - DriverCommand.GetTitle, - new CommandInfo("GET", "/session/{sessionId}/title")); + this.commandDictionary.Add(DriverCommand.GetTitle, new CommandInfo("GET", "/session/{sessionId}/title")); this.commandDictionary.Add( DriverCommand.FindElement, new CommandInfo("POST", "/session/{sessionId}/element")); @@ -228,9 +204,7 @@ private void InitializeCommandDictionary() this.commandDictionary.Add( DriverCommand.ElementEquals, new CommandInfo("GET", "/session/{sessionId}/element/{id}/equals/{other}")); - this.commandDictionary.Add( - DriverCommand.Close, - new CommandInfo("DELETE", "/session/{sessionId}/window")); + this.commandDictionary.Add(DriverCommand.Close, new CommandInfo("DELETE", "/session/{sessionId}/window")); this.commandDictionary.Add( DriverCommand.GetWindowSize, new CommandInfo("GET", "/session/{sessionId}/window/{windowHandle}/size")); @@ -273,18 +247,14 @@ private void InitializeCommandDictionary() this.commandDictionary.Add( DriverCommand.SetAsyncScriptTimeout, new CommandInfo("POST", "/session/{sessionId}/timeouts/async_script")); - this.commandDictionary.Add( - DriverCommand.MouseClick, - new CommandInfo("POST", "/session/{sessionId}/click")); + this.commandDictionary.Add(DriverCommand.MouseClick, new CommandInfo("POST", "/session/{sessionId}/click")); this.commandDictionary.Add( DriverCommand.MouseDoubleClick, new CommandInfo("POST", "/session/{sessionId}/doubleclick")); this.commandDictionary.Add( DriverCommand.MouseDown, new CommandInfo("POST", "/session/{sessionId}/buttondown")); - this.commandDictionary.Add( - DriverCommand.MouseUp, - new CommandInfo("POST", "/session/{sessionId}/buttonup")); + this.commandDictionary.Add(DriverCommand.MouseUp, new CommandInfo("POST", "/session/{sessionId}/buttonup")); this.commandDictionary.Add( DriverCommand.MouseMoveTo, new CommandInfo("POST", "/session/{sessionId}/moveto")); @@ -315,9 +285,7 @@ private void InitializeCommandDictionary() this.commandDictionary.Add( DriverCommand.TouchFlick, new CommandInfo("POST", "/session/{sessionId}/touch/flick")); - this.commandDictionary.Add( - DriverCommand.UploadFile, - new CommandInfo("POST", "/session/{sessionId}/file")); + this.commandDictionary.Add(DriverCommand.UploadFile, new CommandInfo("POST", "/session/{sessionId}/file")); } #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/WindowsUniversalAppDriver.csproj b/Winium/Winium.StoreApps.Driver/Winium.StoreApps.Driver.csproj similarity index 92% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/WindowsUniversalAppDriver.csproj rename to Winium/Winium.StoreApps.Driver/Winium.StoreApps.Driver.csproj index 8c9303a..142c6a0 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/WindowsUniversalAppDriver.csproj +++ b/Winium/Winium.StoreApps.Driver/Winium.StoreApps.Driver.csproj @@ -7,8 +7,8 @@ {B6BE579B-B008-45B2-9740-12F0E6223661} Exe Properties - WindowsUniversalAppDriver - WindowsUniversalAppDriver + Winium.StoreApps.Driver + Winium.StoreApps.Driver v4.5.1 512 @@ -39,7 +39,7 @@ ..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll - ..\..\..\..\..\..\..\Program Files (x86)\Microsoft SDKs\Windows Phone\v8.1\Tools\AppDeploy\Microsoft.Phone.Tools.Deploy.dll + C:\Program Files (x86)\Microsoft SDKs\Windows Phone\v8.1\Tools\AppDeploy\Microsoft.Phone.Tools.Deploy.dll @@ -48,7 +48,7 @@ ..\..\..\..\..\..\..\Program Files (x86)\Microsoft XDE\8.1\Microsoft.Xde.Common.dll - ..\..\..\..\..\..\..\Program Files (x86)\Microsoft XDE\8.1\Microsoft.Xde.Wmi.dll + C:\Program Files (x86)\Microsoft XDE\8.1\Microsoft.Xde.Wmi.dll ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -112,9 +112,9 @@ - + {3c8d0b9c-576b-4778-97b1-6839aa944aee} - WindowsUniversalAppDriver.Common + Winium.StoreApps.Common diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver/packages.config b/Winium/Winium.StoreApps.Driver/packages.config similarity index 100% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver/packages.config rename to Winium/Winium.StoreApps.Driver/packages.config diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AcceptedRequest.cs b/Winium/Winium.StoreApps.InnerServer/AcceptedRequest.cs similarity index 97% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AcceptedRequest.cs rename to Winium/Winium.StoreApps.InnerServer/AcceptedRequest.cs index 092466e..a12d0bb 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AcceptedRequest.cs +++ b/Winium/Winium.StoreApps.InnerServer/AcceptedRequest.cs @@ -1,5 +1,7 @@ -namespace WindowsUniversalAppDriver.InnerServer +namespace Winium.StoreApps.InnerServer { + #region + using System; using System.Collections.Generic; using System.Globalization; @@ -7,6 +9,8 @@ using Windows.Storage.Streams; + #endregion + internal class AcceptedRequest { #region Constructors and Destructors @@ -51,29 +55,6 @@ public async Task AcceptRequest(DataReader reader) #region Methods - private static async Task StreamReadLine(DataReader reader) - { - var data = string.Empty; - while (true) - { - await reader.LoadAsync(1); - int nextChar = reader.ReadByte(); - if (nextChar == '\n') - { - break; - } - - if (nextChar == '\r') - { - continue; - } - - data += Convert.ToChar(nextChar); - } - - return data; - } - private static uint GetContentLength(Dictionary headers) { uint contentLength = 0; @@ -107,6 +88,29 @@ private static async Task> ReadHeaders(DataReader rea return headers; } + private static async Task StreamReadLine(DataReader reader) + { + var data = string.Empty; + while (true) + { + await reader.LoadAsync(1); + int nextChar = reader.ReadByte(); + if (nextChar == '\n') + { + break; + } + + if (nextChar == '\r') + { + continue; + } + + data += Convert.ToChar(nextChar); + } + + return data; + } + #endregion } } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AutomationServer.cs b/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs similarity index 93% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AutomationServer.cs rename to Winium/Winium.StoreApps.InnerServer/AutomationServer.cs index 124c3c1..9cf2ac1 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AutomationServer.cs +++ b/Winium/Winium.StoreApps.InnerServer/AutomationServer.cs @@ -1,5 +1,7 @@ -namespace WindowsUniversalAppDriver.InnerServer +namespace Winium.StoreApps.InnerServer { + #region + using System; using System.Globalization; using System.Net; @@ -9,6 +11,10 @@ using Windows.Storage.Streams; using Windows.UI.Xaml; + using Winium.StoreApps.Common; + + #endregion + public class AutomationServer { #region Static Fields @@ -106,13 +112,13 @@ private async void HandleRequest(StreamSocket socket) string response; try { - response = Common.HttpResponseHelper.ResponseString( + response = HttpResponseHelper.ResponseString( HttpStatusCode.OK, this.automator.ProcessCommand(acceptedRequest.Content)); } catch (NotImplementedException ex) { - response = Common.HttpResponseHelper.ResponseString(HttpStatusCode.NotImplemented, ex.Message); + response = HttpResponseHelper.ResponseString(HttpStatusCode.NotImplemented, ex.Message); } writer.WriteString(response); diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Automator.cs b/Winium/Winium.StoreApps.InnerServer/Automator.cs similarity index 97% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Automator.cs rename to Winium/Winium.StoreApps.InnerServer/Automator.cs index 0162c39..024c383 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Automator.cs +++ b/Winium/Winium.StoreApps.InnerServer/Automator.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.InnerServer +namespace Winium.StoreApps.InnerServer { #region @@ -11,8 +11,8 @@ using Windows.UI.Xaml; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.InnerServer.Commands; + using Winium.StoreApps.Common; + using Winium.StoreApps.InnerServer.Commands; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AutomatorElements.cs b/Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs similarity index 87% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AutomatorElements.cs rename to Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs index 3d4618c..356dfc2 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/AutomatorElements.cs +++ b/Winium/Winium.StoreApps.InnerServer/AutomatorElements.cs @@ -1,5 +1,7 @@ -namespace WindowsUniversalAppDriver.InnerServer +namespace Winium.StoreApps.InnerServer { + #region + using System; using System.Collections.Generic; using System.Globalization; @@ -8,8 +10,10 @@ using Windows.UI.Xaml; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + + #endregion internal class AutomatorElements { @@ -70,7 +74,8 @@ public string RegisterElement(FrameworkElement element) { Interlocked.Increment(ref safeInstanceCount); - registeredKey = element.GetHashCode() + "-" + safeInstanceCount.ToString(string.Empty, CultureInfo.InvariantCulture); + registeredKey = element.GetHashCode() + "-" + + safeInstanceCount.ToString(string.Empty, CultureInfo.InvariantCulture); this.registeredElements.Add(registeredKey, new WeakReference(element)); } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/AlertCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/AlertCommand.cs similarity index 79% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/AlertCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/AlertCommand.cs index b2d540c..8443192 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/AlertCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/AlertCommand.cs @@ -1,5 +1,7 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using System.Linq; using Windows.UI.Xaml; @@ -8,9 +10,11 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class AlertCommand : CommandBase { @@ -42,7 +46,9 @@ public override string DoImpl() foreach (var popup in popups) { var popupChild = popup.Child; - var element = (FrameworkElement)Finder.GetDescendantsBy(popupChild, new By("name", buttonName)).FirstOrDefault() as Button; + var element = + (FrameworkElement)Finder.GetDescendantsBy(popupChild, new By("name", buttonName)).FirstOrDefault() + as Button; if (element == null) { continue; diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/AlertTextCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/AlertTextCommand.cs similarity index 87% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/AlertTextCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/AlertTextCommand.cs index 253ac21..a2c595c 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/AlertTextCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/AlertTextCommand.cs @@ -1,14 +1,18 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using System.Linq; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class AlertTextCommand : CommandBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ClickCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs similarity index 82% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ClickCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs index 5e5858b..fe45777 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ClickCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/ClickCommand.cs @@ -1,7 +1,11 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + #region + + using Winium.StoreApps.Common; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class ClickCommand : CommandBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/CommandBase.cs b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs similarity index 94% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/CommandBase.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs index ce2d7af..3ab957d 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/CommandBase.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/CommandBase.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { #region @@ -12,8 +12,8 @@ using Windows.UI.Core; using Windows.UI.Xaml; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/DisplayedCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs similarity index 75% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/DisplayedCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs index 4c2083a..3341af1 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/DisplayedCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/DisplayedCommand.cs @@ -1,7 +1,11 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + #region + + using Winium.StoreApps.Common; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class DisplayedCommand : CommandBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ElementCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs similarity index 90% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ElementCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs index f342705..5a46570 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ElementCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementCommand.cs @@ -1,13 +1,17 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using System.Linq; using Windows.UI.Xaml; using Windows.UI.Xaml.Media; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class ElementCommand : CommandBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ElementsCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs similarity index 86% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ElementsCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs index d4df159..dfbf144 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ElementsCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/ElementsCommand.cs @@ -1,13 +1,17 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using System.Collections.Generic; using System.Linq; using Windows.UI.Xaml; using Windows.UI.Xaml.Media; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class ElementsCommand : CommandBase { @@ -39,7 +43,8 @@ public override string DoImpl() foreach (var popupChild in popups.Select(popup => popup.Child)) { foundObjectsIdList = this.FindElementsBy(popupChild, searchStrategy); - result.AddRange(foundObjectsIdList.Select(foundObjectId => new JsonWebElementContent(foundObjectId))); + result.AddRange( + foundObjectsIdList.Select(foundObjectId => new JsonWebElementContent(foundObjectId))); } } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ExecuteCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs similarity index 96% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ExecuteCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs index a820b57..79f1929 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ExecuteCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/ExecuteCommand.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { #region @@ -12,9 +12,9 @@ using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Automation.Provider; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + using Winium.StoreApps.InnerServer.Commands.Helpers; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/GetElementAttributeCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs similarity index 90% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/GetElementAttributeCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs index b3cfd3d..b9a57b1 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/GetElementAttributeCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementAttributeCommand.cs @@ -1,4 +1,4 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { #region @@ -8,9 +8,9 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + using Winium.StoreApps.InnerServer.Commands.Helpers; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/GetElementTagNameCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs similarity index 84% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/GetElementTagNameCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs index 032327b..ad3e158 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/GetElementTagNameCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/GetElementTagNameCommand.cs @@ -1,8 +1,8 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { #region - using WindowsUniversalAppDriver.Common; + using Winium.StoreApps.Common; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/By.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs similarity index 75% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/By.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs index 9750e5d..6942f60 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/By.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/By.cs @@ -1,9 +1,13 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands.Helpers +namespace Winium.StoreApps.InnerServer.Commands.Helpers { + #region + using System; using Windows.UI.Xaml; + #endregion + internal class By { #region Constructors and Destructors @@ -17,10 +21,10 @@ public By(string strategy, string value) else if (strategy.Equals("id")) { this.Predicate = x => - { - var automationId = (x as FrameworkElement).AutomationId(); - return automationId != null && automationId.Equals(value); - }; + { + var automationId = (x as FrameworkElement).AutomationId(); + return automationId != null && automationId.Equals(value); + }; } else if (strategy.Equals("name")) { @@ -41,7 +45,8 @@ public By(string strategy, string value) } else { - throw new NotImplementedException(string.Format("{0} is not valid or implemented searching strategy.", strategy)); + throw new NotImplementedException( + string.Format("{0} is not valid or implemented searching strategy.", strategy)); } } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/Finder.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/Finder.cs similarity index 92% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/Finder.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/Helpers/Finder.cs index d88f07c..7066da4 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/Finder.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/Finder.cs @@ -1,11 +1,15 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands.Helpers +namespace Winium.StoreApps.InnerServer.Commands.Helpers { + #region + using System; using System.Collections.Generic; using Windows.UI.Xaml; using Windows.UI.Xaml.Media; + #endregion + internal class Finder { #region Methods diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs similarity index 98% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs index 3093c42..578c008 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/FrameworkElementExtensions.cs @@ -1,6 +1,6 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands.Helpers +namespace Winium.StoreApps.InnerServer.Commands.Helpers { - #region using + #region using System; using System.Collections.Generic; @@ -15,7 +15,7 @@ using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Media; - using WindowsUniversalAppDriver.Common.Exceptions; + using Winium.StoreApps.Common.Exceptions; #endregion diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/ScreenCoordinatesHelper.cs b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/ScreenCoordinatesHelper.cs similarity index 53% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/ScreenCoordinatesHelper.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/Helpers/ScreenCoordinatesHelper.cs index 2ee195a..4eb5de7 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/Helpers/ScreenCoordinatesHelper.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/Helpers/ScreenCoordinatesHelper.cs @@ -1,17 +1,27 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands.Helpers +namespace Winium.StoreApps.InnerServer.Commands.Helpers { + #region + using System; using System.Reflection; using Windows.Foundation; using Windows.Graphics.Display; + #endregion + public static class ScreenCoordinatesHelper { + #region Static Fields + private static readonly Lazy CurrentRawPixelsPerViewPixelField = new Lazy(() => GetRawPixelsPerViewPixel(DisplayInformation.GetForCurrentView())); - public static double CurrentRawPixelsPerViewPixel + #endregion + + #region Public Properties + + public static double CurrentRawPixelsPerViewPixel { get { @@ -19,50 +29,57 @@ public static double CurrentRawPixelsPerViewPixel } } + #endregion + + #region Public Methods and Operators + + public static double GetRawPixelsPerViewPixel(DisplayInformation displayInformation) + { + var info = displayInformation.GetType().GetTypeInfo().GetDeclaredProperty("RawPixelsPerViewPixel"); + + return (double)info.GetValue(displayInformation); + } + /// - /// Переводит координаты точки с реальных в логические. + /// Переводит координаты точки с логических в реальные. /// - /// Точка относительно реального разрешения устройства. - /// Точка относительно логической сетки. - public static Point ScreenPointToLogicalPoint(Point point) + /// + /// Точка относительно логической сетки. + /// + /// + /// Точка относительно реального разрешения устройства. + /// + public static Point LogicalPointToScreenPoint(Point point) { var x = point.X; var y = point.Y; var scaleFactor = CurrentRawPixelsPerViewPixel; - point = new Point( - Math.Floor((x / scaleFactor) + 0.5), - Math.Floor((y / scaleFactor) + 0.5)); + point = new Point(Math.Floor((x * scaleFactor) + 0.5), Math.Floor((y * scaleFactor) + 0.5)); return point; } /// - /// Переводит координаты точки с логических в реальные. + /// Переводит координаты точки с реальных в логические. /// - /// Точка относительно логической сетки. - /// Точка относительно реального разрешения устройства. - public static Point LogicalPointToScreenPoint(Point point) + /// + /// Точка относительно реального разрешения устройства. + /// + /// + /// Точка относительно логической сетки. + /// + public static Point ScreenPointToLogicalPoint(Point point) { var x = point.X; var y = point.Y; var scaleFactor = CurrentRawPixelsPerViewPixel; - point = new Point( - Math.Floor((x * scaleFactor) + 0.5), - Math.Floor((y * scaleFactor) + 0.5)); + point = new Point(Math.Floor((x / scaleFactor) + 0.5), Math.Floor((y / scaleFactor) + 0.5)); return point; } - public static double GetRawPixelsPerViewPixel(DisplayInformation displayInformation) - { - var info = displayInformation - .GetType() - .GetTypeInfo() - .GetDeclaredProperty("RawPixelsPerViewPixel"); - - return (double)info.GetValue(displayInformation); - } + #endregion } -} \ No newline at end of file +} diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/LocationCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/LocationCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs index 3407f70..ea8fec2 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/LocationCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationCommand.cs @@ -1,9 +1,13 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using System.Collections.Generic; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class LocationCommand : CommandBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/LocationInViewCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/LocationInViewCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs index a20c576..5017382 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/LocationInViewCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/LocationInViewCommand.cs @@ -1,9 +1,13 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using System.Collections.Generic; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class LocationInViewCommand : CommandBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/OrientationCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/OrientationCommand.cs similarity index 83% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/OrientationCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/OrientationCommand.cs index eec98fb..5ace21e 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/OrientationCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/OrientationCommand.cs @@ -1,8 +1,12 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using Windows.Graphics.Display; - using WindowsUniversalAppDriver.Common; + using Winium.StoreApps.Common; + + #endregion internal class OrientationCommand : CommandBase { @@ -11,12 +15,12 @@ internal class OrientationCommand : CommandBase public override string DoImpl() { var orientation = DisplayOrientations.Portrait; + /*var frame = this.Automator.VisualRoot as PhoneApplicationFrame; if (frame != null) { orientation = frame.Orientation; }*/ - return this.JsonResponse(ResponseStatus.Success, orientation.ToString()); } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/PageSourceCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs similarity index 94% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/PageSourceCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs index 8cdc4fa..599f3e3 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/PageSourceCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/PageSourceCommand.cs @@ -1,5 +1,7 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using System.Collections.Generic; using System.Globalization; using System.IO; @@ -9,8 +11,10 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Media; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + using Winium.StoreApps.Common; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class PageSourceCommand : CommandBase { @@ -55,8 +59,8 @@ private void WriteElementToXml(XmlWriter writer, FrameworkElement item) var coordinates = item.GetCoordinates(this.Automator.VisualRoot); var attributes = new Dictionary { - { "name", item.AutomationName() }, - { "id", item.AutomationId() }, + { "name", item.AutomationName() }, + { "id", item.AutomationId() }, { "xname", item.Name }, { "visible", diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/TextCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs similarity index 72% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/TextCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs index 496ab91..41aeb37 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/TextCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/TextCommand.cs @@ -1,7 +1,11 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.InnerServer.Commands.Helpers; + #region + + using Winium.StoreApps.Common; + using Winium.StoreApps.InnerServer.Commands.Helpers; + + #endregion internal class TextCommand : CommandBase { @@ -17,7 +21,7 @@ public override string DoImpl() { var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId); var text = element.GetText(); - + return this.JsonResponse(ResponseStatus.Success, text); } diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ValueCommand.cs b/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs similarity index 90% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ValueCommand.cs rename to Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs index d32e9db..d586319 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/ValueCommand.cs +++ b/Winium/Winium.StoreApps.InnerServer/Commands/ValueCommand.cs @@ -1,12 +1,16 @@ -namespace WindowsUniversalAppDriver.InnerServer.Commands +namespace Winium.StoreApps.InnerServer.Commands { + #region + using Windows.UI.Xaml; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Automation.Provider; using Windows.UI.Xaml.Controls; - using WindowsUniversalAppDriver.Common; - using WindowsUniversalAppDriver.Common.Exceptions; + using Winium.StoreApps.Common; + using Winium.StoreApps.Common.Exceptions; + + #endregion internal class ValueCommand : CommandBase { diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Properties/AssemblyInfo.cs b/Winium/Winium.StoreApps.InnerServer/Properties/AssemblyInfo.cs similarity index 65% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Properties/AssemblyInfo.cs rename to Winium/Winium.StoreApps.InnerServer/Properties/AssemblyInfo.cs index e072849..45ce507 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Properties/AssemblyInfo.cs +++ b/Winium/Winium.StoreApps.InnerServer/Properties/AssemblyInfo.cs @@ -1,27 +1,32 @@ -using System.Resources; +#region + using System.Reflection; +using System.Resources; + +#endregion // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("WindowsUniversalAppDriver.InnerServer")] -[assembly: AssemblyDescription("Inner server. Part of Windows Universal App Driver (Selenium Driver) for automated testing of Windows Universal applications.")] +[assembly: AssemblyTitle("Winium.StoreApps.InnerServer")] +[assembly: + AssemblyDescription( + "Essential part of Winium StoreApps (Selenium Remote WebDriver implementation) that should be included in tested app to enable automation." + )] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("2gis")] -[assembly: AssemblyProduct("WindowsUniversalAppDriver.InnerServer")] +[assembly: AssemblyProduct("Winium.StoreApps.InnerServer")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: NeutralResourcesLanguage("en")] // Version information for an assembly consists of the following four values: -// // Major Version // Minor Version // Build Number // Revision -// // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.*")] +[assembly: AssemblyVersion("1.0.*")] diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.csproj b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj similarity index 94% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.csproj rename to Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj index 39da78d..6b3d58d 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.csproj +++ b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.csproj @@ -8,8 +8,8 @@ {E8683025-E703-4293-AA7E-3A9A3555BC40} Library Properties - WindowsUniversalAppDriver.InnerServer - WindowsUniversalAppDriver.InnerServer + Winium.StoreApps.InnerServer + Winium.StoreApps.InnerServer en-US 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -37,9 +37,9 @@ - + {3c8d0b9c-576b-4778-97b1-6839aa944aee} - WindowsUniversalAppDriver.Common + Winium.StoreApps.Common diff --git a/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.nuspec b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.nuspec new file mode 100644 index 0000000..223be44 --- /dev/null +++ b/Winium/Winium.StoreApps.InnerServer/Winium.StoreApps.InnerServer.nuspec @@ -0,0 +1,16 @@ + + + + Winium.StoreApps.InnerServer + 1.0.0 + 2GIS + 2GIS + https://github.com/2gis/Winium.StoreApps + false + Essential part of Winium StoreApps (Selenium Remote WebDriver implementation) that should be included in tested app to enable automation. + + + Copyright © 2015 + + + \ No newline at end of file diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/packages.config b/Winium/Winium.StoreApps.InnerServer/packages.config similarity index 100% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/packages.config rename to Winium/Winium.StoreApps.InnerServer/packages.config diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.sln b/Winium/Winium.sln similarity index 92% rename from WindowsUniversalAppDriver/WindowsUniversalAppDriver.sln rename to Winium/Winium.sln index aaa1328..b15f865 100644 --- a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.sln +++ b/Winium/Winium.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsUniversalAppDriver.Common", "WindowsUniversalAppDriver.Common\WindowsUniversalAppDriver.Common.csproj", "{3C8D0B9C-576B-4778-97B1-6839AA944AEE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Winium.StoreApps.Common", "Winium.StoreApps.Common\Winium.StoreApps.Common.csproj", "{3C8D0B9C-576B-4778-97B1-6839AA944AEE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsUniversalAppDriver", "WindowsUniversalAppDriver\WindowsUniversalAppDriver.csproj", "{B6BE579B-B008-45B2-9740-12F0E6223661}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Winium.StoreApps.Driver", "Winium.StoreApps.Driver\Winium.StoreApps.Driver.csproj", "{B6BE579B-B008-45B2-9740-12F0E6223661}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsUniversalAppDriver.InnerServer", "WindowsUniversalAppDriver.InnerServer\WindowsUniversalAppDriver.InnerServer.csproj", "{E8683025-E703-4293-AA7E-3A9A3555BC40}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Winium.StoreApps.InnerServer", "Winium.StoreApps.InnerServer\Winium.StoreApps.InnerServer.csproj", "{E8683025-E703-4293-AA7E-3A9A3555BC40}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{825C37FB-87E0-43F9-9348-7E0989421A0F}" ProjectSection(SolutionItems) = preProject diff --git a/Winium/Winium.sln.DotSettings b/Winium/Winium.sln.DotSettings new file mode 100644 index 0000000..7a11b09 --- /dev/null +++ b/Winium/Winium.sln.DotSettings @@ -0,0 +1,457 @@ + + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + DO_NOT_SHOW + HINT + DO_NOT_SHOW + DO_NOT_SHOW + HINT + DO_NOT_SHOW + DO_NOT_SHOW + <?xml version="1.0" encoding="utf-16"?><Profile name="AutoQACleanupCode"><StyleCop.Ordering><AlphabeticalUsingDirectives>Ignore</AlphabeticalUsingDirectives><ExpandUsingDirectives>FullyQualify</ExpandUsingDirectives><SA1212PropertyAccessorsMustFollowOrder>True</SA1212PropertyAccessorsMustFollowOrder><SA1213EventAccessorsMustFollowOrder>True</SA1213EventAccessorsMustFollowOrder></StyleCop.Ordering><StyleCop.Documentation><SA1600ElementsMustBeDocumented>False</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>False</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>False</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>False</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>False</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>False</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>False</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>False</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>False</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>False</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>Ignore</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>False</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>False</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>False</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>False</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><CSArrangeThisQualifier>True</CSArrangeThisQualifier><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>CAN_CHANGE_TO_IMPLICIT</BehavourStyle><LocalVariableStyle>IMPLICIT_WHEN_INITIALIZER_HAS_TYPE</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>True</EmbraceInRegion><RegionName>using</RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers><CSShortenReferences>True</CSShortenReferences></Profile> + <?xml version="1.0" encoding="utf-16"?><Profile name="StyleCop"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>True</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSReorderTypeMembers>True</CSReorderTypeMembers><StyleCop.Documentation><SA1600ElementsMustBeDocumented>False</SA1600ElementsMustBeDocumented><SA1604ElementDocumentationMustHaveSummary>True</SA1604ElementDocumentationMustHaveSummary><SA1609PropertyDocumentationMustHaveValueDocumented>True</SA1609PropertyDocumentationMustHaveValueDocumented><SA1611ElementParametersMustBeDocumented>True</SA1611ElementParametersMustBeDocumented><SA1615ElementReturnValueMustBeDocumented>True</SA1615ElementReturnValueMustBeDocumented><SA1617VoidReturnValueMustNotBeDocumented>True</SA1617VoidReturnValueMustNotBeDocumented><SA1618GenericTypeParametersMustBeDocumented>True</SA1618GenericTypeParametersMustBeDocumented><SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes>True</SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes><SA1628DocumentationTextMustBeginWithACapitalLetter>True</SA1628DocumentationTextMustBeginWithACapitalLetter><SA1629DocumentationTextMustEndWithAPeriod>True</SA1629DocumentationTextMustEndWithAPeriod><SA1633SA1641UpdateFileHeader>Ignore</SA1633SA1641UpdateFileHeader><SA1639FileHeaderMustHaveSummary>True</SA1639FileHeaderMustHaveSummary><SA1642ConstructorSummaryDocumentationMustBeginWithStandardText>True</SA1642ConstructorSummaryDocumentationMustBeginWithStandardText><SA1643DestructorSummaryDocumentationMustBeginWithStandardText>True</SA1643DestructorSummaryDocumentationMustBeginWithStandardText><SA1644DocumentationHeadersMustNotContainBlankLines>True</SA1644DocumentationHeadersMustNotContainBlankLines></StyleCop.Documentation><StyleCop.Layout><SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine>True</SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine><SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine>True</SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine><SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine>True</SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine><SA1511WhileDoFooterMustNotBePrecededByBlankLine>True</SA1511WhileDoFooterMustNotBePrecededByBlankLine><SA1512SingleLineCommentsMustNotBeFollowedByBlankLine>True</SA1512SingleLineCommentsMustNotBeFollowedByBlankLine><SA1513ClosingCurlyBracketMustBeFollowedByBlankLine>True</SA1513ClosingCurlyBracketMustBeFollowedByBlankLine><SA1514ElementDocumentationHeaderMustBePrecededByBlankLine>True</SA1514ElementDocumentationHeaderMustBePrecededByBlankLine><SA1515SingleLineCommentMustBeProceededByBlankLine>True</SA1515SingleLineCommentMustBeProceededByBlankLine></StyleCop.Layout><StyleCop.Maintainability><SA1119StatementMustNotUseUnnecessaryParenthesis>True</SA1119StatementMustNotUseUnnecessaryParenthesis></StyleCop.Maintainability><StyleCop.Ordering><AlphabeticalUsingDirectives>Alphabetical</AlphabeticalUsingDirectives><ExpandUsingDirectives>FullyQualify</ExpandUsingDirectives><SA1212PropertyAccessorsMustFollowOrder>True</SA1212PropertyAccessorsMustFollowOrder><SA1213EventAccessorsMustFollowOrder>True</SA1213EventAccessorsMustFollowOrder></StyleCop.Ordering><StyleCop.Readability><SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists>True</SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists><SA1106CodeMustNotContainEmptyStatements>True</SA1106CodeMustNotContainEmptyStatements><SA1108BlockStatementsMustNotContainEmbeddedComments>True</SA1108BlockStatementsMustNotContainEmbeddedComments><SA1109BlockStatementsMustNotContainEmbeddedRegions>True</SA1109BlockStatementsMustNotContainEmbeddedRegions><SA1120CommentsMustContainText>True</SA1120CommentsMustContainText><SA1121UseBuiltInTypeAlias>True</SA1121UseBuiltInTypeAlias><SA1122UseStringEmptyForEmptyStrings>True</SA1122UseStringEmptyForEmptyStrings><SA1123DoNotPlaceRegionsWithinElements>True</SA1123DoNotPlaceRegionsWithinElements><SA1124CodeMustNotContainEmptyRegions>True</SA1124CodeMustNotContainEmptyRegions></StyleCop.Readability><StyleCop.Spacing><SA1001CommasMustBeSpacedCorrectly>True</SA1001CommasMustBeSpacedCorrectly><SA1005SingleLineCommentsMustBeginWithSingleSpace>True</SA1005SingleLineCommentsMustBeginWithSingleSpace><SA1006PreprocessorKeywordsMustNotBePrecededBySpace>True</SA1006PreprocessorKeywordsMustNotBePrecededBySpace><SA1021NegativeSignsMustBeSpacedCorrectly>True</SA1021NegativeSignsMustBeSpacedCorrectly><SA1022PositiveSignsMustBeSpacedCorrectly>True</SA1022PositiveSignsMustBeSpacedCorrectly><SA1025CodeMustNotContainMultipleWhitespaceInARow>True</SA1025CodeMustNotContainMultipleWhitespaceInARow></StyleCop.Spacing></Profile> + StyleCop + AutoQACleanupCode + True + True + True + True + True + True + True + True + True + True + NEXT_LINE_SHIFTED_2 + 1 + 1 + 1 + 1 + 1 + NEXT_LINE_SHIFTED_2 + SEPARATE + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + ALWAYS_ADD + NEXT_LINE_SHIFTED_2 + 1 + 1 + False + True + public protected internal private static new abstract virtual override sealed readonly extern unsafe volatile async + False + False + False + False + True + ALWAYS_USE + ON_SINGLE_LINE + False + True + False + False + True + False + True + True + CHOP_IF_LONG + True + True + CHOP_IF_LONG + CHOP_IF_LONG + <?xml version="1.0" encoding="utf-8"?> +<!-- Last updated 15.05.2012 --> +<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns"> + + <!-- Do not reorder COM interfaces --> + <Pattern> + <Match> + <And Weight="2000"> + <Kind Is="interface"/> + <Or> + <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"/> + <HasAttribute CLRName="System.Runtime.InteropServices.ComImport"/> + </Or> + </And> + </Match> + </Pattern> + + <!-- Do not reorder P/Invoke structs --> + <Pattern> + <Match> + <And Weight="2000"> + <Or> + <Kind Is="struct"/> + <Kind Is="class"/> + </Or> + <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"/> + </And> + </Match> + </Pattern> + + <!-- Do not reorder P/Invoke classes (called xxxNativeMethods) --> + <Pattern> + <Match> + <And Weight="2000"> + <Kind Is="class"/> + <Name Is=".*NativeMethods" /> + </And> + </Match> + </Pattern> + + <!-- StyleCop pattern --> + <Pattern RemoveAllRegions="true"> + <Match> + <Or Weight="1000" > + <Kind Is="class" /> + <Kind Is="struct" /> + <Kind Is="interface"/> + </Or> + </Match> + + <!-- Constants --> + <Entry> + <Match> + <Kind Is="constant"/> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private"/> + <Name/> + </Sort> + <Group Region="Constants"/> + </Entry> + + <!-- Static fields --> + <Entry> + <Match> + <And> + <Kind Is="field"/> + <Static /> + </And> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private"/> + <Readonly/> + <Name/> + </Sort> + <Group Region="Static Fields"/> + </Entry> + + <!-- Fields --> + <Entry> + <Match> + <Kind Is="field"/> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private"/> + <Readonly/> + <Name/> + </Sort> + <Group Region="Fields"/> + </Entry> + + <!-- constructors and destructors --> + <Entry> + <Match> + <Or Weight="200"> + <Kind Is="constructor"/> + <Kind Is="destructor"/> + </Or> + </Match> + <Sort> + <Static/> + <Kind Order="constructor destructor"/> + <Access Order="public internal protected-internal protected private"/> + </Sort> + <Group Region="Constructors and Destructors"/> + </Entry> + + <!-- delegates --> + <Entry> + <Match> + <Kind Is="delegate"/> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private" /> + <Static /> + <Name/> + </Sort> + <Group Region="Delegates"/> + </Entry> + + <!-- public events --> + <Entry> + <Match> + <And> + <Kind Is="event"/> + <Access Is="public"/> + </And> + </Match> + <Sort> + <Access Order="public" /> + <Static /> + <Name/> + </Sort> + <Group Region="Public Events"/> + </Entry> + + <!-- interface events --> + <Entry> + <Match> + <And> + <Kind Is="event"/> + <ImplementsInterface/> + </And> + </Match> + <Sort> + <ImplementsInterface Immediate="true"/> + <Name/> + </Sort> + <Group Region="Explicit Interface Events" /> + </Entry> + + <!-- other events --> + <Entry> + <Match> + <Kind Is="event"/> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private" /> + <Static /> + <Name/> + </Sort> + <Group Region="Events"/> + </Entry> + + <!-- enum --> + <Entry> + <Match> + <Kind Is="enum"/> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private" /> + <Name/> + </Sort> + <Group Region="Enums"/> + </Entry> + + <!-- interfaces --> + <Entry> + <Match> + <Kind Is="interface" /> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private" /> + <Name/> + </Sort> + <Group Region="Interfaces"/> + </Entry> + + <!-- public properties --> + <Entry> + <Match> + <And> + <Kind Is="property"/> + <Access Is="public"/> + </And> + </Match> + <Sort> + <Access Order="public"/> + <Static/> + <Name/> + </Sort> + <Group Region="Public Properties"/> + </Entry> + + <!-- interface properties --> + <Entry> + <Match> + <And> + <Kind Is="property"/> + <ImplementsInterface/> + </And> + </Match> + <Sort> + <ImplementsInterface Immediate="true"/> + <Name/> + </Sort> + <Group Region="Explicit Interface Properties" /> + </Entry> + + <!-- other properties --> + <Entry> + <Match> + <Kind Is="property"/> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private"/> + <Static/> + <Name/> + </Sort> + <Group Region="Properties"/> + </Entry> + + <!-- public indexers --> + <Entry> + <Match> + <And> + <Kind Is="indexer" Weight="1000" /> + <Access Is="public"/> + </And> + </Match> + <Sort> + <Access Order="public" /> + <Static/> + <Name/> + </Sort> + <Group Region="Public Indexers"/> + </Entry> + + <!-- interface indexers --> + <Entry> + <Match> + <And> + <Kind Is="indexer" Weight="1000"/> + <ImplementsInterface/> + </And> + </Match> + <Sort> + <ImplementsInterface Immediate="true"/> + <Name/> + </Sort> + <Group Region="Explicit Interface Indexers" /> + </Entry> + + <!-- other indexers --> + <Entry> + <Match> + <Kind Is="indexer" Weight="1000" /> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private" /> + <Static/> + <Name/> + </Sort> + <Group Region="Indexers"/> + </Entry> + + <!-- public methods (includes operators) --> + <Entry> + <Match> + <And> + <Or> + <Kind Is="method"/> + <Kind Is="operator"/> + </Or> + <Access Is="public"/> + </And> + </Match> + <Sort> + <Access Order="public"/> + <Static/> + <Name/> + </Sort> + <Group Region="Public Methods and Operators"/> + </Entry> + + <!-- interface methods --> + <Entry> + <Match> + <And> + <Kind Is="method"/> + <ImplementsInterface/> + </And> + </Match> + <Sort> + <ImplementsInterface Immediate="true"/> + <Name/> + </Sort> + <Group Region="Explicit Interface Methods" /> + </Entry> + + <!-- other methods --> + <Entry> + <Match> + <Kind Is="method"/> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private"/> + <Static/> + <Name/> + </Sort> + <Group Region="Methods"/> + </Entry> + + <!-- operators --> + <Entry> + <Match> + <Kind Is="operator"/> + </Match> + <Sort> + <Access Order="public internal protected-internal protected private" /> + <Static/> + <Name/> + </Sort> + <Group Region="Operators"/> + </Entry> + + <!-- Nested structs --> + <Entry> + <Match> + <Kind Is="struct" + Weight="600" /> + </Match> + <Sort> + <Static /> + <Access Order="public internal protected-internal protected private" /> + <Name/> + </Sort> + </Entry> + + <!-- Nested classes --> + <Entry> + <Match> + <Kind Is="class" + Weight="700" /> + </Match> + <Sort> + <Static /> + <Access Order="public internal protected-internal protected private" /> + <Name/> + </Sort> + </Entry> + + <!-- all other members --> + <Entry/> + + </Pattern> +</Patterns> + True + True + $object$_On$event$ + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + True \ No newline at end of file