summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xamarin.Forms.Android.UITests/BaseTestFixture.cs108
-rw-r--r--Xamarin.Forms.Android.UITests/Makefile15
-rw-r--r--Xamarin.Forms.Android.UITests/PlatformHelpers.cs132
-rw-r--r--Xamarin.Forms.Android.UITests/PlatformQueries.cs111
-rw-r--r--Xamarin.Forms.Android.UITests/Properties/AssemblyInfo.cs36
-rw-r--r--Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj80
-rw-r--r--Xamarin.Forms.Android.UITests/packages.config5
-rw-r--r--Xamarin.Forms.Android.UITests/testcloudupload.bat1
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1549.xaml34
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1549.xaml.cs75
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems6
-rw-r--r--Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj8
-rw-r--r--Xamarin.Forms.Core.Android.UITests/packages.config2
-rw-r--r--Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj4
-rw-r--r--Xamarin.Forms.Core.Windows.UITests/packages.config2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj8
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/packages.config2
-rw-r--r--Xamarin.Forms.iOS.UITests/Device.cs21
-rw-r--r--Xamarin.Forms.iOS.UITests/Legacy-BaseTestFixture.cs113
-rw-r--r--Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs135
-rw-r--r--Xamarin.Forms.iOS.UITests/Makefile15
-rw-r--r--Xamarin.Forms.iOS.UITests/PlatformQueries.cs118
-rw-r--r--Xamarin.Forms.iOS.UITests/Properties/AssemblyInfo.cs36
-rw-r--r--Xamarin.Forms.iOS.UITests/TestHelpers.cs34
-rw-r--r--Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj77
-rw-r--r--Xamarin.Forms.iOS.UITests/packages.config5
26 files changed, 13 insertions, 1170 deletions
diff --git a/Xamarin.Forms.Android.UITests/BaseTestFixture.cs b/Xamarin.Forms.Android.UITests/BaseTestFixture.cs
deleted file mode 100644
index 6e38f35..0000000
--- a/Xamarin.Forms.Android.UITests/BaseTestFixture.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using Xamarin.UITest;
-using Xamarin.UITest.Android;
-using Xamarin.UITest.Queries;
-using NUnit.Framework;
-using System.Threading;
-
-namespace Xamarin.Forms.UITests
-{
- public class BaseTestFixture
- {
- string idiomEnvVar;
- string IPEnvVar;
-
- public AndroidApp App { get; private set; }
- public Device Device { get; set; }
-
- public BaseTestFixture ()
- {
- idiomEnvVar = Environment.GetEnvironmentVariable ("DEVICE_IDIOM");
- IPEnvVar = Environment.GetEnvironmentVariable ("DEVICE_IP");
-
- Console.WriteLine (string.Format ("****** Connecting to {0} with IP: {1} ********", idiomEnvVar, IPEnvVar));
-
- Device = SetupDevice (idiomEnvVar, IPEnvVar);
- }
-
- [SetUp]
- public void Setup ()
- {
-
- if (string.IsNullOrEmpty (idiomEnvVar) &&
- string.IsNullOrEmpty (IPEnvVar)) {
- // Use IDE Configuration
- App = ConfigureApp
- .Android
- .Debug ()
- .ApkFile ("../../../Xamarin.Forms.ControlGallery.Android/bin/Debug/AndroidControlGallery.AndroidControlGallery-Signed.apk")
- .StartApp ();
- } else {
- // Use CI Configuration
- App = ConfigureApp
- .Android
- .DeviceIp (Device.IP)
- .ApkFile ("../../../Xamarin.Forms.ControlGallery.Android/bin/Debug/AndroidControlGallery.AndroidControlGallery-Signed.apk")
- .StartApp ();
- }
-
- FixtureSetup ();
- }
-
- protected virtual void FixtureSetup ()
- {
- App.SetOrientationPortrait ();
- App.Screenshot ("Begin test");
- }
-
- Device SetupDevice (string idiomEnvVar, string IPEnvVar)
- {
- Device device;
-
- if (idiomEnvVar == "PHONE") {
-
- // default phone
- device = new Device (DeviceType.Phone, "10.0.1.161");
-
- if (!string.IsNullOrEmpty (IPEnvVar))
- device.IP = IPEnvVar;
-
- } else if (idiomEnvVar == "TABLET") {
-
- // default tablet
- device = new Device (DeviceType.Tablet, "10.0.1.42");
-
- if (!string.IsNullOrEmpty (IPEnvVar))
- device.IP = IPEnvVar;
-
- } else {
-
- // default phone
- device = new Device (DeviceType.Phone, "10.0.1.161");
-
- }
-
- return device;
- }
-
- }
-
- public static class PlatformStrings
- {
- public static string Button = "Button";
- public static string Cell = "xamarin.forms.platform.android.ViewCellRenderer_ViewCellContainer";
- public static string HomePageTitle = "Android Controls";
- public static string Label = "TextView";
- public static string Entry = "EditText";
- public static string Placeholder = "hint";
- public static string Text = "text";
- }
-
- public static class PlatformValues
- {
- public static int BoxViewScreenNumber = 4;
- public static int KeyboardDismissY = 500;
- public static int OffsetForScrollView = -5;
- }
-}
-
diff --git a/Xamarin.Forms.Android.UITests/Makefile b/Xamarin.Forms.Android.UITests/Makefile
deleted file mode 100644
index 87c3be6..0000000
--- a/Xamarin.Forms.Android.UITests/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-console:
- calabash-android console ../Xamarin.Forms.ControlGallery.Android/bin/Debug/AndroidControlGallery.AndroidControlGallery-Signed.apk
-
-testcloud:
- mono xut-console.exe submit --assembly-dir ../Xamarin.Forms.Android.UITests/bin/debug ../Xamarin.Forms.ControlGallery.Android/bin/Release/AndroidControlGallery.AndroidControlGallery-Signed.apk 1a02b2e1ee5a2895e47da095cc895a49 7a47b813
-
-run-phone-android:
- DEVICE_IDIOM=PHONE DEVICE_ID=9adaaf78 DEVICE_IP=192.168.1.144 mono ../packages/NUnit.Runners.2.6.3/tools/nunit-console-x86.exe -result=galaxy-results.xml bin/Debug/Xamarin.Forms.Android.UITests.dll
-
-run-parallel-android:
- DEVICE_IDIOM=TABLET mono ../packages/NUnit.Runners.2.6.3/tools/nunit-console-x86.exe -result=nexus-results.xml bin/Debug/Xamarin.Forms.Android.UITests.dll --include "CITest" &
- DEVICE_IDIOM=PHONE mono ../packages/NUnit.Runners.2.6.3/tools/nunit-console-x86.exe -result=galaxy-results.xml bin/Debug/Xamarin.Forms.Android.UITests.dll --include "CITest"
-
-clean:
- rm -rf screenshot_* test_servers/ .irb-history nexus-results.xml galaxy-results.xml
diff --git a/Xamarin.Forms.Android.UITests/PlatformHelpers.cs b/Xamarin.Forms.Android.UITests/PlatformHelpers.cs
deleted file mode 100644
index 6021f2a..0000000
--- a/Xamarin.Forms.Android.UITests/PlatformHelpers.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using Xamarin.UITest;
-using Xamarin.UITest.Android;
-using Xamarin.UITest.Queries;
-using NUnit.Framework;
-using System.Threading;
-
-namespace Xamarin.Forms.UITests
-{
-
- public static class PlatformHelpers
- {
-
- public static string GetTextForQuery (this IApp app, Func<AppQuery, AppQuery> query)
- {
- AppResult[] elements = app.Query (query);
- if (elements.Length > 1) {
- // Test cloud doesn't support Assert.Fail
- Assert.False (true, "Query returned more than one result");
- }
- return elements [0].Text;
- }
-
- public static bool ScrollDownForElement (this IApp app, Func<AppQuery, AppQuery> query, int scrollNumberLimit)
- {
- // Check if element exists before scrolling
- if (app.Query (query).Length > 0)
- return true;
-
- int scrollNumber = 0;
- while (app.Query (query).Length == 0) {
- app.ScrollDown ();
- scrollNumber++;
- if (scrollNumber > scrollNumberLimit)
- return false;
- }
-
- return true;
- }
-
- public static bool ScrollUpForElement (this IApp app, Func<AppQuery, AppQuery> query, int scrollNumberLimit)
- {
- int scrollNumber = 0;
- while (app.Query (query).Length == 0) {
- app.ScrollUp ();
- scrollNumber++;
- if (scrollNumber > scrollNumberLimit)
- return false;
- }
-
- return true;
- }
-
- public static bool DragFromToForElement (this AndroidApp app, int scrollNumberLimit, Func<AppQuery, AppQuery> query, float xStart, float yStart, float xEnd, float yEnd)
- {
- int numberOfScrolls = 0;
- // Element exists
- if (app.Query (query).Length > 0)
- return true;
-
- while (app.Query (query).Length == 0) {
- DragFromTo (app, xStart, yStart, xEnd, yEnd);
- if (numberOfScrolls > scrollNumberLimit) {
- return false;
- }
- numberOfScrolls++;
- }
- // Element found
- return true;
- }
-
- public static void SwipeBackNavigation (this AndroidApp app)
- {
- // Do nothing on Android
- }
-
- public static void DragFromTo (this AndroidApp app, float xStart, float yStart, float xEnd, float yEnd, Speed speed = Speed.Fast)
- {
- // No effect on Android
- app.DragCoordinates (xStart, yStart, xEnd, yEnd);
- }
-
- public static void KeyboardIsPresent (this AndroidApp app)
- {
- // TODO : Add keyboard detection
-// Thread.Sleep (1000);
-//
-// AppRect screenSize = app.MainScreenBounds ();
-// AppRect contentBounds = app.Query (q => q.Raw ("*").Id ("content"))[0].Rect;
-//
-// bool keyboardIsShown = false;
-// if ((screenSize.Height - contentBounds.Height) > (screenSize.Height / 4)) {
-// // Determine if keyboard is showing by seeing if content size is shrunk by over 1/4 of screens size
-// keyboardIsShown = true;
-// }
-//
-// Assert.IsTrue (keyboardIsShown, "Keyboard should be shown");
- Assert.Inconclusive ("Keyboard should be shown");
- }
-
- public static void KeyboardIsDismissed (this AndroidApp app)
- {
- // TODO : Add keyboard detection
-// AppRect screenSize = app.MainScreenBounds ();
-// AppRect contentBounds = app.Query (q => q.Raw ("*").Id ("content"))[0].Rect;
-//
-// bool keyboardIsShown = false;
-// if ((screenSize.Height - contentBounds.Height) > (screenSize.Height / 4)) {
-// // Determine if keyboard is showing by seeing if content size is shrunk by over 1/4 of screens size
-// keyboardIsShown = true;
-// }
-//
-// Assert.IsFalse (keyboardIsShown, "Keyboard should be dismissed");
- Assert.Inconclusive ("Keyboard should be dismissed");
- }
-
- public static int IndexForElementWithText (this AndroidApp app, Func<AppQuery, AppQuery> query, string text)
- {
- var elements = app.Query (query);
- int index = 0;
- for (int i = 0; i < elements.Length; i++) {
- string labelText = elements[i].Text;
- if (labelText == (text)) {
- index = i;
- break;
- }
- index++;
- }
- return index == elements.Length ? -1 : index;
- }
- }
-}
diff --git a/Xamarin.Forms.Android.UITests/PlatformQueries.cs b/Xamarin.Forms.Android.UITests/PlatformQueries.cs
deleted file mode 100644
index 0b82694..0000000
--- a/Xamarin.Forms.Android.UITests/PlatformQueries.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using Xamarin.UITest;
-using Xamarin.UITest.Android;
-using Xamarin.UITest.Queries;
-using NUnit.Framework;
-using System.Threading;
-
-namespace Xamarin.Forms.UITests
-{
- public class iOSUiTestType
- {
- public iOSUiTestType ()
- {
-
- }
- }
-
- public static class PlatformQueries
- {
- public static Func<AppQuery, AppQuery> AbsoluteGalleryBackground = q => q.Raw ("xamarin.forms.platform.android.BoxRenderer parent xamarin.forms.platform.android.RendererFactory_DefaultRenderer index:0");
- public static Func<AppQuery, AppQuery> ActivityIndicators = q => q.Raw ("ProgressBar");
- public static Func<AppQuery, AppQuery> Back = q => q.Id ("up");
- public static Func<AppQuery, AppQuery> BoxRendererQuery = q => q.Raw ("xamarin.forms.platform.android.BoxRenderer");
- public static Func<AppQuery, AppQuery> Cells = q => q.Raw ("xamarin.forms.platform.android.ViewCellRenderer_ViewCellContainer");
- public static Func<AppQuery, AppQuery> DismissPickerCustom = q => q.Marked ("OK");
- public static Func<AppQuery, AppQuery> DismissPickerNormal = q => q.Marked ("Done");
- public static Func<AppQuery, AppQuery> Entrys = q => q.Raw ("EntryEditText");
- public static Func<AppQuery, AppQuery> EntryCells = q => q.Raw ("EntryCellEditText");
- public static Func<AppQuery, AppQuery> Editors = q => q.Raw ("EditorEditText");
- public static Func<AppQuery, AppQuery> Frames = q => q.Raw ("FrameRenderer");
- public static Func<AppQuery, AppQuery> Images = q => q.Raw ("xamarin.forms.platform.android.ImageRenderer");
- public static Func<AppQuery, AppQuery> ImageView = q => q.Raw("ImageView");
- public static Func<AppQuery, AppQuery> LabelRenderers = q => q.Raw ("LabelRenderer");
- public static Func<AppQuery, AppQuery> List = q => q.Raw ("ListView");
- public static Func<AppQuery, AppQuery> Labels = q => q.Raw ("TextView");
- public static Func<AppQuery, AppQuery> Map = q => q.Raw ("MapView");
- public static Func<AppQuery, AppQuery> NumberPicker = q => q.Raw ("NumberPicker");
- public static Func<AppQuery, AppQuery> ProgressBar = q => q.Raw ("ProgressBar");
- public static Func<AppQuery, AppQuery> Tables = q => q.Raw ("ListView");
- public static Func<AppQuery, AppQuery> SearchBars = q => q.Raw ("SearchView");
- public static Func<AppQuery, AppQuery> Sliders = q => q.Raw ("SeekBar");
- public static Func<AppQuery, AppQuery> SpanningThreeRows = q => q.Marked ("Spanning 3 rows");
- public static Func<AppQuery, AppQuery> Steppers = q => q.Raw ("button marked:'+'");
- public static Func<AppQuery, AppQuery> Switch = q => q.Raw("Switch");
- public static Func<AppQuery, AppQuery> ThreeXThreeGridCell = q => q.Marked ("a block 3x3");
-
- public static Func<AppQuery, AppQuery> EntryWithPlaceholder (string text) {
- return q => q.Raw (string.Format ("EntryEditText hint:'{0}'", text));
- }
- public static Func<AppQuery, AppQuery> EntryCellWithPlaceholder (string text) {
- return q => q.Raw (string.Format ("EntryCellEditText hint:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EntryWithText (string text) {
- return q => q.Raw (string.Format ("EntryEditText text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EntryCellWithText (string text) {
- return q => q.Raw (string.Format ("EntryCellEditText text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EditorsWithText (string text) {
- return q => q.Raw (string.Format ("EditorEditText text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EntryWithIndex (int index) {
- return q => q.Raw (string.Format ("EntryEditText index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> SearchBarWithIndex (int index) {
- return q => q.Raw (string.Format ("SearchView index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> LabelWithIndex (int index) {
- return q => q.Raw (string.Format ("TextView index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> LabelWithText (string text) {
- return q => q.Raw (string.Format ("TextView text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> LabelWithId (string id) {
- return q => q.Raw (string.Format ("TextView id:'{0}'", id));
- }
-
- public static Func<AppQuery, AppQuery> PickerEntryWithIndex (int index) {
- return q => q.Raw (string.Format ("EditText index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> PickerEntryWithPlaceholder (string placeholder) {
- return q => q.Raw (string.Format ("EditText hint:'{0}'", placeholder));
- }
-
- public static Func<AppQuery, AppQuery> PickerEntryWithText (string text) {
- return q => q.Raw (string.Format ("EditText text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> SwitchWithIndex (int index) {
- return q => q.Raw (string.Format ("Switch index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> StepperWithIndex (int index) {
- return q => q.Raw (string.Format ("button marked:'+' index:{0}", index));
- }
-
- public static AppResult DetailPage (this AndroidApp app)
- {
- return app.Query (q => q.Raw ("*"))[0];
- }
- }
-}
diff --git a/Xamarin.Forms.Android.UITests/Properties/AssemblyInfo.cs b/Xamarin.Forms.Android.UITests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 99b6aa6..0000000
--- a/Xamarin.Forms.Android.UITests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 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("Xamarin.Forms.Android.UITest")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xamarin.Forms.Android.UITest")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fd80e73b-7225-40ce-b38d-350c5487a0df")]
-
-// 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: AssemblyFileVersion("1.0.0.0")]
diff --git a/Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj b/Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj
deleted file mode 100644
index a549f35..0000000
--- a/Xamarin.Forms.Android.UITests/Xamarin.Forms.Android.UITests.csproj
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{D290FCBE-3196-452B-B84C-B62BF9B54F2A}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Xamarin.Forms.Android.UITest</RootNamespace>
- <AssemblyName>Xamarin.Forms.Android.UITests</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="nunit.framework">
- <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath>
- <Private>True</Private>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="BaseTestFixture.cs" />
- <Compile Include="..\Xamarin.Forms.iOS.UITests\TestHelpers.cs">
- <Link>TestHelpers.cs</Link>
- </Compile>
- <Compile Include="PlatformQueries.cs" />
- <Compile Include="PlatformHelpers.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- <Compile Include="..\Xamarin.Forms.iOS.UITests\Device.cs">
- <Link>Device.cs</Link>
- </Compile>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project> \ No newline at end of file
diff --git a/Xamarin.Forms.Android.UITests/packages.config b/Xamarin.Forms.Android.UITests/packages.config
deleted file mode 100644
index 6a27733..0000000
--- a/Xamarin.Forms.Android.UITests/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="NUnit" version="2.6.3" targetFramework="net45" />
- <package id="Xamarin.UITest" version="1.3.8" targetFramework="net45" />
-</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.Android.UITests/testcloudupload.bat b/Xamarin.Forms.Android.UITests/testcloudupload.bat
deleted file mode 100644
index 1afa4cf..0000000
--- a/Xamarin.Forms.Android.UITests/testcloudupload.bat
+++ /dev/null
@@ -1 +0,0 @@
-xut-console.exe submit --assembly-dir ..\Xamarin.Forms.Android.UITests\bin\debug ..\Xamarin.Forms.ControlGallery.Android\bin\Release\AndroidControlGallery.AndroidControlGallery-Signed.apk 1a02b2e1ee5a2895e47da095cc895a49 6bbba6ec
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1549.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1549.xaml
deleted file mode 100644
index 16f3945..0000000
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1549.xaml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<local:BaseView
- xmlns="http://xamarin.com/schemas/2014/forms"
- xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
- x:Class="Xamarin.Forms.Controls.Issue1549"
- xmlns:local="clr-namespace:Xamarin.Forms.Controls;assembly=Xamarin.Forms.Controls"
- Padding="0,40,0,0">
- <local:BaseView.Resources>
- <ResourceDictionary>
- <local:InvertBoolenConverter x:Key="cnvInvert"></local:InvertBoolenConverter>
- </ResourceDictionary>
- </local:BaseView.Resources>
- <local:BaseView.Content>
- <ListView x:Name="lst" VerticalOptions="FillAndExpand"
- HorizontalOptions="FillAndExpand"
-
- ItemsSource="{Binding Items}"
-
- >
- <ListView.ItemTemplate >
- <DataTemplate>
- <ViewCell >
- <ViewCell.View>
- <Grid VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" >
- <Label IsVisible="{Binding IsLocked}" Text="Show Is Locked" />
- <Label IsVisible="{Binding IsLocked, Converter={StaticResource cnvInvert}}" Text="Show Is Not locked" />
- </Grid>
- </ViewCell.View>
- </ViewCell>
- </DataTemplate>
- </ListView.ItemTemplate>
- </ListView>
- </local:BaseView.Content>
-</local:BaseView> \ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1549.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1549.xaml.cs
deleted file mode 100644
index 9c9ff5d..0000000
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1549.xaml.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Xamarin.Forms;
-using System.Collections.ObjectModel;
-
-using Xamarin.Forms.CustomAttributes;
-using Xamarin.Forms.Internals;
-
-namespace Xamarin.Forms.Controls
-{
-#if APP
- public class BaseView : ContentPage
- {
- public BaseView()
- {
- }
- }
-
- [Preserve (AllMembers=true)]
- [Issue (IssueTracker.Github, 1549, "XAML converters not invoked", PlatformAffected.Android | PlatformAffected.iOS | PlatformAffected.WinPhone)]
- public partial class Issue1549 : BaseView
- {
- public Issue1549 ()
- {
- InitializeComponent ();
-
- Items = new ObservableCollection<Issue1549Item> ();
- Items.Add (new Issue1549Item () { IsLocked = true });
- Items.Add (new Issue1549Item () { IsLocked = true });
- Items.Add (new Issue1549Item () { IsLocked = true });
- Items.Add (new Issue1549Item () { IsLocked = true });
- lst.BindingContext = this;
- }
-
- public new ObservableCollection<Issue1549Item> Items {
- get;
- set;
- }
- }
-
- public class InvertBoolenConverter : IValueConverter
- {
-
- #region IValueConverter implementation
-
- public object Convert (object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
- {
- if (value is bool) {
-
- return !(bool)value;
- }
- return value;
- }
-
- public object ConvertBack (object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
- {
- throw new NotImplementedException ();
- }
-
- #endregion
- }
-
-
- public class Issue1549Item
- {
-
- public bool IsLocked {
- get;
- set;
- }
-
- }
-#endif
-}
-
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index c857bbb..eac49a1 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -178,9 +178,6 @@
<DependentUpon>Issue1545.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Issue1546.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Issue1549.xaml.cs">
- <DependentUpon>Issue1549.xaml</DependentUpon>
- </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Issue1554.xaml.cs">
<DependentUpon>Issue1554.xaml</DependentUpon>
</Compile>
@@ -420,9 +417,6 @@
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue1545.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
- <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue1549.xaml">
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue1554.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
diff --git a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj b/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
index 173587b..685c819 100644
--- a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
+++ b/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
@@ -22,7 +22,7 @@
<DefineConstants>TRACE;DEBUG;__ANDROID__;UITEST</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>0114;0108;4014;0649;0168;0169;0219</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -57,8 +57,8 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
- <Reference Include="Xamarin.UITest, Version=1.3.7.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.1.3.7\lib\Xamarin.UITest.dll</HintPath>
+ <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -242,4 +242,4 @@
</Target>
-->
<ItemGroup />
-</Project> \ No newline at end of file
+</Project>
diff --git a/Xamarin.Forms.Core.Android.UITests/packages.config b/Xamarin.Forms.Core.Android.UITests/packages.config
index ab8ea99..bd8e626 100644
--- a/Xamarin.Forms.Core.Android.UITests/packages.config
+++ b/Xamarin.Forms.Core.Android.UITests/packages.config
@@ -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="1.3.7" targetFramework="net45" />
+ <package id="Xamarin.UITest" version="1.3.8" targetFramework="net45" />
</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj b/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
index ae9ddd6..5fd01fc 100644
--- a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
+++ b/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
@@ -46,8 +46,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
- <Reference Include="Xamarin.UITest, Version=1.3.7.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.1.3.7\lib\Xamarin.UITest.dll</HintPath>
+ <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
diff --git a/Xamarin.Forms.Core.Windows.UITests/packages.config b/Xamarin.Forms.Core.Windows.UITests/packages.config
index 814cef1..2a19566 100644
--- a/Xamarin.Forms.Core.Windows.UITests/packages.config
+++ b/Xamarin.Forms.Core.Windows.UITests/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.0.1" targetFramework="net45" />
- <package id="Xamarin.UITest" version="1.3.7" targetFramework="net45" />
+ <package id="Xamarin.UITest" version="1.3.8" targetFramework="net45" />
</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj b/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
index 07b513e..3454e07 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
+++ b/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
@@ -22,7 +22,7 @@
<DefineConstants>TRACE;DEBUG;__IOS__;UITEST</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>0114;0108;4014;0649;0169;0168;0219</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -58,8 +58,8 @@
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
- <Reference Include="Xamarin.UITest, Version=1.3.7.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.1.3.7\lib\Xamarin.UITest.dll</HintPath>
+ <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
@@ -153,4 +153,4 @@
</Target>
-->
<ItemGroup />
-</Project> \ No newline at end of file
+</Project>
diff --git a/Xamarin.Forms.Core.iOS.UITests/packages.config b/Xamarin.Forms.Core.iOS.UITests/packages.config
index ab8ea99..bd8e626 100644
--- a/Xamarin.Forms.Core.iOS.UITests/packages.config
+++ b/Xamarin.Forms.Core.iOS.UITests/packages.config
@@ -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="1.3.7" targetFramework="net45" />
+ <package id="Xamarin.UITest" version="1.3.8" targetFramework="net45" />
</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.iOS.UITests/Device.cs b/Xamarin.Forms.iOS.UITests/Device.cs
deleted file mode 100644
index 32b2cf8..0000000
--- a/Xamarin.Forms.iOS.UITests/Device.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Xamarin.Forms.UITests
-{
-
- public enum DeviceType
- {
- Phone,
- Tablet
- }
-
- public class Device
- {
- public DeviceType Type { get; set; }
- public string IP { get; set; }
-
- public Device (DeviceType type, string ip)
- {
- Type = type;
- IP = ip;
- }
- }
-}
diff --git a/Xamarin.Forms.iOS.UITests/Legacy-BaseTestFixture.cs b/Xamarin.Forms.iOS.UITests/Legacy-BaseTestFixture.cs
deleted file mode 100644
index 07cbe93..0000000
--- a/Xamarin.Forms.iOS.UITests/Legacy-BaseTestFixture.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using Xamarin.UITest;
-using Xamarin.UITest.iOS;
-using Xamarin.UITest.Queries;
-using NUnit.Framework;
-using System.Threading;
-
-namespace Xamarin.Forms.UITests
-{
-
- public class BaseTestFixture
- {
- string idiomEnvVar;
- string IPEnvVar;
-
- public static iOSApp App { get; private set; }
- public Device Device { get; set; }
-
- public BaseTestFixture ()
- {
- idiomEnvVar = Environment.GetEnvironmentVariable ("DEVICE_IDIOM");
- IPEnvVar = Environment.GetEnvironmentVariable ("DEVICE_IP");
-
- Console.WriteLine (string.Format ("****** Connecting to {0} with IP: {1} ********", idiomEnvVar, IPEnvVar));
-
- Device = SetupDevice (idiomEnvVar, IPEnvVar);
- }
-
- [SetUp]
- public void Setup ()
- {
-
- if (string.IsNullOrEmpty (idiomEnvVar) &&
- string.IsNullOrEmpty (IPEnvVar)) {
- // IDE Configuration
- // Use your own device information
- App = ConfigureApp
- .iOS
- .Debug ()
-// .DeviceIp ("10.0.1.159") // iPod iOS 7
- // .DeviceIp ("10.0.1.163") // iPhone iOS 7
- // .DeviceIp ("10.0.3.146") // iPod iOS 6
- .InstalledApp ("com.xamarin.quickui.controlgallery")
- .StartApp();
- } else {
- // CI Configuration
- App = ConfigureApp
- .iOS
- .DeviceIp (Device.IP)
- .InstalledApp ("com.xamarin.quickui.controlgallery")
- .StartApp();
- }
-
- FixtureSetup ();
- }
-
- protected virtual void FixtureSetup ()
- {
- App.SetOrientationPortrait ();
- App.Screenshot ("Begin test");
- }
-
- Device SetupDevice (string idiomEnvVar, string IPEnvVar)
- {
- Device device;
-
- if (idiomEnvVar == "PHONE") {
-
- // default phone
- device = new Device (DeviceType.Phone, "10.0.3.253");
-
- if (!string.IsNullOrEmpty (IPEnvVar))
- device.IP = IPEnvVar;
-
- } else if (idiomEnvVar == "TABLET") {
-
- // default tablet
- device = new Device (DeviceType.Tablet, "10.0.1.159");
-
- if (!string.IsNullOrEmpty (IPEnvVar))
- device.IP = IPEnvVar;
-
- } else {
-
- // default phone
- device = new Device (DeviceType.Phone, "10.0.3.253");
-
- }
-
- return device;
- }
- }
-
- public static class PlatformStrings
- {
- public static string Button = "Button";
- public static string Cell = "TableViewCell";
- public static string Entry = "TextField";
- public static string HomePageTitle = "iOS Controls";
- public static string Label = "Label";
- public static string MapPin = "view:'MKPinAnnotationView'";
- public static string Placeholder = "placeholder";
- public static string Text = "text";
- }
-
- public static class PlatformValues
- {
- public static int BoxViewScreenNumber = 3;
- public static int KeyboardDismissY = 200;
- public static int OffsetForScrollView = 5;
- }
-}
-
diff --git a/Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs b/Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs
deleted file mode 100644
index 014b6a5..0000000
--- a/Xamarin.Forms.iOS.UITests/Legacy-PlatformHelpers.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System;
-using Xamarin.UITest;
-using Xamarin.UITest.iOS;
-using Xamarin.UITest.Queries;
-using NUnit.Framework;
-using System.Threading;
-
-namespace Xamarin.Forms.UITests
-{
-
- public static class PlatformHelpers
- {
-
- public static string GetTextForQuery (this IApp app, Func<AppQuery, AppQuery> query)
- {
- AppResult[] elements = app.Query (query);
- if (elements.Length > 1) {
- // Test cloud doesn't support Assert.Fail
- Assert.False (true, "Query returned more than one result");
- }
- return elements [0].Label;
- }
-
- public static bool ScrollDownForElement (this IApp app, Func<AppQuery, AppQuery> query, int scrollNumberLimit)
- {
- var desiredElement = app.Query (query);
- var tabBarElement = app.Query (q => q.Raw ("TabBar"));
- // Check for elements under a TabbedBar
- // If the element exists and is under the tabbed bar scroll down once
- if (
- tabBarElement.Length > 0 &&
- desiredElement.Length > 0 &&
- (Math.Abs(desiredElement[0].Rect.Y - tabBarElement[0].Rect.Y) <= 75)
- )
- {
- app.ScrollDown ();
- return true;
- }
-
- // Check if element exists before scrolling
- if (app.Query (query).Length > 0)
- return true;
-
- int scrollNumber = 0;
- while (app.Query (query).Length == 0) {
- app.ScrollDown ();
- scrollNumber++;
- if (scrollNumber > scrollNumberLimit)
- return false;
- }
-
- // Avoid hidden elements under a tabbed controller
- app.ScrollDown ();
- Thread.Sleep (1000);
-
- return true;
- }
-
- public static bool ScrollUpForElement (this IApp app, Func<AppQuery, AppQuery> query, int scrollNumberLimit)
- {
- int scrollNumber = 0;
- while (app.Query (query).Length == 0) {
- app.ScrollUp ();
- scrollNumber++;
- if (scrollNumber > scrollNumberLimit)
- return false;
- }
-
- app.ScrollUp ();
-
- return true;
- }
-
- public static bool DragFromToForElement (this iOSApp app, int scrollNumberLimit, Func<AppQuery, AppQuery> query, float xStart, float yStart, float xEnd, float yEnd)
- {
- int numberOfScrolls = 0;
- // Element exists
- if (app.Query (query).Length > 0)
- return true;
-
- while (app.Query (query).Length == 0) {
- DragFromTo (app, xStart, yStart, xEnd, yEnd);
- if (numberOfScrolls > scrollNumberLimit) {
- return false;
- }
- numberOfScrolls++;
- }
- // Element found
- return true;
- }
-
- public static void SwipeBackNavigation (this iOSApp app)
- {
- //app.PanCoordinates (0, 125, 75, 125, TimeSpan.FromSeconds (5));
- }
-
- public static void DragFromTo (this iOSApp app, float xStart, float yStart, float xEnd, float yEnd, Speed speed = Speed.Fast)
- {
- //if (speed == Speed.Slow)
- // app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (3000));
- //else
- // app.PanCoordinates (xStart, yStart, xEnd, yEnd, TimeSpan.FromMilliseconds (1000));
-
- }
-
- public static void KeyboardIsPresent (this iOSApp app)
- {
- // TODO : Add keyboard detection
- // app.WaitForElement (q => q.Raw ("KBKeyplaneView"));
- Assert.Inconclusive ("Keyboard should be shown");
- }
-
- public static void KeyboardIsDismissed (this iOSApp app)
- {
- // TODO : Add keyboard detection
- // app.WaitForNoElement (q => q.Raw ("KBKeyplaneView"));
- Assert.Inconclusive ("Keyboard should be dismissed");
- }
-
- public static int IndexForElementWithText (this iOSApp app, Func<AppQuery, AppQuery> query, string text)
- {
- var elements = app.Query (query);
- int index = 0;
- for (int i = 0; i < elements.Length; i++) {
- string labelText = elements[i].Label;
- if (labelText == (text)) {
- index = i;
- break;
- }
- index++;
- }
- return index == elements.Length ? -1 : index;
- }
- }
-}
diff --git a/Xamarin.Forms.iOS.UITests/Makefile b/Xamarin.Forms.iOS.UITests/Makefile
deleted file mode 100644
index b94c654..0000000
--- a/Xamarin.Forms.iOS.UITests/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-console:
- DEVICE_ENDPOINT=http://10.0.3.253:37265 BUNDLE_ID=com.xamarin.quickui.controlgallery calabash-ios console
-
-run:
- mono ../packages/NUnit.Runners.2.6.3/tools/nunit-console.exe bin/Debug/Xamarin.Forms.iOS.UITests.dll
-
-run-ios-phone:
- DEVICE_IDIOM=PHONE DEVICE_IP=192.168.1.145 DEVICE_ID=795a532d7fb4569fb728a79784eb73bbbca995ba mono ../packages/NUnit.Runners.2.6.3/tools/nunit-console-x86.exe -result=iphone-results.xml bin/Debug/Xamarin.Forms.iOS.UITests.dll
-
-run-ios:
- DEVICE_IDIOM=PHONE mono ../packages/NUnit.Runners.2.6.3/tools/nunit-console-x86.exe -result=iphone-results.xml bin/Debug/Xamarin.Forms.iOS.UITests.dll --include "CITest";
- DEVICE_IDIOM=TABLET mono ../packages/NUnit.Runners.2.6.3/tools/nunit-console-x86.exe -result=ipad-results.xml bin/Debug/Xamarin.Forms.iOS.UITests.dll --include "CITest"
-
-clean:
- rm -rf screenshot_* test_servers/ iphone-results.xml ipad-results.xml
diff --git a/Xamarin.Forms.iOS.UITests/PlatformQueries.cs b/Xamarin.Forms.iOS.UITests/PlatformQueries.cs
deleted file mode 100644
index 761fa00..0000000
--- a/Xamarin.Forms.iOS.UITests/PlatformQueries.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using Xamarin.UITest;
-using Xamarin.UITest.iOS;
-using Xamarin.UITest.Queries;
-using NUnit.Framework;
-using System.Threading;
-
-namespace Xamarin.Forms.UITests
-{
- public class AndroidUiTestType
- {
- public AndroidUiTestType ()
- {
-
- }
- }
-
- public static class PlatformQueries
- {
- public static Func<AppQuery, AppQuery> AbsoluteGalleryBackground = q => q.Raw ("view:'Xamarin_Forms_Platform_iOS_BoxRenderer' parent view index:0");
- public static Func<AppQuery, AppQuery> ActivityIndicators = q => q.Raw ("ActivityIndicatorView");
- public static Func<AppQuery, AppQuery> Back = q => q.Raw ("view:'UINavigationItemButtonView'");
- public static Func<AppQuery, AppQuery> BoxRendererQuery = q => q.Raw ("view:'Xamarin_Forms_Platform_iOS_BoxRenderer'");
- public static Func<AppQuery, AppQuery> Cells = q => q.Raw ("TableViewCell");
- public static Func<AppQuery, AppQuery> DismissPickerCustom = q => q.Marked ("Done");
- public static Func<AppQuery, AppQuery> DismissPickerNormal = q => q.Marked ("Done");
- public static Func<AppQuery, AppQuery> Entrys = q => q.Raw ("TextField");
- public static Func<AppQuery, AppQuery> Editors = q => q.Raw ("TextView");
- public static Func<AppQuery, AppQuery> Frames = q => q.Raw ("view:'Xamarin_Forms_Platform_iOS_FrameRenderer'");
- public static Func<AppQuery, AppQuery> Images = q => q.Raw ("view:'Xamarin_Forms_Platform_iOS_ImageRenderer'");
- public static Func<AppQuery, AppQuery> ImageView = q => q.Raw ("ImageView");
- public static Func<AppQuery, AppQuery> Labels = q => q.Raw ("Label");
- public static Func<AppQuery, AppQuery> LabelRenderers = q => q.Raw ("view:'Xamarin_Forms_Platform_iOS_LabelRenderer'");
- public static Func<AppQuery, AppQuery> List = q => q.Raw ("TableView");
- public static Func<AppQuery, AppQuery> Map = q => q.Raw ("view:'MKMapView'");
- public static Func<AppQuery, AppQuery> MapPins = q => q.Raw ("all view:'MKPinAnnotationView'");
- public static Func<AppQuery, AppQuery> NavigationBar = q => q.Raw ("NavigationBar");
- public static Func<AppQuery, AppQuery> NumberPicker = q => q.Raw ("PickerTableView");
- public static Func<AppQuery, AppQuery> ProgressBar = q => q.Raw ("ProgressView");
- public static Func<AppQuery, AppQuery> SearchBars = q => q.Raw ("SearchBar");
- public static Func<AppQuery, AppQuery> Sliders = q => q.Raw ("Slider");
- public static Func<AppQuery, AppQuery> Steppers = q => q.Raw ("Stepper");
- public static Func<AppQuery, AppQuery> Switch = q => q.Raw ("Switch");
- public static Func<AppQuery, AppQuery> Tables = q => q.Raw ("TableView");
- public static Func<AppQuery, AppQuery> ThreeXThreeGridCell = q => q.Raw ("view marked:'a block 3x3' parent view:'Xamarin_Forms_Platform_iOS_LabelRenderer'");
- public static Func<AppQuery, AppQuery> SpanningThreeRows = q => q.Raw ("view marked:'Spanning 3 rows' parent view:'Xamarin_Forms_Platform_iOS_LabelRenderer'");
-
- public static Func<AppQuery, AppQuery> EntryWithPlaceholder (string text) {
- return q => q.Raw (string.Format ("TextField placeholder:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EntryWithText (string text) {
- return q => q.Raw (string.Format ("TextField text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EntryCellWithPlaceholder (string text) {
- return q => q.Raw (string.Format ("TextField placeholder:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EntryCellWithText (string text) {
- return q => q.Raw (string.Format ("TextField text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EditorsWithText (string text) {
- return q => q.Raw (string.Format ("TextView text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> EntryWithIndex (int index) {
- return q => q.Raw (string.Format ("TextField index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> SearchBarWithIndex (int index) {
- return q => q.Raw (string.Format ("SearchBar index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> LabelWithIndex (int index) {
- return q => q.Raw (string.Format ("Label index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> LabelWithText (string text) {
- return q => q.Raw (string.Format ("Label text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> LabelWithId (string id) {
- return q => q.Raw (string.Format ("Label id:'{0}'", id));
- }
-
- public static Func<AppQuery, AppQuery> PickerEntryWithIndex (int index) {
- return q => q.Raw (string.Format ("TextField index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> PickerEntryWithPlaceholder (string placeholder) {
- return q => q.Raw (string.Format ("TextField placeholder:'{0}'", placeholder));
- }
-
- public static Func<AppQuery, AppQuery> PickerEntryWithText (string text) {
- return q => q.Raw (string.Format ("TextField text:'{0}'", text));
- }
-
- public static Func<AppQuery, AppQuery> SwitchWithIndex (int index) {
- return q => q.Raw (string.Format ("Switch index:{0}", index));
- }
-
- public static Func<AppQuery, AppQuery> StepperWithIndex (int index) {
- return q => q.Raw (string.Format ("Stepper index:{0}", index));
- }
-
- public static AppResult DetailPage (this iOSApp app)
- {
- if (app.Query (q => q.Raw ("view:'UILayoutContainerView'")).Length == 3) {
- // iPad SplitView Landscape
- return app.Query (q => q.Raw ("view:'UILayoutContainerView'"))[2];
- }
- return app.Query (q => q.Raw ("*"))[0];
- }
-
- }
-}
diff --git a/Xamarin.Forms.iOS.UITests/Properties/AssemblyInfo.cs b/Xamarin.Forms.iOS.UITests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7ff77aa..0000000
--- a/Xamarin.Forms.iOS.UITests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 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("Xamarin.Forms.iOS.UITests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xamarin.Forms.iOS.UITests")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("6269ddd8-ec05-4638-97ec-939651fec5a8")]
-
-// 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: AssemblyFileVersion("1.0.0.0")]
diff --git a/Xamarin.Forms.iOS.UITests/TestHelpers.cs b/Xamarin.Forms.iOS.UITests/TestHelpers.cs
deleted file mode 100644
index 981122c..0000000
--- a/Xamarin.Forms.iOS.UITests/TestHelpers.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Xamarin.UITest;
-using Xamarin.UITest.Queries;
-
-namespace Xamarin.Forms.UITests
-{
- public enum Speed
- {
- Slow,
- Fast
- }
-
- public static class TestHelpers
- {
- public static int ControlGalleryMaxScrolls = 30;
-
- public static void NavigateBack (this IApp app)
- {
- app.Tap (PlatformQueries.Back);
- }
-
- public static void NavigateToTestCases (this IApp app)
- {
- app.Tap (q => q.Marked ("Test Cases"));
- app.WaitForElement (q => q.Marked ("Carousel Async Add Page Issue"));
- }
-
- public static AppRect MainScreenBounds (this IApp app)
- {
- return app.Query (q => q.Raw ("*"))[0].Rect;
- }
-
- }
-}
-
diff --git a/Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj b/Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj
deleted file mode 100644
index 930b63c..0000000
--- a/Xamarin.Forms.iOS.UITests/Xamarin.Forms.iOS.UITests.csproj
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{6108FD24-F3B1-463D-83E2-35B981A1CB81}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Xamarin.Forms.iOS.UITests</RootNamespace>
- <AssemblyName>Xamarin.Forms.iOS.UITests</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- <Reference Include="nunit.framework">
- <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
- <Reference Include="Xamarin.UITest, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.UITest.1.3.8\lib\Xamarin.UITest.dll</HintPath>
- <Private>True</Private>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Legacy-BaseTestFixture.cs" />
- <Compile Include="TestHelpers.cs" />
- <Compile Include="PlatformQueries.cs" />
- <Compile Include="Legacy-PlatformHelpers.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- <Compile Include="Device.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <ItemGroup />
-</Project> \ No newline at end of file
diff --git a/Xamarin.Forms.iOS.UITests/packages.config b/Xamarin.Forms.iOS.UITests/packages.config
deleted file mode 100644
index 6a27733..0000000
--- a/Xamarin.Forms.iOS.UITests/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="NUnit" version="2.6.3" targetFramework="net45" />
- <package id="Xamarin.UITest" version="1.3.8" targetFramework="net45" />
-</packages> \ No newline at end of file