diff options
-rw-r--r-- | Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml | 4 | ||||
-rw-r--r-- | Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml.cs | 58 | ||||
-rw-r--r-- | Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj | 6 |
3 files changed, 68 insertions, 0 deletions
diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml new file mode 100644 index 00000000..eaccfcd9 --- /dev/null +++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Xamarin.Forms.Xaml.UnitTests.Bz43733"> + <Label x:Name="label" Text="{StaticResource SharedText}"/> +</ContentPage> diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml.cs b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml.cs new file mode 100644 index 00000000..2f15579f --- /dev/null +++ b/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using NUnit.Framework; +using Xamarin.Forms; +using Xamarin.Forms.Core.UnitTests; + +namespace Xamarin.Forms.Xaml.UnitTests +{ + public class Bz43733Rd : ResourceDictionary + { + public Bz43733Rd() + { + Add("SharedText", "Foo"); + } + } + + public partial class Bz43733 : ContentPage + { + public Bz43733() + { + InitializeComponent(); + } + + public Bz43733(bool useCompiledXaml) + { + //this stub will be replaced at compile time + } + + [TestFixture] + class Tests + { + [SetUp] + public void Setup() + { + Device.PlatformServices = new MockPlatformServices(); + } + + [TearDown] + public void TearDown() + { + Device.PlatformServices = null; + } + + [TestCase(true)] + [TestCase(false)] + public void ThrowOnMissingDictionary(bool useCompiledXaml) + { + Application.Current = new MockApplication { + Resources = new ResourceDictionary { + MergedWith = typeof(Bz43733Rd), + } + }; + var p = new Bz43733(useCompiledXaml); + Assert.AreEqual("Foo", p.label.Text); + } + } + } +} diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj index 89a348b1..3b7a9f8b 100644 --- a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj +++ b/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj @@ -433,6 +433,9 @@ <Compile Include="Issues\Bz42531.xaml.cs"> <DependentUpon>Bz42531.xaml</DependentUpon> </Compile> + <Compile Include="Issues\Bz43733.xaml.cs"> + <DependentUpon>Bz43733.xaml</DependentUpon> + </Compile> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="..\.nuspec\Xamarin.Forms.Debug.targets" /> @@ -787,6 +790,9 @@ <EmbeddedResource Include="Issues\Bz42531.xaml"> <Generator>MSBuild:UpdateDesignTimeXaml</Generator> </EmbeddedResource> + <EmbeddedResource Include="Issues\Bz43733.xaml"> + <Generator>MSBuild:UpdateDesignTimeXaml</Generator> + </EmbeddedResource> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> |