[C] Lookup in RD also lookup in merged RDs (#861)

1 files changed, 52 insertions, 1 deletions

diff --git a/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs b/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs
index 3621d955..d1a43732 100644
--- a/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs
@@ -290,7 +290,7 @@ namespace Xamarin.Forms.Core.UnitTests
 			rd0.MergedWith = typeof(MyRD);
 
 			object _;
-			Assert.True(rd0.TryGetMergedValue("foo", out _));
+			Assert.True(rd0.TryGetValue("foo", out _));
 			Assert.AreEqual("Foo", _);
 		}
 
@@ -307,5 +307,56 @@ namespace Xamarin.Forms.Core.UnitTests
 			}
 			Assert.Fail();
 		}
+
+		[Test]
+		public void ContainsReturnsValuesForMergedRD()
+		{
+			var rd = new ResourceDictionary {
+				{"baz", "BAZ"},
+				{"qux", "QUX"},
+			};
+			rd.MergedWith = typeof(MyRD);
+
+			Assert.That(rd.Contains(new KeyValuePair<string, object>("foo", "Foo")), Is.True);
+		}
+
+		[Test]
+		public void CountDoesNotIncludeMerged()
+		{
+			var rd = new ResourceDictionary {
+				{"baz", "Baz"},
+				{"qux", "Qux"},
+			};
+			rd.MergedWith = typeof(MyRD);
+
+			Assert.That(rd.Count, Is.EqualTo(2));
+		}
+
+		[Test]
+		public void IndexerLookupInMerged()
+		{
+			var rd = new ResourceDictionary {
+				{"baz", "BAZ"},
+				{"qux", "QUX"},
+			};
+			rd.MergedWith = typeof(MyRD);
+
+			Assert.That(() => rd["foo"], Throws.Nothing);
+			Assert.That(rd["foo"], Is.EqualTo("Foo"));
+		}
+
+		[Test]
+		public void TryGetValueLookupInMerged()
+		{
+			var rd = new ResourceDictionary { 
+				{"baz", "BAZ"},
+				{"qux", "QUX"},
+			};
+			rd.MergedWith = typeof(MyRD);
+
+			object _;
+			Assert.That(rd.TryGetValue("foo", out _), Is.True);
+			Assert.That(rd.TryGetValue("baz", out _), Is.True);
+}
 	}
 }
\ No newline at end of file