2010-04-22 Atsushi Enomoto <atsushi@ximian.com>

	* XamlMemberInvokerTest.cs : make sure that the invoker returns Type
	  for Type member here. (XamlObjectReader returns string for some
	  cases, so I wanted to make sure it is *not* here.)

svn path=/trunk/mcs/; revision=155941

diff --git a/mcs/class/System.Xaml/Test/System.Xaml.Schema/ChangeLog b/mcs/class/System.Xaml/Test/System.Xaml.Schema/ChangeLog
index 6330dafbafc731491d0482c4534150737dd05a42..7be9ecd5cd112afda07b3e3f10c5beaf1a001f11 100755 (executable)
--- a/mcs/class/System.Xaml/Test/System.Xaml.Schema/ChangeLog
+++ b/mcs/class/System.Xaml/Test/System.Xaml.Schema/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-22  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XamlMemberInvokerTest.cs : make sure that the invoker returns Type
+         for Type member here. (XamlObjectReader returns string for some
+         cases, so I wanted to make sure it is *not* here.)
+
 2010-04-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XamlTypeTypeConverterTest.cs : more conversion tests.

diff --git a/mcs/class/System.Xaml/Test/System.Xaml.Schema/XamlMemberInvokerTest.cs b/mcs/class/System.Xaml/Test/System.Xaml.Schema/XamlMemberInvokerTest.cs
index 6c1b914e67f7c128e05f0c8965316e4c1d3234a2..d37de1506cdc84282cde43d9dabd4ed99b0f083b 100644 (file)
--- a/mcs/class/System.Xaml/Test/System.Xaml.Schema/XamlMemberInvokerTest.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml.Schema/XamlMemberInvokerTest.cs
@@ -25,6 +25,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
+using System.Windows.Markup;
 using System.Xaml;
 using System.Xaml.Schema;
 using System.Xml;
@@ -115,6 +116,15 @@ namespace MonoTests.System.Xaml.Schema
                        i.GetValue (new StringBuilder ());
                }
 
+               [Test]
+               public void GetValueOnTypeValue ()
+               {
+                       var xm = XamlLanguage.Type.GetMember ("Type");
+                       var i = new XamlMemberInvoker (xm);
+                       var o = i.GetValue (new TypeExtension (typeof (int)));
+                       Assert.AreEqual (typeof (int), o, "#1");
+               }
+
                [Test]
                [ExpectedException (typeof (TargetException))]
                public void SetValueOnIrrelevantObject ()