Author: atsushi
Date: 2006-05-12 05:54:22 -0400 (Fri, 12 May 2006)
New Revision: 60616
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
trunk/mcs/class/System.Configuration/System.Configuration/Configuration.cs
trunk/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
trunk/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
Log:
2006-05-12 Atsushi Enomoto <[EMAIL PROTECTED]>
* Configuration.cs : configPath is null for machine.config, so don't
use it. Use streamName instead. To my understanding, this should
fix bug #78372.
* ConfigurationManagerTest.cs :
added test for OpenMachineConfiguration().
Modified: trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
2006-05-12 02:35:51 UTC (rev 60615)
+++ trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
2006-05-12 09:54:22 UTC (rev 60616)
@@ -1,3 +1,9 @@
+2006-05-12 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * Configuration.cs : configPath is null for machine.config, so don't
+ use it. Use streamName instead. To my understanding, this should
+ fix bug #78372.
+
2006-05-10 Atsushi Enomoto <[EMAIL PROTECTED]>
* ConnectionStringSettings.cs : it seems that "name" property
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/Configuration.cs
===================================================================
--- trunk/mcs/class/System.Configuration/System.Configuration/Configuration.cs
2006-05-12 02:35:51 UTC (rev 60615)
+++ trunk/mcs/class/System.Configuration/System.Configuration/Configuration.cs
2006-05-12 09:54:22 UTC (rev 60616)
@@ -109,7 +109,7 @@
rootGroup.StreamName = streamName;
}
- if (configPath != null)
+ if (streamName != null)
Load ();
}
Modified:
trunk/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
2006-05-12 02:35:51 UTC (rev 60615)
+++ trunk/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
2006-05-12 09:54:22 UTC (rev 60616)
@@ -1,3 +1,8 @@
+2006-05-12 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * ConfigurationManagerTest.cs :
+ added test for OpenMachineConfiguration().
+
2006-05-10 Atsushi Enomoto <[EMAIL PROTECTED]>
* StringValidatorTest.cs : added NullZero().
Modified:
trunk/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
===================================================================
---
trunk/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
2006-05-12 02:35:51 UTC (rev 60615)
+++
trunk/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
2006-05-12 09:54:22 UTC (rev 60616)
@@ -4,8 +4,9 @@
//
// Author:
// Chris Toshok <[EMAIL PROTECTED]>
+// Atsushi Enomoto <[EMAIL PROTECTED]>
//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005-2006 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
@@ -255,6 +256,16 @@
{
Assert.IsTrue (ConfigurationManager.GetSection
("appSettings") is NameValueCollection);
}
+
+ [Test] // test for bug #78372.
+ public void OpenMachineConfiguration ()
+ {
+ Configuration cfg =
ConfigurationManager.OpenMachineConfiguration ();
+ Assert.IsTrue (cfg.Sections.Count > 0, "#1");
+ ConfigurationSection s = cfg.Sections
["system.net/connectionManagement"];
+ Assert.IsNotNull (s, "#2");
+ Assert.IsTrue (s is ConnectionManagementSection, "#3");
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches