2010-04-01 Rodrigo Kumpera <rkumpera@novell.com>

	* AssemblyTest.cs: Fix one more tests under v4.

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

diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
index d2647294ec949edebaed7fe418b022eb4ee1f6a2..4237469a18a082fa9229f7cc401194c7800474e5 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
@@ -1089,21 +1089,26 @@ namespace MonoTests.System.Reflection
                }
 #endif // TARGET_JVM
 
-#if NET_2_0
                [Test]
                public void ManifestModule ()
                {
                        Assembly assembly = typeof (int).Assembly;
                        Module module = assembly.ManifestModule;
                        Assert.IsNotNull (module, "#1");
+
+#if NET_4_0
+                       Assert.AreEqual ("MonoModule", module.GetType ().Name, "#2");
+#else
                        Assert.AreEqual (typeof (Module), module.GetType (), "#2");
+#endif
+
                        Assert.AreEqual ("mscorlib.dll", module.Name, "#3");
                        Assert.IsFalse (module.IsResource (), "#4");
                        Assert.IsTrue (assembly.GetModules ().Length > 0, "#5");
                        Assert.AreSame (module, assembly.GetModules () [0], "#6");
                        Assert.AreSame (module, assembly.ManifestModule, "#7");
                }
-#endif
+
 
                [Serializable ()]
                private class AssemblyResolveHandler

diff --git a/mcs/class/corlib/Test/System.Reflection/ChangeLog b/mcs/class/corlib/Test/System.Reflection/ChangeLog
index ce8c0f28850b6d61bec3f82b85864c2b7f808fe8..3c4e56f119c2c03629c0b102c2d1145440d79fbd 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/ChangeLog
+++ b/mcs/class/corlib/Test/System.Reflection/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-01 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * AssemblyTest.cs: Fix one more tests under v4.
+
 2010-03-25 Rodrigo Kumpera  <rkumpera@novell.com>
 
        *AssemblyTest.cs: Fix one more tests under v4.