Merge pull request #11 from 2gis/feature/get-element-tag-name

Add GetElementTagName command
2gis · Feb 27, 2015 · 4a4c9db · 4a4c9db
2 parents e8b167f + 6de43d7
commit 4a4c9db
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Automator.cs b/WindowsUniversalAppDriver/WindowsUniversalAppDriver.InnerServer/Automator.cs
@@ -1,17 +1,21 @@
 namespace WindowsUniversalAppDriver.InnerServer
 {
+    #region
+
     using System;
     using System.Collections.Generic;
     using System.Linq;
 
-    using Windows.UI.Xaml;
-
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
 
+    using Windows.UI.Xaml;
+
     using WindowsUniversalAppDriver.Common;
     using WindowsUniversalAppDriver.InnerServer.Commands;
 
+    #endregion
+
     internal class Automator
     {
         #region Constructors and Destructors
@@ -128,6 +132,10 @@ public string ProcessCommand(string content)
             {
                 commandToExecute = new ExecuteCommand();
             }
+            else if (command.Equals(DriverCommand.GetElementTagName))
+            {
+                commandToExecute = new GetElementTagNameCommand { ElementId = elementId };
+            }
             else
             {
                 throw new NotImplementedException("Not implemented: " + command);

diff --git a/...ersalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/GetElementTagNameCommand.cs b/...ersalAppDriver/WindowsUniversalAppDriver.InnerServer/Commands/GetElementTagNameCommand.cs
@@ -0,0 +1,29 @@
+namespace WindowsUniversalAppDriver.InnerServer.Commands
+{
+    #region
+
+    using WindowsUniversalAppDriver.Common;
+
+    #endregion
+
+    internal class GetElementTagNameCommand : CommandBase
+    {
+        #region Public Properties
+
+        public string ElementId { get; set; }
+
+        #endregion
+
+        #region Public Methods and Operators
+
+        public override string DoImpl()
+        {
+            var element = this.Automator.WebElements.GetRegisteredElement(this.ElementId);
+            var tagName = element.GetType().ToString();
+
+            return this.JsonResponse(ResponseStatus.Success, tagName);
+        }
+
+        #endregion
+    }
+}
diff --git a/...Driver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.csproj b/...Driver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.csproj
@@ -68,6 +68,7 @@
     <Compile Include="Commands\OrientationCommand.cs" />
     <Compile Include="Commands\PageSourceCommand.cs" />
     <Compile Include="Commands\ScreenCoordinatesHelper.cs" />
+    <Compile Include="Commands\GetElementTagNameCommand.cs" />
     <Compile Include="Commands\TextCommand.cs" />
     <Compile Include="Commands\ValueCommand.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/...Driver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.nuspec b/...Driver/WindowsUniversalAppDriver.InnerServer/WindowsUniversalAppDriver.InnerServer.nuspec
@@ -2,13 +2,15 @@
 <package>
   <metadata>
     <id>WindowsUniversalAppDriver.InnerServer</id>
-    <version>0.1.7</version>
+    <version>0.1.8</version>
     <authors>2GIS</authors>
     <owners>2GIS</owners>
     <projectUrl>https://github.com/2gis/windows-universal-app-driver</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Inner server. Part of Windows Universal App Driver (Selenium Driver) for automated testing of Windows Universal applications.</description>
     <releaseNotes>
+		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
 		Version 0.1.6