2010-02-26 Rodrigo Kumpera <[email protected]>

	* AssemblyTest.cs: Fix test under v4.

	* MonoGenericClassTest.cs: Ditto.

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

mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs

@@ -216,14 +216,15 @@ namespace MonoTests.System.Reflection
 			Assert.IsFalse (corlib_test.GlobalAssemblyCache, "GlobalAssemblyCache");
 
 			Assert.IsTrue (corlib_test.GetReferencedAssemblies ().Length > 0, "GetReferencedAssemblies");
-#if NET_2_0
 			Assert.AreEqual (0, corlib_test.HostContext, "HostContext");
+#if NET_4_0
+			Assert.AreEqual ("v4.0.21006", corlib_test.ImageRuntimeVersion, "ImageRuntimeVersion");
+#else
 			Assert.AreEqual ("v2.0.50727", corlib_test.ImageRuntimeVersion, "ImageRuntimeVersion");
+#endif
+
 			Assert.IsNotNull (corlib_test.ManifestModule, "ManifestModule");
 			Assert.IsFalse (corlib_test.ReflectionOnly, "ReflectionOnly");
-#elif NET_1_1
-			Assert.AreEqual ("v1.1.4322", corlib_test.ImageRuntimeVersion, "ImageRuntimeVersion");
-#endif
 		}
 #endif
 

mcs/class/corlib/Test/System.Reflection/ChangeLog

@@ -1,3 +1,9 @@
+2010-02-26 Rodrigo Kumpera  <[email protected]>
+
+	* AssemblyTest.cs: Fix test under v4.
+
+	* MonoGenericClassTest.cs: Ditto.
+
 2010-02-10 Rodrigo Kumpera  <[email protected]>
 
 	* PropertyInfoTest.cs: Tests for default value.

mcs/class/corlib/Test/System.Reflection/MonoGenericClassTest.cs

@@ -70,8 +70,16 @@ namespace MonoTests.System.Reflection.Emit
 
 			Assert.AreEqual ("type", inst.Name, "#1");
 			Assert.AreEqual ("foo", inst.Namespace, "#2");
+#if NET_4_0
+			Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]", inst.FullName, "#3");
+			Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], MonoTests.System.Reflection.Emit.MonoGenericClassTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", inst.AssemblyQualifiedName, "#4");
+
+#else
+
 			Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]", inst.FullName, "#3");
 			Assert.AreEqual ("foo.type[[System.Double, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], MonoTests.System.Reflection.Emit.MonoGenericClassTest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", inst.AssemblyQualifiedName, "#4");
+
+#endif
 			Assert.AreEqual ("foo.type[System.Double,System.String]", inst.ToString (), "#5");
 		}