From bd86f2a37919365d8f835fe03ed72ddf6f6955dd Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Mon, 28 May 2007 12:55:15 +0000 Subject: [PATCH] 2007-05-28 Atsushi Enomoto * SettingElement.cs : fix default value (null->""). * SettingElementCollection.cs : implemented all. * SettingElementTest.cs : new test. * System_test.dll.sources : added SettingElementTest.cs. svn path=/trunk/mcs/; revision=78053 --- mcs/class/System/ChangeLog | 4 + .../System/System.Configuration/ChangeLog | 5 ++ .../System.Configuration/SettingElement.cs | 2 +- .../SettingElementCollection.cs | 17 +++-- mcs/class/System/System_test.dll.sources | 1 + .../Test/System.Configuration/ChangeLog | 4 + .../SettingElementTest.cs | 73 +++++++++++++++++++ 7 files changed, 97 insertions(+), 9 deletions(-) create mode 100644 mcs/class/System/Test/System.Configuration/SettingElementTest.cs diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog index 05099b7dc01..56218c17e0c 100644 --- a/mcs/class/System/ChangeLog +++ b/mcs/class/System/ChangeLog @@ -1,3 +1,7 @@ +2007-05-28 Atsushi Enomoto + + * System_test.dll.sources : added SettingElementTest.cs. + 2007-05-18 Atsushi Enomoto * System.dll.sources : added TraceSourceInfo.cs. diff --git a/mcs/class/System/System.Configuration/ChangeLog b/mcs/class/System/System.Configuration/ChangeLog index 766a7180516..ff5c725d880 100644 --- a/mcs/class/System/System.Configuration/ChangeLog +++ b/mcs/class/System/System.Configuration/ChangeLog @@ -1,3 +1,8 @@ +2007-05-28 Atsushi Enomoto + + * SettingElement.cs : fix default value (null->""). + * SettingElementCollection.cs : implemented all. + 2007-05-28 Atsushi Enomoto * SettingsProviderAttribute.cs : diff --git a/mcs/class/System/System.Configuration/SettingElement.cs b/mcs/class/System/System.Configuration/SettingElement.cs index 254c581b30f..f8914f95e58 100644 --- a/mcs/class/System/System.Configuration/SettingElement.cs +++ b/mcs/class/System/System.Configuration/SettingElement.cs @@ -44,7 +44,7 @@ namespace System.Configuration static SettingElement () { #if CONFIGURATION_DEP - name_prop = new ConfigurationProperty ("name", typeof (string), null, ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey); + name_prop = new ConfigurationProperty ("name", typeof (string), String.Empty, ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey); serialize_as_prop = new ConfigurationProperty ("serializeAs", typeof (SettingsSerializeAs), null, ConfigurationPropertyOptions.IsRequired); value_prop = new ConfigurationProperty ("value", typeof (SettingValueElement), null, ConfigurationPropertyOptions.IsRequired); properties = new ConfigurationPropertyCollection (); diff --git a/mcs/class/System/System.Configuration/SettingElementCollection.cs b/mcs/class/System/System.Configuration/SettingElementCollection.cs index 725158ac7a9..d7a0ec472c7 100644 --- a/mcs/class/System/System.Configuration/SettingElementCollection.cs +++ b/mcs/class/System/System.Configuration/SettingElementCollection.cs @@ -40,28 +40,29 @@ namespace System.Configuration { } - [MonoTODO] public void Add (SettingElement element) { - throw new NotImplementedException (); + BaseAdd (element); } - [MonoTODO] public void Clear () { - throw new NotImplementedException (); + BaseClear (); } - [MonoTODO] public SettingElement Get (string elementKey) { - throw new NotImplementedException (); + foreach (SettingElement el in this) + if (el.Name == elementKey) + return el; + return null; } - [MonoTODO] public void Remove (SettingElement element) { - throw new NotImplementedException (); + if (element == null) + throw new ArgumentNullException ("element"); + BaseRemove (element.Name); } #if (CONFIGURATION_DEP) diff --git a/mcs/class/System/System_test.dll.sources b/mcs/class/System/System_test.dll.sources index 964c96e565d..8214e6f3e80 100644 --- a/mcs/class/System/System_test.dll.sources +++ b/mcs/class/System/System_test.dll.sources @@ -139,6 +139,7 @@ System.ComponentModel.Design/ServiceContainerTest.cs System.ComponentModel.Design.Serialization/InstanceDescriptorTest.cs System.Configuration/ApplicationSettingsBaseTest.cs System.Configuration/LocalFileSettingsProviderTest.cs +System.Configuration/SettingElementTest.cs System.Configuration/SettingsPropertyCollectionTest.cs System.Configuration/SettingsPropertyTest.cs System.Configuration/SettingsPropertyValueCollectionTest.cs diff --git a/mcs/class/System/Test/System.Configuration/ChangeLog b/mcs/class/System/Test/System.Configuration/ChangeLog index f0251797fa0..a2c6091c30c 100644 --- a/mcs/class/System/Test/System.Configuration/ChangeLog +++ b/mcs/class/System/Test/System.Configuration/ChangeLog @@ -1,3 +1,7 @@ +2007-05-28 Atsushi Enomoto + + * SettingElementTest.cs : new test. + 2007-05-28 Atsushi Enomoto * ApplicationSettingsBaseTest.cs : enable working test. diff --git a/mcs/class/System/Test/System.Configuration/SettingElementTest.cs b/mcs/class/System/Test/System.Configuration/SettingElementTest.cs new file mode 100644 index 00000000000..1efbae5a622 --- /dev/null +++ b/mcs/class/System/Test/System.Configuration/SettingElementTest.cs @@ -0,0 +1,73 @@ +// +// SettingElementTest.cs +// +// Author: +// Atsushi Enomoto +// +// Copyright (C) 2007 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if NET_2_0 + +using System; +using System.Text; +using System.Configuration; +using System.Collections.Specialized; +using NUnit.Framework; + +namespace MonoTests.System.Configuration +{ + [TestFixture] + public class SettingElementTest + { + [Test] + public void CollectionAddNull () + { + try { + SettingElementCollection c = new SettingElementCollection (); + c.Add (null); + Assert.Fail (); + } catch { + } + } + + [Test] + public void CollectionAddNameless () + { + SettingElement el = new SettingElement (); + Assert.AreEqual (String.Empty, el.Name, "premise #1"); + SettingElementCollection c = new SettingElementCollection (); + Assert.AreEqual (ConfigurationElementCollectionType.BasicMap, c.CollectionType, "premise #2"); + c.Add (el); + Assert.AreEqual (el, c.Get (""), "#1"); + } + + [Test] + public void CollectionGetNonExistent () + { + SettingElementCollection c = new SettingElementCollection (); + Assert.IsNull (c.Get ("nonexistent")); + } + } +} + +#endif -- 2.25.1