diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2017-02-10 11:07:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-10 11:07:00 +0100 |
commit | 3241fae11d6804268d1f67545e9d9eeb42f371e7 (patch) | |
tree | 4ccac9461a19848099fb47beb8d43a65324fd635 /Xamarin.Forms.Xaml.UnitTests | |
parent | 39f6e6325f39ccaa46137135cb33ced1a384495d (diff) | |
download | xamarin-forms-3241fae11d6804268d1f67545e9d9eeb42f371e7.tar.gz xamarin-forms-3241fae11d6804268d1f67545e9d9eeb42f371e7.tar.bz2 xamarin-forms-3241fae11d6804268d1f67545e9d9eeb42f371e7.zip |
Xaml empty service provider (#736)
* [Xaml] AcceptEmptyServiceProvider
* [XamlC] AcceptEmptyServiceProvider
* docs
Diffstat (limited to 'Xamarin.Forms.Xaml.UnitTests')
3 files changed, 74 insertions, 0 deletions
diff --git a/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml b/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml new file mode 100644 index 00000000..b39bd287 --- /dev/null +++ b/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" + xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" + xmlns:local="clr-namespace:Xamarin.Forms.Xaml.UnitTests" + x:Class="Xamarin.Forms.Xaml.UnitTests.AcceptEmptyServiceProvider" ServiceProvider="{local:Foo}"> +</ContentPage>
\ No newline at end of file diff --git a/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml.cs new file mode 100644 index 00000000..611cb36e --- /dev/null +++ b/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using NUnit.Framework; +using Xamarin.Forms; +using Xamarin.Forms.Core.UnitTests; + +namespace Xamarin.Forms.Xaml.UnitTests +{ + [AcceptEmptyServiceProvider] + public class FooExtension : IMarkupExtension<IServiceProvider> + { + public IServiceProvider ProvideValue(IServiceProvider serviceProvider) + { + return serviceProvider; + } + + object IMarkupExtension.ProvideValue(IServiceProvider serviceProvider) + { + return (this as IMarkupExtension<IServiceProvider>).ProvideValue(serviceProvider); + } + } + + public partial class AcceptEmptyServiceProvider : ContentPage + { + public AcceptEmptyServiceProvider() + { + InitializeComponent(); + } + + public AcceptEmptyServiceProvider(bool useCompiledXaml) + { + //this stub will be replaced at compile time + } + + public IServiceProvider ServiceProvider { get; set; } + + [TestFixture] + class Tests + { + [SetUp] + public void Setup() + { + Device.PlatformServices = new MockPlatformServices(); + } + + [TearDown] + public void TearDown() + { + Device.PlatformServices = null; + } + + [TestCase(true)] + [TestCase(false)] + public void ServiceProviderIsNullOnAttributedExtensions(bool useCompiledXaml) + { + var p = new AcceptEmptyServiceProvider(useCompiledXaml); + Assert.IsNull(p.ServiceProvider); + } + } + } +} diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj index 4b3e5c86..90bab284 100644 --- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj +++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj @@ -441,6 +441,10 @@ </Compile> <Compile Include="Issues\Bz44216.xaml.cs"> <DependentUpon>Bz44216.xaml</DependentUpon> + <DependentUpon>AcceptEmptyServiceProvider.xaml</DependentUpon> + </Compile> + <Compile Include="AcceptEmptyServiceProvider.xaml.cs"> + <DependentUpon>AcceptEmptyServiceProvider.xaml</DependentUpon> </Compile> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> @@ -805,6 +809,9 @@ <EmbeddedResource Include="Issues\Bz44216.xaml"> <Generator>MSBuild:UpdateDesignTimeXaml</Generator> </EmbeddedResource> + <EmbeddedResource Include="AcceptEmptyServiceProvider.xaml"> + <Generator>MSBuild:UpdateDesignTimeXaml</Generator> + </EmbeddedResource> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> |