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

@ -429,11 +429,9 @@ namespace MonoTests.System.Configuration {
{
SysConfig cfg = ConfigurationManager.OpenMachineConfiguration ();
Assert.IsTrue (cfg.Sections.Count > 0, "#1");
#if !TARGET_JVM
ConfigurationSection s = cfg.SectionGroups ["system.net"].Sections ["connectionManagement"];
Assert.IsNotNull (s, "#2");
Assert.IsTrue (s is ConnectionManagementSection, "#3");
#endif
}
[Test]

View File

@ -71,7 +71,6 @@ namespace MonoTests.System.Configuration {
Assert.IsNull (p3, "A1");
}
#if !TARGET_JVM
[Test]
[ExpectedException (typeof (ArgumentException))]
public void Intersect_wrongtype ()
@ -80,7 +79,6 @@ namespace MonoTests.System.Configuration {
IPermission p3 = p1.Intersect (new StrongNameIdentityPermission (PermissionState.Unrestricted));
}
#endif
[Test]
public void Union ()
@ -107,7 +105,6 @@ namespace MonoTests.System.Configuration {
Assert.IsTrue (((ConfigurationPermission)p3).IsUnrestricted(), "A2");
}
#if !TARGET_JVM
[Test]
[ExpectedException (typeof (ArgumentException))]
public void Union_wrongtypee ()
@ -116,7 +113,6 @@ namespace MonoTests.System.Configuration {
IPermission p3 = p1.Union (new StrongNameIdentityPermission (PermissionState.Unrestricted));
}
#endif
[Test]
public void Subset ()
@ -133,7 +129,6 @@ namespace MonoTests.System.Configuration {
Assert.IsTrue (p2.IsSubsetOf (null), "A6");
}
#if !TARGET_JVM
[Test]
[ExpectedException (typeof (ArgumentException))]
public void Subset_wrongtype ()
@ -142,12 +137,8 @@ namespace MonoTests.System.Configuration {
Assert.IsFalse (p1.IsSubsetOf (new StrongNameIdentityPermission (PermissionState.Unrestricted)));
}
#endif
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void ToXml ()
{
ConfigurationPermission p = new ConfigurationPermission (PermissionState.Unrestricted);

View File

@ -85,13 +85,9 @@ namespace MonoTests.System.Configuration.Util {
public static string ThisConfigFileName {
get {
#if TARGET_JVM
return "System.Configuration.Test20.jar.config";
#else
var asm = Assembly.GetCallingAssembly ();
var exe = Path.GetFileName (asm.Location);
return exe + ".config";
#endif
}
}
}