Moved ProviderCollectionTest.cs from System assembly to System.Configuration.
authorGert Driesen <drieseng@users.sourceforge.net>
Sun, 14 Sep 2008 12:17:43 +0000 (12:17 -0000)
committerGert Driesen <drieseng@users.sourceforge.net>
Sun, 14 Sep 2008 12:17:43 +0000 (12:17 -0000)
svn path=/trunk/mcs/; revision=112950

mcs/class/System.Configuration/ChangeLog
mcs/class/System.Configuration/System.Configuration_test.dll.sources
mcs/class/System.Configuration/Test/System.Configuration.Provider/ChangeLog
mcs/class/System.Configuration/Test/System.Configuration.Provider/ProviderCollectionTest.cs [new file with mode: 0644]
mcs/class/System/Test/System.Configuration/ChangeLog
mcs/class/System/Test/System.Configuration/ProviderCollectionTest.cs [deleted file]

index 2f27439f243da2b02ce0333a6792fa09f4b8c756..7226e698ee167c9d78d80eb18e0bdfe48e61f178 100644 (file)
@@ -1,3 +1,8 @@
+2008-09-14  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * System.Configuration_test.dll.sources: added
+       ProviderCollectionTest.cs.
+
 2008-07-01  Miguel de Icaza  <miguel@novell.com>
 
        * ConfigurationManager.cs (OpenExeConfigurationInternal): if the
index 968b3bcaf8ce5935f5e1b5968049bc0df0184ed9..29a9eb1f64f9eb12cc01239cc17f2729cf01cb2d 100644 (file)
@@ -30,3 +30,4 @@ System.Configuration/TimeSpanValidatorTest.cs
 System.Configuration/TypeNameConverterTest.cs
 System.Configuration/WhiteSpaceTrimStringConverterTest.cs
 System.Configuration.Provider/ProviderBaseTest.cs
+System.Configuration.Provider/ProviderCollectionTest.cs
index 2ef1bbb8b3ae4a98a053306e253e03baf253e96b..b6caef460075e2e17e554db17ed8d0fb4e705292 100644 (file)
@@ -1,3 +1,7 @@
+2008-09-14  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * ProviderCollectionTest.cs: Moved from System assembly.
+
 2007-08-31  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * ProviderBaseTest.cs: Added tests for Initialize.
diff --git a/mcs/class/System.Configuration/Test/System.Configuration.Provider/ProviderCollectionTest.cs b/mcs/class/System.Configuration/Test/System.Configuration.Provider/ProviderCollectionTest.cs
new file mode 100644 (file)
index 0000000..9825e51
--- /dev/null
@@ -0,0 +1,181 @@
+//
+// System.Configuration.ProviderCollectionTest.cs - Unit tests for
+// System.Configuration.ProviderCollection.
+//
+// Author:
+//     Chris Toshok  <toshok@ximian.com>
+//
+// Copyright (C) 2005 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.Configuration.Provider;
+using System.Collections.Specialized;
+using NUnit.Framework;
+
+namespace MonoTests.System.Configuration {
+
+       class TestProvider : SettingsProvider {
+               public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext context,
+                                                                                  SettingsPropertyCollection collection)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               public override void SetPropertyValues (SettingsContext context,
+                                                       SettingsPropertyValueCollection collection)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               public override string ApplicationName {
+                       get {
+                               throw new NotImplementedException ();
+                       }
+                       set {
+                               throw new NotImplementedException ();
+                       }
+               }
+       }
+
+       class TestProviderBase : ProviderBase {
+       }
+
+       [TestFixture]
+       public class ProviderCollectionTest {
+
+               [Test]
+               [ExpectedException (typeof (ArgumentException))]
+               public void Add_duplicate ()
+               {
+                       ProviderCollection col = new ProviderCollection();
+                       TestProvider provider;
+
+                       provider = new TestProvider();
+                       provider.Initialize ("test", null);
+
+
+                       col.Add (provider);
+                       col.Add (provider);
+               }
+
+               [Test]
+               public void Add_providerbase ()
+               {
+                       ProviderCollection col = new ProviderCollection();
+                       TestProviderBase provider;
+
+                       provider = new TestProviderBase();
+                       provider.Initialize ("test", null);
+
+                       col.Add (provider);
+
+                       Assert.AreEqual (provider, col["test"], "A1");
+               }
+
+               [Test]
+               public void Get_nonexistant ()
+               {
+                       ProviderCollection col = new ProviderCollection();
+                       TestProvider provider;
+
+                       provider = new TestProvider();
+                       provider.Initialize ("test", null);
+
+
+                       col.Add (provider);
+
+                       Assert.AreEqual (provider, col["test"], "A1");
+                       Assert.IsNull (col["test2"], "A2");
+               }
+
+               [Test]
+               public void Ctor_2 ()
+               {
+                       SettingsProperty q = new SettingsProperty ("property",
+                                                                  typeof (int),
+                                                                  null,
+                                                                  true,
+                                                                  10,
+                                                                  SettingsSerializeAs.Binary,
+                                                                  new SettingsAttributeDictionary(),
+                                                                  true,
+                                                                  false);
+
+                       SettingsProperty p = new SettingsProperty (q);
+
+                       Assert.AreEqual ("property", p.Name, "A1");
+                       Assert.AreEqual (typeof (int), p.PropertyType, "A2");
+                       Assert.AreEqual (null, p.Provider, "A3");
+                       Assert.AreEqual (10, (int)p.DefaultValue, "A4");
+                       Assert.AreEqual (SettingsSerializeAs.Binary, p.SerializeAs, "A5");
+                       Assert.IsNotNull (p.Attributes, "A6");
+                       Assert.IsTrue (p.ThrowOnErrorDeserializing, "A7");
+                       Assert.IsFalse (p.ThrowOnErrorSerializing, "A8");
+                       Assert.IsTrue (p.IsReadOnly, "A9");
+               }
+
+               [Test]
+               [ExpectedException (typeof (ArgumentNullException))]
+               public void Ctor_2_ArgNull ()
+               {
+                       /* same as above, but a null
+                        * SettingsAttributeDictionary, which causes a
+                        * ANE in the ctor. */
+                       SettingsProperty q = new SettingsProperty ("property",
+                                                                  typeof (int),
+                                                                  null,
+                                                                  true,
+                                                                  10,
+                                                                  SettingsSerializeAs.Binary,
+                                                                  null,
+                                                                  true,
+                                                                  false);
+
+                       SettingsProperty p = new SettingsProperty (q);
+               }
+
+               [Test]
+               public void Ctor_3 ()
+               {
+                       SettingsProperty p = new SettingsProperty ("property");
+
+                       Assert.AreEqual ("property", p.Name, "A1");
+                       Assert.AreEqual (null, p.PropertyType, "A2");
+                       Assert.AreEqual (null, p.Provider, "A3");
+                       Assert.AreEqual (null, p.DefaultValue, "A4");
+                       Assert.AreEqual (SettingsSerializeAs.String, p.SerializeAs, "A5");
+                       Assert.IsNotNull (p.Attributes, "A6");
+                       Assert.IsFalse (p.ThrowOnErrorDeserializing, "A7");
+                       Assert.IsFalse (p.ThrowOnErrorSerializing, "A8");
+                       Assert.IsFalse (p.IsReadOnly, "A9");
+               }
+
+       }
+
+}
+
+#endif
index 611059a83761f80e94892bdc639c9dd6a27f7206..668fc762ad0ba40c8e19d2cc8bf44b5dac889d4f 100644 (file)
@@ -1,3 +1,7 @@
+2008-09-14  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * ProviderCollectionTest.cs: Moved to System.Configuration assembly.
+
 2008-06-25  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * ConfigurationExceptionTest.cs: Added ctor tests.
diff --git a/mcs/class/System/Test/System.Configuration/ProviderCollectionTest.cs b/mcs/class/System/Test/System.Configuration/ProviderCollectionTest.cs
deleted file mode 100644 (file)
index 9825e51..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// System.Configuration.ProviderCollectionTest.cs - Unit tests for
-// System.Configuration.ProviderCollection.
-//
-// Author:
-//     Chris Toshok  <toshok@ximian.com>
-//
-// Copyright (C) 2005 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.Configuration.Provider;
-using System.Collections.Specialized;
-using NUnit.Framework;
-
-namespace MonoTests.System.Configuration {
-
-       class TestProvider : SettingsProvider {
-               public override SettingsPropertyValueCollection GetPropertyValues (SettingsContext context,
-                                                                                  SettingsPropertyCollection collection)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               public override void SetPropertyValues (SettingsContext context,
-                                                       SettingsPropertyValueCollection collection)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               public override string ApplicationName {
-                       get {
-                               throw new NotImplementedException ();
-                       }
-                       set {
-                               throw new NotImplementedException ();
-                       }
-               }
-       }
-
-       class TestProviderBase : ProviderBase {
-       }
-
-       [TestFixture]
-       public class ProviderCollectionTest {
-
-               [Test]
-               [ExpectedException (typeof (ArgumentException))]
-               public void Add_duplicate ()
-               {
-                       ProviderCollection col = new ProviderCollection();
-                       TestProvider provider;
-
-                       provider = new TestProvider();
-                       provider.Initialize ("test", null);
-
-
-                       col.Add (provider);
-                       col.Add (provider);
-               }
-
-               [Test]
-               public void Add_providerbase ()
-               {
-                       ProviderCollection col = new ProviderCollection();
-                       TestProviderBase provider;
-
-                       provider = new TestProviderBase();
-                       provider.Initialize ("test", null);
-
-                       col.Add (provider);
-
-                       Assert.AreEqual (provider, col["test"], "A1");
-               }
-
-               [Test]
-               public void Get_nonexistant ()
-               {
-                       ProviderCollection col = new ProviderCollection();
-                       TestProvider provider;
-
-                       provider = new TestProvider();
-                       provider.Initialize ("test", null);
-
-
-                       col.Add (provider);
-
-                       Assert.AreEqual (provider, col["test"], "A1");
-                       Assert.IsNull (col["test2"], "A2");
-               }
-
-               [Test]
-               public void Ctor_2 ()
-               {
-                       SettingsProperty q = new SettingsProperty ("property",
-                                                                  typeof (int),
-                                                                  null,
-                                                                  true,
-                                                                  10,
-                                                                  SettingsSerializeAs.Binary,
-                                                                  new SettingsAttributeDictionary(),
-                                                                  true,
-                                                                  false);
-
-                       SettingsProperty p = new SettingsProperty (q);
-
-                       Assert.AreEqual ("property", p.Name, "A1");
-                       Assert.AreEqual (typeof (int), p.PropertyType, "A2");
-                       Assert.AreEqual (null, p.Provider, "A3");
-                       Assert.AreEqual (10, (int)p.DefaultValue, "A4");
-                       Assert.AreEqual (SettingsSerializeAs.Binary, p.SerializeAs, "A5");
-                       Assert.IsNotNull (p.Attributes, "A6");
-                       Assert.IsTrue (p.ThrowOnErrorDeserializing, "A7");
-                       Assert.IsFalse (p.ThrowOnErrorSerializing, "A8");
-                       Assert.IsTrue (p.IsReadOnly, "A9");
-               }
-
-               [Test]
-               [ExpectedException (typeof (ArgumentNullException))]
-               public void Ctor_2_ArgNull ()
-               {
-                       /* same as above, but a null
-                        * SettingsAttributeDictionary, which causes a
-                        * ANE in the ctor. */
-                       SettingsProperty q = new SettingsProperty ("property",
-                                                                  typeof (int),
-                                                                  null,
-                                                                  true,
-                                                                  10,
-                                                                  SettingsSerializeAs.Binary,
-                                                                  null,
-                                                                  true,
-                                                                  false);
-
-                       SettingsProperty p = new SettingsProperty (q);
-               }
-
-               [Test]
-               public void Ctor_3 ()
-               {
-                       SettingsProperty p = new SettingsProperty ("property");
-
-                       Assert.AreEqual ("property", p.Name, "A1");
-                       Assert.AreEqual (null, p.PropertyType, "A2");
-                       Assert.AreEqual (null, p.Provider, "A3");
-                       Assert.AreEqual (null, p.DefaultValue, "A4");
-                       Assert.AreEqual (SettingsSerializeAs.String, p.SerializeAs, "A5");
-                       Assert.IsNotNull (p.Attributes, "A6");
-                       Assert.IsFalse (p.ThrowOnErrorDeserializing, "A7");
-                       Assert.IsFalse (p.ThrowOnErrorSerializing, "A8");
-                       Assert.IsFalse (p.IsReadOnly, "A9");
-               }
-
-       }
-
-}
-
-#endif