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

@ -108,11 +108,7 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (true, copy.Font.Italic, "CopyFrom#1");
Assert.AreEqual (true, copy.Font.Bold, "CopyFrom#2");
#if NET_2_0
Assert.AreEqual (false, copy.Font.Underline, "CopyFrom#3");
#else
Assert.AreEqual (true, copy.Font.Underline, "CopyFrom#3");
#endif
}
[Test]
@ -140,11 +136,7 @@ namespace MonoTests.System.Web.UI.WebControls
copy2.Font.Overline = true;
copy2.Font.CopyFrom (copy.Font);
#if NET_2_0
Assert.AreEqual (false, copy2.Font.Overline, "MergeWith#5");
#else
Assert.AreEqual (true, copy2.Font.Overline, "MergeWith#5");
#endif
}
[Test]