mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
View File

@ -783,19 +783,8 @@ public class AssemblyBuilderTest
try {
ab.Save ("lib.dll");
Assert.Fail ("#A1");
#if NET_4_0
} catch (CultureNotFoundException ex) {
}
#else
} catch (ArgumentException ex) {
// Culture name doesnotexist is not supported
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
Assert.IsNull (ex.InnerException, "#A3");
Assert.IsNotNull (ex.Message, "#A4");
Assert.IsTrue (ex.Message.IndexOf ("doesnotexist") != -1, "#A5");
Assert.AreEqual ("name", ex.ParamName, "#A6");
}
#endif
ab = AppDomain.CurrentDomain.DefineDynamicAssembly (aname,
AssemblyBuilderAccess.RunAndSave, tempDir);
@ -811,19 +800,8 @@ public class AssemblyBuilderTest
try {
ab.Save ("lib.dll");
Assert.Fail ("#B1");
#if NET_4_0
} catch (CultureNotFoundException ex) {
}
#else
} catch (ArgumentException ex) {
// Culture name neutral is not supported
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
Assert.IsNull (ex.InnerException, "#B3");
Assert.IsNotNull (ex.Message, "#B4");
Assert.IsTrue (ex.Message.IndexOf ("neutral") != -1, "#B5");
Assert.AreEqual ("name", ex.ParamName, "#B6");
}
#endif
}
[Test] // DefineVersionInfoResource ()
@ -905,19 +883,8 @@ public class AssemblyBuilderTest
try {
ab.Save ("lib.dll");
Assert.Fail ("#A1");
#if NET_4_0
} catch (CultureNotFoundException ex) {
}
#else
} catch (ArgumentException ex) {
// Culture name doesnotexist is not supported
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
Assert.IsNull (ex.InnerException, "#A3");
Assert.IsNotNull (ex.Message, "#A4");
Assert.IsTrue (ex.Message.IndexOf ("doesnotexist") != -1, "#A5");
Assert.AreEqual ("name", ex.ParamName, "#A6");
}
#endif
ab = AppDomain.CurrentDomain.DefineDynamicAssembly (aname,
AssemblyBuilderAccess.RunAndSave, tempDir);
@ -933,19 +900,8 @@ public class AssemblyBuilderTest
try {
ab.Save ("lib.dll");
Assert.Fail ("#B1");
#if NET_4_0
} catch (CultureNotFoundException ex) {
}
#else
} catch (ArgumentException ex) {
// Culture name neutral is not supported
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
Assert.IsNull (ex.InnerException, "#B3");
Assert.IsNotNull (ex.Message, "#B4");
Assert.IsTrue (ex.Message.IndexOf ("neutral") != -1, "#B5");
Assert.AreEqual ("name", ex.ParamName, "#B6");
}
#endif
}
[Test] // DefineVersionInfoResource (String, String, String, String, String)
@ -1429,10 +1385,8 @@ public class AssemblyBuilderTest
string FxVersion;
#if MOBILE
FxVersion = "2.0.5.0;";
#elif NET_4_0
FxVersion = "4.0.0.0;";
#else
FxVersion = "2.0.0.0;";
FxVersion = "4.0.0.0;";
#endif
Assert.AreEqual (new Version (FxVersion), refs [0].Version, "#D2:Version");
Assert.AreEqual (AssemblyVersionCompatibility.SameMachine,