[Sys.Configuration] Remove a misleading MonoTODO in ConnectionStrings

The ConnectionStrings property of System.Configuration.ConfigurationManager
works perfectly, so this MonoTODO is not needed.

A unit test is also added to demonstrate that it's fully working and to
prevent it failing in the future.

diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
index 7835a0b0fda924d5b8089467ca4fcf67a82402ae..460d69ad962e954aa895d3ce60a602ef530b259b 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
@@ -177,7 +177,6 @@ namespace System.Configuration {
                        }
                }
 
-               [MonoTODO]
                public static ConnectionStringSettingsCollection ConnectionStrings {
                        get {
                                ConnectionStringsSection connectionStrings = (ConnectionStringsSection) GetSection ("connectionStrings");

diff --git a/mcs/class/System.Configuration/System.Configuration_test_net_2_0.dll.config b/mcs/class/System.Configuration/System.Configuration_test_net_2_0.dll.config
new file mode 120000 (symlink)
index 0000000..6f31b34
--- /dev/null
+++ b/mcs/class/System.Configuration/System.Configuration_test_net_2_0.dll.config
@@ -0,0 +1 @@
+Test/App.config
\ No newline at end of file

diff --git a/mcs/class/System.Configuration/System.Configuration_test_net_4_0.dll.config b/mcs/class/System.Configuration/System.Configuration_test_net_4_0.dll.config
new file mode 120000 (symlink)
index 0000000..6f31b34
--- /dev/null
+++ b/mcs/class/System.Configuration/System.Configuration_test_net_4_0.dll.config
@@ -0,0 +1 @@
+Test/App.config
\ No newline at end of file

diff --git a/mcs/class/System.Configuration/System.Configuration_test_net_4_5.dll.config b/mcs/class/System.Configuration/System.Configuration_test_net_4_5.dll.config
new file mode 120000 (symlink)
index 0000000..6f31b34
--- /dev/null
+++ b/mcs/class/System.Configuration/System.Configuration_test_net_4_5.dll.config
@@ -0,0 +1 @@
+Test/App.config
\ No newline at end of file

diff --git a/mcs/class/System.Configuration/Test/App.config b/mcs/class/System.Configuration/Test/App.config
new file mode 100644 (file)
index 0000000..ac4ae1b
--- /dev/null
+++ b/mcs/class/System.Configuration/Test/App.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+       <connectionStrings>
+               <add name="test-connstring"
+                       connectionString="Server=(local);Initial Catalog=someDb;User Id=someUser;Password=somePassword;Application Name=someAppName;Min Pool Size=5;Max Pool Size=500;Connect Timeout=10;Connection Lifetime=29;" />
+       </connectionStrings>
+</configuration>

diff --git a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
index f1a383110b2926d0fa2041a89d79b5b8acb270ce..613d0c10df54948e6d165cb5ef7ba9cd0b5f7c92 100644 (file)
--- a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
+++ b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
@@ -611,5 +611,17 @@ namespace MonoTests.System.Configuration {
                                Assert.That (EvaluationContext != null, label);
                        }
                }
+
+
+               [Test]
+               public void TestConnectionStringRetrieval ()
+               {
+                       var connStringObj = ConfigurationManager.ConnectionStrings ["test-connstring"];
+                       Assert.IsNotNull (connStringObj);
+                       var connString = connStringObj.ConnectionString;
+                       Assert.IsFalse (String.IsNullOrEmpty (connString));
+                       Assert.AreEqual ("Server=(local);Initial Catalog=someDb;User Id=someUser;Password=somePassword;Application Name=someAppName;Min Pool Size=5;Max Pool Size=500;Connect Timeout=10;Connection Lifetime=29;",
+                                        connString);
+               }
        }
 }