From 6b796ebc40e4d1d769603753fdc9f94ca431b5d4 Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Thu, 1 Apr 2010 17:37:01 +0000 Subject: [PATCH] 2010-04-01 Rodrigo Kumpera * AssemblyTest.cs: Fix one more tests under v4. svn path=/trunk/mcs/; revision=154657 --- mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs | 9 +++++++-- mcs/class/corlib/Test/System.Reflection/ChangeLog | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs index d2647294ec9..4237469a18a 100644 --- 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 ce8c0f28850..3c4e56f119c 100644 --- 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 + + * AssemblyTest.cs: Fix one more tests under v4. + 2010-03-25 Rodrigo Kumpera *AssemblyTest.cs: Fix one more tests under v4. -- 2.11.4.GIT