Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -29,7 +29,6 @@
//#define SPEW
#if NET_2_0
using System;
using System.Text;
@@ -171,10 +170,10 @@ namespace MonoTests.System.Configuration {
Assert.IsNotNull (props, "A1");
Assert.IsTrue (props.MoveNext(), "A2");
Assert.AreEqual ("Address", ((SettingsProperty)props.Current).Name, "A3");
Assert.AreEqual ("Username", ((SettingsProperty)props.Current).Name, "A3");
Assert.IsTrue (props.MoveNext(), "A4");
Assert.AreEqual ("Username", ((SettingsProperty)props.Current).Name, "A5");
Assert.AreEqual ("Address", ((SettingsProperty)props.Current).Name, "A5");
Assert.AreEqual ("root", settings.Username, "A6");
Assert.AreEqual ("8 Cambridge Center", settings.Address, "A7");
@@ -401,19 +400,19 @@ namespace MonoTests.System.Configuration {
var holder = new Bug8592ConfHolder ();
holder.Reset ();
holder.Save ();
Assert.AreEqual ("", holder.TestKey1OnHolder);
Assert.AreEqual ("", holder.TestKey1OnHolder, "#1");
holder.TestKey1OnHolder = "candy";
Assert.AreEqual ("candy", holder.TestKey1OnHolder);
Assert.AreEqual ("candy", holder.TestKey1OnHolder, "#2");
holder.Reload ();
Assert.AreEqual ("", holder.TestKey1OnHolder);
Assert.AreEqual ("", holder.TestKey1OnHolder, "#3");
holder.TestKey1OnHolder = "candy";
Assert.AreEqual ("candy", holder.TestKey1OnHolder);
Assert.AreEqual ("candy", holder.TestKey1OnHolder, "#4");
holder.Save ();
Assert.AreEqual ("candy", holder.TestKey1OnHolder);
Assert.AreEqual ("candy", holder.TestKey1OnHolder, "#5");
holder.Reload ();
Assert.AreEqual ("candy", holder.TestKey1OnHolder);
Assert.AreEqual ("candy", holder.TestKey1OnHolder, "#6");
holder.Reset ();
Assert.AreEqual ("", holder.TestKey1OnHolder);
Assert.AreEqual ("", holder.TestKey1OnHolder, "#7");
}
class Bug8533ConfHolder1 : ApplicationSettingsBase {
@@ -454,21 +453,23 @@ namespace MonoTests.System.Configuration {
public void TestBug8533ConfHandlerWronglyMixedUp ()
{
var holder1 = new Bug8533ConfHolder1 ();
var holder2 = new Bug8533ConfHolder2 ();
holder1.TestKey1OnHolder1 = "candy";
holder2.TestKey1OnHolder2 = "donut";
holder1.TestKey = "eclair";
Assert.AreEqual ("", holder1.TestKey1OnHolder2, "#-1");
holder1.Save ();
holder2.Save ();
Assert.AreEqual ("", holder1.TestKey1OnHolder2, "#0");
holder1.Reload ();
var holder2 = new Bug8533ConfHolder2 ();
holder2.TestKey1OnHolder2 = "donut";
Assert.AreEqual ("", holder1.TestKey1OnHolder2, "#1");
holder2.Save ();
holder2.Reload();
Assert.AreEqual ("", holder1.TestKey1OnHolder2);
Assert.AreEqual ("candy", holder1.TestKey1OnHolder1);
Assert.AreEqual ("donut", holder2.TestKey1OnHolder2);
Assert.AreEqual ("eclair", holder1.TestKey);
Assert.AreEqual ("", holder2.TestKey);
Assert.AreEqual ("candy", holder1.TestKey1OnHolder1, "#2");
Assert.AreEqual ("donut", holder2.TestKey1OnHolder2, "#3");
Assert.AreEqual ("eclair", holder1.TestKey, "#4");
Assert.AreEqual ("", holder2.TestKey, "#5");
}
}
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.IO;
@@ -78,4 +77,3 @@ namespace MonoTests.System.Configuration {
}
}
#endif

View File

@@ -61,11 +61,9 @@ namespace MonoTests.System.Configuration
{
ConfigurationException ce = new ConfigurationException ();
Assert.IsNotNull (ce.BareMessage, "#1");
#if NET_2_0
Assert.IsTrue (ce.BareMessage.IndexOf ("'" + typeof (ConfigurationException).FullName + "'") != -1, "#2:" + ce.BareMessage);
Assert.IsNotNull (ce.Data, "#3");
Assert.AreEqual (0, ce.Data.Count, "#4");
#endif
Assert.IsNull (ce.Filename, "#5");
Assert.IsNull (ce.InnerException, "#6");
Assert.AreEqual (0, ce.Line, "#7");
@@ -81,10 +79,8 @@ namespace MonoTests.System.Configuration
msg = "MSG";
ce = new ConfigurationException (msg);
Assert.AreSame (msg, ce.BareMessage, "#A1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#A2");
Assert.AreEqual (0, ce.Data.Count, "#A3");
#endif
Assert.IsNull (ce.Filename, "#A4");
Assert.IsNull (ce.InnerException, "#A5");
Assert.AreEqual (0, ce.Line, "#A6");
@@ -93,14 +89,9 @@ namespace MonoTests.System.Configuration
msg = null;
ce = new ConfigurationException (msg);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#B1");
Assert.IsNotNull (ce.Data, "#B2");
Assert.AreEqual (0, ce.Data.Count, "#B3");
#else
Assert.IsNotNull (ce.BareMessage, "#B1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#B2");
#endif
Assert.IsNull (ce.Filename, "#B4");
Assert.IsNull (ce.InnerException, "#B5");
Assert.AreEqual (0, ce.Line, "#B6");
@@ -118,10 +109,8 @@ namespace MonoTests.System.Configuration
inner = new Exception ();
ce = new ConfigurationException (msg, inner);
Assert.AreSame (msg, ce.BareMessage, "#A1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#A2");
Assert.AreEqual (0, ce.Data.Count, "#A3");
#endif
Assert.IsNull (ce.Filename, "#A4");
Assert.AreSame (inner, ce.InnerException, "#A5");
Assert.AreEqual (0, ce.Line, "#A6");
@@ -130,14 +119,9 @@ namespace MonoTests.System.Configuration
msg = null;
inner = null;
ce = new ConfigurationException (msg, inner);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#B1");
Assert.IsNotNull (ce.Data, "#B2");
Assert.AreEqual (0, ce.Data.Count, "#B3");
#else
Assert.IsNotNull (ce.BareMessage, "#B1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#B2");
#endif
Assert.IsNull (ce.Filename, "#B4");
Assert.AreSame (inner, ce.InnerException, "#B5");
Assert.AreEqual (0, ce.Line, "#B6");
@@ -155,10 +139,8 @@ namespace MonoTests.System.Configuration
node = new XmlDocument ();
ce = new ConfigurationException (msg, node);
Assert.AreSame (msg, ce.BareMessage, "#A1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#A2");
Assert.AreEqual (0, ce.Data.Count, "#A3");
#endif
Assert.AreEqual (string.Empty, ce.Filename, "#A4");
Assert.IsNull (ce.InnerException, "#A5");
Assert.AreEqual (0, ce.Line, "#A6");
@@ -167,14 +149,9 @@ namespace MonoTests.System.Configuration
msg = null;
node = null;
ce = new ConfigurationException (msg, node);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#B1");
Assert.IsNotNull (ce.Data, "#B2");
Assert.AreEqual (0, ce.Data.Count, "#B3");
#else
Assert.IsNotNull (ce.BareMessage, "#B1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#B2");
#endif
Assert.AreEqual (string.Empty, ce.Filename, "#B4");
Assert.IsNull (ce.InnerException, "#B5");
Assert.AreEqual (0, ce.Line, "#B6");
@@ -194,10 +171,8 @@ namespace MonoTests.System.Configuration
node = new XmlDocument ();
ce = new ConfigurationException (msg, inner, node);
Assert.AreSame (msg, ce.BareMessage, "#A1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#A2");
Assert.AreEqual (0, ce.Data.Count, "#A3");
#endif
Assert.AreEqual (string.Empty, ce.Filename, "#A4");
Assert.AreSame (inner, ce.InnerException, "#A5");
Assert.AreEqual (0, ce.Line, "#A6");
@@ -207,14 +182,9 @@ namespace MonoTests.System.Configuration
inner = null;
node = null;
ce = new ConfigurationException (msg, inner, node);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#B1");
Assert.IsNotNull (ce.Data, "#B2");
Assert.AreEqual (0, ce.Data.Count, "#B3");
#else
Assert.IsNotNull (ce.BareMessage, "#B1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#B2");
#endif
Assert.AreEqual (string.Empty, ce.Filename, "#B4");
Assert.AreSame (inner, ce.InnerException, "#B5");
Assert.AreEqual (0, ce.Line, "#B6");
@@ -234,10 +204,8 @@ namespace MonoTests.System.Configuration
line = 7;
ce = new ConfigurationException (msg, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#A1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#A2");
Assert.AreEqual (0, ce.Data.Count, "#A3");
#endif
Assert.AreSame (filename, ce.Filename, "#A4");
Assert.IsNull (ce.InnerException, "#A5");
Assert.AreEqual (line, ce.Line, "#A6");
@@ -247,14 +215,9 @@ namespace MonoTests.System.Configuration
filename = null;
line = 0;
ce = new ConfigurationException (msg, filename, line);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#B1");
Assert.IsNotNull (ce.Data, "#B3");
Assert.AreEqual (0, ce.Data.Count, "#B4");
#else
Assert.IsNotNull (ce.BareMessage, "#B1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#B2");
#endif
Assert.AreSame (filename, ce.Filename, "#B5");
Assert.IsNull (ce.InnerException, "#B6");
Assert.AreEqual (0, ce.Line, "#B7");
@@ -264,14 +227,9 @@ namespace MonoTests.System.Configuration
filename = "abc.txt";
line = 5;
ce = new ConfigurationException (msg, filename, line);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#C1");
Assert.IsNotNull (ce.Data, "#C2");
Assert.AreEqual (0, ce.Data.Count, "#C3");
#else
Assert.IsNotNull (ce.BareMessage, "#C1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#C2");
#endif
Assert.AreSame (filename, ce.Filename, "#C4");
Assert.IsNull (ce.InnerException, "#C5");
Assert.AreEqual (5, ce.Line, "#C6");
@@ -282,10 +240,8 @@ namespace MonoTests.System.Configuration
line = 5;
ce = new ConfigurationException (msg, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#D1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#D2");
Assert.AreEqual (0, ce.Data.Count, "#D3");
#endif
Assert.AreSame (filename, ce.Filename, "#D4");
Assert.IsNull (ce.InnerException, "#D5");
Assert.AreEqual (5, ce.Line, "#D6");
@@ -296,10 +252,8 @@ namespace MonoTests.System.Configuration
line = 0;
ce = new ConfigurationException (msg, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#E1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#E2");
Assert.AreEqual (0, ce.Data.Count, "#E3");
#endif
Assert.AreSame (filename, ce.Filename, "#E4");
Assert.IsNull (ce.InnerException, "#E5");
Assert.AreEqual (0, ce.Line, "#E6");
@@ -309,14 +263,9 @@ namespace MonoTests.System.Configuration
filename = null;
line = 4;
ce = new ConfigurationException (msg, filename, line);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#F1");
Assert.IsNotNull (ce.Data, "#F2");
Assert.AreEqual (0, ce.Data.Count, "#F3");
#else
Assert.IsNotNull (ce.BareMessage, "#F1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#F2");
#endif
Assert.AreSame (filename, ce.Filename, "#F4");
Assert.IsNull (ce.InnerException, "#F5");
Assert.AreEqual (4, ce.Line, "#F6");
@@ -327,10 +276,8 @@ namespace MonoTests.System.Configuration
line = 0;
ce = new ConfigurationException (msg, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#G1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#G2");
Assert.AreEqual (0, ce.Data.Count, "#G3");
#endif
Assert.AreSame (filename, ce.Filename, "#G4");
Assert.IsNull (ce.InnerException, "#G5");
Assert.AreEqual (0, ce.Line, "#G6");
@@ -341,10 +288,8 @@ namespace MonoTests.System.Configuration
line = 6;
ce = new ConfigurationException (msg, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#H1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#H2");
Assert.AreEqual (0, ce.Data.Count, "#H3");
#endif
Assert.AreSame (filename, ce.Filename, "#H4");
Assert.IsNull (ce.InnerException, "#H5");
Assert.AreEqual (6, ce.Line, "#H6");
@@ -355,10 +300,8 @@ namespace MonoTests.System.Configuration
line = 6;
ce = new ConfigurationException (msg, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#I1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#I2");
Assert.AreEqual (0, ce.Data.Count, "#I3");
#endif
Assert.AreSame (filename, ce.Filename, "#I4");
Assert.IsNull (ce.InnerException, "#I5");
Assert.AreEqual (6, ce.Line, "#I6");
@@ -369,10 +312,8 @@ namespace MonoTests.System.Configuration
line = 4;
ce = new ConfigurationException (msg, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#J1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#J2");
Assert.AreEqual (0, ce.Data.Count, "#J3");
#endif
Assert.AreSame (filename, ce.Filename, "#J4");
Assert.IsNull (ce.InnerException, "#J5");
Assert.AreEqual (4, ce.Line, "#J6");
@@ -383,10 +324,8 @@ namespace MonoTests.System.Configuration
line = 0;
ce = new ConfigurationException (msg, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#K1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#K2");
Assert.AreEqual (0, ce.Data.Count, "#K3");
#endif
Assert.AreSame (filename, ce.Filename, "#K4");
Assert.IsNull (ce.InnerException, "#K5");
Assert.AreEqual (0, ce.Line, "#K6");
@@ -408,10 +347,8 @@ namespace MonoTests.System.Configuration
line = 7;
ce = new ConfigurationException (msg, inner, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#A1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#A2");
Assert.AreEqual (0, ce.Data.Count, "#A3");
#endif
Assert.AreSame (filename, ce.Filename, "#A4");
Assert.AreSame (inner, ce.InnerException, "#A5");
Assert.AreEqual (line, ce.Line, "#A6");
@@ -422,14 +359,9 @@ namespace MonoTests.System.Configuration
filename = null;
line = 0;
ce = new ConfigurationException (msg, inner, filename, line);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#B1");
Assert.IsNotNull (ce.Data, "#B2");
Assert.AreEqual (0, ce.Data.Count, "#B3");
#else
Assert.IsNotNull (ce.BareMessage, "#B1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#B2");
#endif
Assert.AreSame (filename, ce.Filename, "#B4");
Assert.AreSame (inner, ce.InnerException, "#B5");
Assert.AreEqual (0, ce.Line, "#B6");
@@ -440,14 +372,9 @@ namespace MonoTests.System.Configuration
filename = null;
line = 7;
ce = new ConfigurationException (msg, inner, filename, line);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#C1");
Assert.IsNotNull (ce.Data, "#C2");
Assert.AreEqual (0, ce.Data.Count, "#C3");
#else
Assert.IsNotNull (ce.BareMessage, "#C1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#C2");
#endif
Assert.AreSame (filename, ce.Filename, "#C4");
Assert.AreSame (inner, ce.InnerException, "#C5");
Assert.AreEqual (line, ce.Line, "#C6");
@@ -459,10 +386,8 @@ namespace MonoTests.System.Configuration
line = 7;
ce = new ConfigurationException (msg, inner, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#D1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#D2");
Assert.AreEqual (0, ce.Data.Count, "#D3");
#endif
Assert.AreSame (filename, ce.Filename, "#D4");
Assert.AreSame (inner, ce.InnerException, "#D5");
Assert.AreEqual (line, ce.Line, "#D6");
@@ -474,10 +399,8 @@ namespace MonoTests.System.Configuration
line = 7;
ce = new ConfigurationException (msg, inner, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#E1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#E2");
Assert.AreEqual (0, ce.Data.Count, "#E3");
#endif
Assert.AreSame (filename, ce.Filename, "#E4");
Assert.AreSame (inner, ce.InnerException, "#E5");
Assert.AreEqual (line, ce.Line, "#E6");
@@ -489,10 +412,8 @@ namespace MonoTests.System.Configuration
line = 7;
ce = new ConfigurationException (msg, inner, filename, line);
Assert.AreSame (msg, ce.BareMessage, "#F1");
#if NET_2_0
Assert.IsNotNull (ce.Data, "#F2");
Assert.AreEqual (0, ce.Data.Count, "#F3");
#endif
Assert.AreSame (filename, ce.Filename, "#F4");
Assert.AreSame (inner, ce.InnerException, "#F5");
Assert.AreEqual (line, ce.Line, "#F6");
@@ -503,14 +424,9 @@ namespace MonoTests.System.Configuration
filename = "abc.txt";
line = 7;
ce = new ConfigurationException (msg, inner, filename, line);
#if NET_2_0
Assert.AreEqual (new ConfigurationException ().Message, ce.BareMessage, "#G1");
Assert.IsNotNull (ce.Data, "#G2");
Assert.AreEqual (0, ce.Data.Count, "#G3");
#else
Assert.IsNotNull (ce.BareMessage, "#G1");
Assert.IsTrue (ce.BareMessage.IndexOf (typeof (ConfigurationException).FullName) != -1, "#G2");
#endif
Assert.AreSame (filename, ce.Filename, "#G4");
Assert.AreSame (inner, ce.InnerException, "#G5");
Assert.AreEqual (line, ce.Line, "#G6");

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Text;
@@ -145,4 +144,3 @@ namespace MonoTests.System.Configuration {
}
#endif

View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Text;
@@ -80,4 +79,3 @@ namespace MonoTests.System.Configuration
}
}
#endif

View File

@@ -28,7 +28,6 @@
//#define SPEW
#if NET_2_0
using System;
using System.Text;
@@ -329,4 +328,3 @@ namespace MonoTests.System.Configuration
}
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Text;
@@ -159,4 +158,3 @@ namespace MonoTests.System.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Text;
@@ -143,4 +142,3 @@ namespace MonoTests.System.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Text;
@@ -165,4 +164,3 @@ namespace MonoTests.System.Configuration {
}
#endif

View File

@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.IO;
@@ -438,4 +437,3 @@ namespace MonoTests.System.Configuration {
}
}
#endif