Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -35,7 +35,7 @@ using System.Configuration.Assemblies;
using System.Globalization;
using System.IO;
using System.Reflection;
#if !TARGET_JVM && !MONOTOUCH
#if !MONOTOUCH
using System.Reflection.Emit;
#endif
using System.Threading;
@ -141,18 +141,18 @@ namespace MonoTests.System.Reflection
string fname = AppDomain.CurrentDomain.FriendlyName;
if (fname.EndsWith (".dll")) { // nunit-console
Assert.IsNull (Assembly.GetEntryAssembly (), "GetEntryAssembly");
#if NET_2_0 && !TARGET_JVM // IsDefaultAppDomain not supported for TARGET_JVM
#if NET_2_0
Assert.IsFalse (AppDomain.CurrentDomain.IsDefaultAppDomain (), "!default appdomain");
#endif
} else { // gnunit
Assert.IsNotNull (Assembly.GetEntryAssembly (), "GetEntryAssembly");
#if NET_2_0 && !TARGET_JVM // IsDefaultAppDomain not supported for TARGET_JVM
#if NET_2_0
Assert.IsTrue (AppDomain.CurrentDomain.IsDefaultAppDomain (), "!default appdomain");
#endif
}
}
#if !TARGET_JVM && !MONOTOUCH // Reflection.Emit is not supported.
#if !MONOTOUCH // Reflection.Emit is not supported.
[Test]
public void GetModules_MissingFile ()
{
@ -177,7 +177,6 @@ namespace MonoTests.System.Reflection
}
#endif
#if !TARGET_JVM // ManifestModule not supported under TARGET_JVM.
[Category ("NotWorking")]
[Test]
public void Corlib ()
@ -224,7 +223,6 @@ namespace MonoTests.System.Reflection
Assert.IsNotNull (corlib_test.ManifestModule, "ManifestModule");
Assert.IsFalse (corlib_test.ReflectionOnly, "ReflectionOnly");
}
#endif
[Test]
public void GetAssembly ()
@ -234,7 +232,6 @@ namespace MonoTests.System.Reflection
}
[Test]
[Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM
public void GetFile_Null ()
{
try {
@ -249,7 +246,6 @@ namespace MonoTests.System.Reflection
}
[Test]
[Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM
public void GetFile_Empty ()
{
try {
@ -265,7 +261,6 @@ namespace MonoTests.System.Reflection
}
[Test]
[Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM
public void GetFiles_False ()
{
Assembly corlib = typeof (int).Assembly;
@ -278,7 +273,6 @@ namespace MonoTests.System.Reflection
}
[Test]
[Category("TargetJvmNotWorking")] // Not yet supported for TARGET_JVM
public void GetFiles_True ()
{
Assembly corlib = typeof (int).Assembly;
@ -427,7 +421,6 @@ namespace MonoTests.System.Reflection
Assert.Fail ("Was not able to load any corlib test");
}
#if !TARGET_JVM // GetObjectData currently not implemented for Assembly.
[Test]
public void GetObjectData_Info_Null ()
{
@ -444,7 +437,6 @@ namespace MonoTests.System.Reflection
Assert.AreEqual ("info", ex.ParamName, "#6");
}
}
#endif // TARGET_JVM
[Test]
public void GetReferencedAssemblies ()
@ -466,7 +458,7 @@ namespace MonoTests.System.Reflection
}
}
#if !TARGET_JVM && !MONOTOUCH // Reflection.Emit is not supported.
#if !MONOTOUCH // Reflection.Emit is not supported.
[Test]
public void Location_Empty() {
string assemblyFileName = Path.Combine (
@ -1085,7 +1077,7 @@ namespace MonoTests.System.Reflection
Directory.Delete (outdir, true);
}
#endif // TARGET_JVM
#endif
[Test]
public void ManifestModule ()