Author: atsushi
Date: 2007-05-28 06:31:33 -0400 (Mon, 28 May 2007)
New Revision: 78043
Modified:
trunk/mcs/class/System/System.Configuration/ChangeLog
trunk/mcs/class/System/System.Configuration/ConfigXmlDocument.cs
trunk/mcs/class/System/System.Configuration/SettingsProviderAttribute.cs
trunk/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
trunk/mcs/class/System/Test/System.Configuration/ChangeLog
Log:
2007-05-28 Atsushi Enomoto <[EMAIL PROTECTED]>
* SettingsProviderAttribute.cs :
Return assembly qualified name. Check null args.
* ConfigXmlDocument.cs : it implements IConfigErrorInfo.
* ApplicationSettingsBaseTest.cs : enable working test.
Modified: trunk/mcs/class/System/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System/System.Configuration/ChangeLog 2007-05-28
10:20:23 UTC (rev 78042)
+++ trunk/mcs/class/System/System.Configuration/ChangeLog 2007-05-28
10:31:33 UTC (rev 78043)
@@ -1,3 +1,9 @@
+2007-05-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * SettingsProviderAttribute.cs :
+ Return assembly qualified name. Check null args.
+ * ConfigXmlDocument.cs : it implements IConfigErrorInfo.
+
2007-03-15 Vladimir Krasnov <[EMAIL PROTECTED]>
* SettingsPropertyValue.cs: fixed binary deserealization that may be
Modified: trunk/mcs/class/System/System.Configuration/ConfigXmlDocument.cs
===================================================================
--- trunk/mcs/class/System/System.Configuration/ConfigXmlDocument.cs
2007-05-28 10:20:23 UTC (rev 78042)
+++ trunk/mcs/class/System/System.Configuration/ConfigXmlDocument.cs
2007-05-28 10:31:33 UTC (rev 78043)
@@ -38,6 +38,9 @@
{
[PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)]
public sealed class ConfigXmlDocument : XmlDocument, IConfigXmlNode
+#if NET_2_0 && CONFIGURATION_DEP
+ , System.Configuration.Internal.IConfigErrorInfo
+#endif
{
XmlTextReader reader;
string fileName;
Modified:
trunk/mcs/class/System/System.Configuration/SettingsProviderAttribute.cs
===================================================================
--- trunk/mcs/class/System/System.Configuration/SettingsProviderAttribute.cs
2007-05-28 10:20:23 UTC (rev 78042)
+++ trunk/mcs/class/System/System.Configuration/SettingsProviderAttribute.cs
2007-05-28 10:31:33 UTC (rev 78043)
@@ -38,12 +38,16 @@
public SettingsProviderAttribute (string providerTypeName)
{
+ if (providerTypeName == null)
+ throw new ArgumentNullException
("providerTypeName");
this.providerTypeName = providerTypeName;
}
public SettingsProviderAttribute (Type providerType)
{
- this.providerTypeName = providerType.Name;
+ if (providerType == null)
+ throw new ArgumentNullException
("providerType");
+ this.providerTypeName =
providerType.AssemblyQualifiedName;
}
Modified:
trunk/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
===================================================================
---
trunk/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
2007-05-28 10:20:23 UTC (rev 78042)
+++
trunk/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs
2007-05-28 10:31:33 UTC (rev 78043)
@@ -283,9 +283,13 @@
}
[Test]
- [Category ("NotWorking")]
public void TestSettings2_Properties ()
{
+ // This test will fail when there are newer versions
+ // of the test assemblies - so conditionalize it in
+ // such cases.
+ string expected =
"MonoTests.System.Configuration.ProviderPoker, System_test_net_2_0,
Version=0.0.0.0";
+ Assert.AreEqual (expected, new
SettingsProviderAttribute (typeof (ProviderPoker)).ProviderTypeName.Substring
(0, expected.Length), "#1");
TestSettings2 settings = new TestSettings2 ();
/* should throw ConfigurationException */
Modified: trunk/mcs/class/System/Test/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System/Test/System.Configuration/ChangeLog 2007-05-28
10:20:23 UTC (rev 78042)
+++ trunk/mcs/class/System/Test/System.Configuration/ChangeLog 2007-05-28
10:31:33 UTC (rev 78043)
@@ -1,3 +1,7 @@
+2007-05-28 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * ApplicationSettingsBaseTest.cs : enable working test.
+
2007-01-14 Vladimir Krasnov <[EMAIL PROTECTED]>
* SettingsPropertyValueTest.cs: added tests for IsDirty proprty
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches