ResourceDictionary fixes (#536)

* [C] avoid leaking RDs, remove reflection call, validate arguments

* [C,Xaml] The only way to get merged values are internal

1 files changed, 40 insertions, 9 deletions

diff --git a/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs b/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs
index c4e6bbf3..e5b8b60d 100644
--- a/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs
@@ -253,13 +253,44 @@ namespace Xamarin.Forms.Core.UnitTests
 			Assert.Fail ();
 		}
 
-        [Test]
-        public void ShowKeyInExceptionIfNotFound()
-        {
-            var rd = new ResourceDictionary();
-            rd.Add("foo", "bar");
-            var ex = Assert.Throws<KeyNotFoundException>(() => { var foo = rd["test_invalid_key"]; });
-            Assert.That(ex.Message, Is.StringContaining("test_invalid_key"));
-        }
-    }
+		[Test]
+		public void ShowKeyInExceptionIfNotFound()
+		{
+			var rd = new ResourceDictionary();
+			rd.Add("foo", "bar");
+			var ex = Assert.Throws<KeyNotFoundException>(() => { var foo = rd ["test_invalid_key"]; });
+			Assert.That(ex.Message, Is.StringContaining("test_invalid_key"));
+		}
+
+		class MyRD : ResourceDictionary
+		{
+			public MyRD()
+			{
+				CreationCount = CreationCount + 1;
+				Add("foo", "Foo");
+				Add("bar", "Bar");
+			}
+
+			public static int CreationCount { get; set; }
+		}
+
+		[Test]
+		public void MergedWithFailsToMergeAnythingButRDs()
+		{
+			var rd = new ResourceDictionary();
+			Assert.DoesNotThrow(() => rd.MergedWith = typeof(MyRD));
+			Assert.Throws<ArgumentException>(() => rd.MergedWith = typeof(ContentPage));
+		}
+
+		[Test]
+		public void MergedResourcesAreFound()
+		{
+			var rd0 = new ResourceDictionary();
+			rd0.MergedWith = typeof(MyRD);
+
+			object _;
+			Assert.True(rd0.TryGetMergedValue("foo", out _));
+			Assert.AreEqual("Foo", _);
+		}
+	}
 }
\ No newline at end of file