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