This commit is contained in:
Stephane Delcroix 2017-01-26 15:01:53 +01:00
Родитель e3f193712b
Коммит 6670ca5845
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: EDD442EF80530554
3 изменённых файлов: 68 добавлений и 0 удалений

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

@ -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>

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

@ -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);
}
}
}
}

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

@ -418,6 +418,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" />
@ -757,6 +760,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}" />