From 7a09aa56b8728a0e780bbc05ba846109348a41cd Mon Sep 17 00:00:00 2001 From: jogibear9988 Date: Tue, 28 Oct 2014 23:57:30 +0100 Subject: [PATCH] Unitests -> when they'll work Tickets: #192 and #408 should be fixed --- .../Tests/WpfDesign.Tests.csproj | 5 +- .../Tests/XamlDom/CollectionTests.cs | 24 +++++ .../Tests/XamlDom/SamplesTests.cs | 94 +++++++++++++++++++ .../WpfDesign.XamlDom/Project/XamlObject.cs | 2 +- 4 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/CollectionTests.cs diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj index 9ed980b88b..141e0a2947 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj @@ -72,6 +72,7 @@ + @@ -101,7 +102,5 @@ WpfDesign.Designer - - - + \ No newline at end of file diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/CollectionTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/CollectionTests.cs new file mode 100644 index 0000000000..32ef6c95cc --- /dev/null +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/CollectionTests.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Documents; +using System.Windows.Media.Animation; +using ICSharpCode.WpfDesign.XamlDom; +using NUnit.Framework; + +namespace ICSharpCode.WpfDesign.Tests.XamlDom +{ + [TestFixture] + public class CollectionTests + { + [Test] + public void LineBreakNoCollection() + { + var isCollection = CollectionSupport.IsCollectionType(typeof(LineBreak)); + + Assert.IsFalse(isCollection); + } + } +} diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs index a6c2731e50..bb3f834eed 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs @@ -140,5 +140,99 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom "); } + + [Test] + public void Resources2() + { + TestLoading(@" + + + + "); + } + + [Test] + public void Animation1() + { + TestLoading(@" + + + +"); + } + + [Test] + public void Animation2() + { + //Loaded Property has to be found, because this so also works in WPF + + TestLoading(@" + + + +"); + } + + [Test] + public void Animation3() + { + TestLoading(@" + + + +"); + } + + + } } diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs index 0429d5192c..fbe1131988 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs @@ -70,7 +70,7 @@ namespace ICSharpCode.WpfDesign.XamlDom if (property.IsAttached == false) { foreach (XamlProperty p in properties) { if (p.IsAttached == false && p.PropertyName == property.PropertyName) - Debug.Fail("duplicate property"); + throw new XamlLoadException("duplicate property"); } } #endif