Skip to content

Commit 8bb91f0

Browse files
timotiusmargotimotiusmargo
committed
Merged PR 997267: Update WebDriverAPI test, documentation, and samples
Fix WebDriverAPI test for DELETE /session/:sessionId/window endpoint by nullifying session after quit Update the list of tested WebDriverAPI endpoints in the WebDriverAPI README.md Update Calculator and Notepad samples to use the latest official MSTest packages
2 parents ccf5e91 + 2b3b8e3 commit 8bb91f0

File tree

6 files changed

+35
-11
lines changed

6 files changed

+35
-11
lines changed

‎Samples/C#/CalculatorTest/CalculatorTest.csproj‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,6 +17,8 @@
1617
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
1718
<IsCodedUITest>False</IsCodedUITest>
1819
<TestProjectType>UnitTest</TestProjectType>
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
1922
</PropertyGroup>
2023
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2124
<DebugSymbols>true</DebugSymbols>
@@ -44,11 +47,11 @@
4447
<Private>True</Private>
4548
</Reference>
4649
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
47-
<HintPath>packages\MSTest.TestFramework.1.0.6-preview\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
50+
<HintPath>packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
4851
<Private>True</Private>
4952
</Reference>
5053
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
51-
<HintPath>packages\MSTest.TestFramework.1.0.6-preview\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
54+
<HintPath>packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
5255
<Private>True</Private>
5356
</Reference>
5457
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -102,6 +105,14 @@
102105
</Choose>
103106
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
104107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
108+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
109+
<PropertyGroup>
110+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
111+
</PropertyGroup>
112+
<Error Condition="!Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" />
113+
<Error Condition="!Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" />
114+
</Target>
115+
<Import Project="packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" />
105116
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
106117
Other similar extension points exist, see Microsoft.Common.targets.
107118
<Target Name="BeforeBuild">

‎Samples/C#/CalculatorTest/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<packages>
33
<package id="Appium.WebDriver" version="3.0.0.1" targetFramework="net45" />
44
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
5-
<package id="MSTest.TestAdapter" version="1.1.5-preview" targetFramework="net45" />
6-
<package id="MSTest.TestFramework" version="1.0.6-preview" targetFramework="net45" />
5+
<package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net45" />
6+
<package id="MSTest.TestFramework" version="1.2.0" targetFramework="net45" />
77
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
88
<package id="Selenium.Support" version="3.0.1" targetFramework="net45" />
99
<package id="Selenium.WebDriver" version="3.0.1" targetFramework="net45" />

‎Samples/C#/NotepadTest/NotepadTest.csproj‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,6 +17,8 @@
1617
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
1718
<IsCodedUITest>False</IsCodedUITest>
1819
<TestProjectType>UnitTest</TestProjectType>
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
1922
</PropertyGroup>
2023
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2124
<DebugSymbols>true</DebugSymbols>
@@ -42,11 +45,13 @@
4245
<Reference Include="Castle.Core">
4346
<HintPath>packages\Castle.Core.4.0.0-beta002\lib\net45\Castle.Core.dll</HintPath>
4447
</Reference>
45-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework">
46-
<HintPath>packages\MSTest.TestFramework.1.0.6-preview\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
48+
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
49+
<HintPath>packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
50+
<Private>True</Private>
4751
</Reference>
48-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions">
49-
<HintPath>packages\MSTest.TestFramework.1.0.6-preview\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
52+
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
53+
<HintPath>packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
54+
<Private>True</Private>
5055
</Reference>
5156
<Reference Include="Newtonsoft.Json">
5257
<HintPath>packages\Newtonsoft.Json.9.0.2-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -100,6 +105,14 @@
100105
</Choose>
101106
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
102107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
108+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
109+
<PropertyGroup>
110+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
111+
</PropertyGroup>
112+
<Error Condition="!Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" />
113+
<Error Condition="!Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" />
114+
</Target>
115+
<Import Project="packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" />
103116
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
104117
Other similar extension points exist, see Microsoft.Common.targets.
105118
<Target Name="BeforeBuild">

‎Samples/C#/NotepadTest/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<packages>
33
<package id="Appium.WebDriver" version="3.0.0.1" targetFramework="net45" />
44
<package id="Castle.Core" version="4.0.0-beta002" targetFramework="net45" />
5-
<package id="MSTest.TestAdapter" version="1.1.5-preview" targetFramework="net45" />
6-
<package id="MSTest.TestFramework" version="1.0.6-preview" targetFramework="net45" />
5+
<package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net45" />
6+
<package id="MSTest.TestFramework" version="1.2.0" targetFramework="net45" />
77
<package id="Newtonsoft.Json" version="9.0.2-beta1" targetFramework="net45" />
88
<package id="Selenium.Support" version="3.0.1" targetFramework="net45" />
99
<package id="Selenium.WebDriver" version="3.0.1" targetFramework="net45" />

‎Tests/WebDriverAPI/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ The test scenarios are written against Windows 10 built-in apps such as **Calcul
6969
| POST | [/session/:sessionId/touch/flick ](./TouchFlick.cs) |
7070
| POST | [/session/:sessionId/touch/longclick ](./TouchLongClick.cs) |
7171
| POST | [/session/:sessionId/touch/move ](./TouchDownMoveUp.cs) |
72-
| POST | /session/:sessionId/touch/multi/perform |
7372
| POST | [/session/:sessionId/touch/scroll ](./TouchScroll.cs) |
7473
| POST | [/session/:sessionId/touch/up ](./TouchDownMoveUp.cs) |
7574
| DELETE | [/session/:sessionId/window ](./Window.cs) |

‎Tests/WebDriverAPI/Window.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public void CloseWindow()
5252

5353
// Delete the session
5454
session.Quit();
55+
session = null;
5556
}
5657

5758
[TestMethod]

0 commit comments

Comments
 (0)