[UITest] Fix FastRenderer test for iOS (#1102)

* [UITest] Fix FastRenderer test for iOS

* [UITests] Update uitest packages and make test only run on android

* [UITests] Update more UITests packages
This commit is contained in:
Rui Marinho 2017-08-17 10:57:58 +01:00 коммит произвёл GitHub
Родитель b6c1b60fa6
Коммит cc48d3c7f9
11 изменённых файлов: 41 добавлений и 37 удалений

Просмотреть файл

@ -311,7 +311,7 @@
<HintPath>..\packages\Xamarin.Insights.1.12.3\lib\Xamarin.iOS10\Xamarin.Insights.dll</HintPath>
</Reference>
<Reference Include="Calabash">
<HintPath>..\packages\Xamarin.TestCloud.Agent.0.20.3\lib\Xamarin.iOS10\Calabash.dll</HintPath>
<HintPath>..\packages\Xamarin.TestCloud.Agent.0.20.7\lib\Xamarin.iOS10\Calabash.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

Просмотреть файл

@ -2,5 +2,5 @@
<packages>
<package id="AdvancedColorPicker" version="2.0.1" targetFramework="xamarinios10" />
<package id="Xamarin.Insights" version="1.12.3" targetFramework="xamarinios10" />
<package id="Xamarin.TestCloud.Agent" version="0.20.3" targetFramework="xamarinios10" />
<package id="Xamarin.TestCloud.Agent" version="0.20.7" targetFramework="xamarinios10" />
</packages>

Просмотреть файл

@ -30,12 +30,14 @@ namespace Xamarin.Forms.Controls.Issues
Content = grd;
}
#if UITEST
#if UITEST && __ANDROID__
[Test]
public void TestButtonUsingElevation ()
{
RunningApp.WaitForElement(Running);
RunningApp.Tap(btnId);
var btnQuqery = RunningApp.Query(c => c.Marked(btnId));
if (btnQuqery.Length > 0)
RunningApp.Tap(btnId);
RunningApp.WaitForNoElement(Success);
}
#endif

Просмотреть файл

@ -57,9 +57,8 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Xamarin.UITest, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
<Reference Include="Xamarin.UITest">
<HintPath>..\packages\Xamarin.UITest.2.0.10\lib\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.0.10" targetFramework="net45" />
</packages>

Просмотреть файл

@ -46,9 +46,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Xamarin.UITest, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
<Reference Include="Xamarin.UITest">
<HintPath>..\packages\Xamarin.UITest.2.0.10\lib\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.0.10" targetFramework="net45" />
</packages>

Просмотреть файл

@ -58,9 +58,8 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Xamarin.UITest, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
<Reference Include="Xamarin.UITest">
<HintPath>..\packages\Xamarin.UITest.2.0.10\lib\Xamarin.UITest.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@ -86,6 +85,12 @@
<Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
<Name>Xamarin.Forms.Platform</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.ControlGallery.iOS\Xamarin.Forms.ControlGallery.iOS.csproj">
<Project>{C7131F14-274F-4B55-ACA9-E81731AD012F}</Project>
<Name>Xamarin.Forms.ControlGallery.iOS</Name>
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.0.10" targetFramework="net45" />
</packages>

Просмотреть файл

@ -29,22 +29,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Interfaces">
<HintPath>..\packages\ServiceStack.Interfaces.4.5.4\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Text">
<HintPath>..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Client">
<HintPath>..\packages\ServiceStack.Client.4.5.4\lib\net45\ServiceStack.Client.dll</HintPath>
</Reference>
<Reference Include="Xamarin.UITest, Version=2.0.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.UITest.2.0.9\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.UITest.Desktop">
<HintPath>..\packages\Xamarin.UITest.Desktop.0.0.7\lib\net45\Xamarin.UITest.Desktop.dll</HintPath>
</Reference>
@ -67,6 +51,21 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Xamarin.UITest">
<HintPath>..\packages\Xamarin.UITest.2.0.10\lib\Xamarin.UITest.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Text">
<HintPath>..\packages\ServiceStack.Text.4.5.12\lib\net45\ServiceStack.Text.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Interfaces">
<HintPath>..\packages\ServiceStack.Interfaces.4.5.12\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Client">
<HintPath>..\packages\ServiceStack.Client.4.5.12\lib\net45\ServiceStack.Client.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />

Просмотреть файл

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="ServiceStack.Client" version="4.5.4" targetFramework="net45" />
<package id="ServiceStack.Interfaces" version="4.5.4" targetFramework="net45" />
<package id="ServiceStack.Text" version="4.5.4" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.0.9" targetFramework="net45" />
<package id="ServiceStack.Client" version="4.5.12" targetFramework="net45" />
<package id="ServiceStack.Interfaces" version="4.5.12" targetFramework="net45" />
<package id="ServiceStack.Text" version="4.5.12" targetFramework="net45" />
<package id="Xamarin.UITest" version="2.0.10" targetFramework="net45" />
<package id="Xamarin.UITest.Desktop" version="0.0.7" targetFramework="net45" />
</packages>