Author: krasnov
Date: 2007-01-14 12:46:15 -0500 (Sun, 14 Jan 2007)
New Revision: 70992
Modified:
branches/mainsoft/gh20preview2/mcs/class/System/System.Configuration/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
branches/mainsoft/gh20preview2/mcs/class/System/Test/System.Configuration/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System/Test/System.Configuration/SettingsPropertyValueTest.cs
Log:
merge -r 70990:70991
Modified:
branches/mainsoft/gh20preview2/mcs/class/System/System.Configuration/ChangeLog
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System/System.Configuration/ChangeLog
2007-01-14 17:36:58 UTC (rev 70991)
+++
branches/mainsoft/gh20preview2/mcs/class/System/System.Configuration/ChangeLog
2007-01-14 17:46:15 UTC (rev 70992)
@@ -1,3 +1,7 @@
+2007-01-14 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * SettingsPropertyValue.cs: fixed IsDirty Property
+
2007-01-08 Vladimir Krasnov <[EMAIL PROTECTED]>
* SettingsPropertyValue.cs: fixed PropertyValue, default value of
Modified:
branches/mainsoft/gh20preview2/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
2007-01-14 17:36:58 UTC (rev 70991)
+++
branches/mainsoft/gh20preview2/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
2007-01-14 17:46:15 UTC (rev 70992)
@@ -88,15 +88,11 @@
needPropertyValue = false;
}
-#if notyet
- /* LAMESPEC: the msdn2 docs say that
- * for object types this
- * pessimistically sets Dirty == true.
- * tests, however, point out that that
- * is not the case. */
- if (!property.PropertyType.IsValueType)
+ if (propertyValue != null &&
+ !(propertyValue is string) &&
+ !(propertyValue is DateTime) &&
+ !property.PropertyType.IsPrimitive)
dirty = true;
-#endif
return propertyValue;
}
@@ -159,10 +155,18 @@
private object GetDeserializedDefaultValue ()
{
- if (property.DefaultValue == null ||
- (property.DefaultValue is string && ((string)
property.DefaultValue).Length == 0))
- return Activator.CreateInstance
(property.PropertyType);
+ if (property.DefaultValue == null)
+ if (property.PropertyType.IsValueType)
+ return Activator.CreateInstance
(property.PropertyType);
+ else
+ return null;
+ if (property.DefaultValue is string && ((string)
property.DefaultValue).Length == 0)
+ if (property.PropertyType != typeof (string))
+ return Activator.CreateInstance
(property.PropertyType);
+ else
+ return string.Empty;
+
if (property.DefaultValue is string && ((string)
property.DefaultValue).Length > 0)
return GetDeserializedValue
(property.DefaultValue);
Modified:
branches/mainsoft/gh20preview2/mcs/class/System/Test/System.Configuration/ChangeLog
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System/Test/System.Configuration/ChangeLog
2007-01-14 17:36:58 UTC (rev 70991)
+++
branches/mainsoft/gh20preview2/mcs/class/System/Test/System.Configuration/ChangeLog
2007-01-14 17:46:15 UTC (rev 70992)
@@ -1,3 +1,7 @@
+2007-01-14 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * SettingsPropertyValueTest.cs: added tests for IsDirty proprty
+
2007-01-08 Vladimir Krasnov <[EMAIL PROTECTED]>
* SettingsPropertyValueTest.cs: added tests of default value
Modified:
branches/mainsoft/gh20preview2/mcs/class/System/Test/System.Configuration/SettingsPropertyValueTest.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System/Test/System.Configuration/SettingsPropertyValueTest.cs
2007-01-14 17:36:58 UTC (rev 70991)
+++
branches/mainsoft/gh20preview2/mcs/class/System/Test/System.Configuration/SettingsPropertyValueTest.cs
2007-01-14 17:46:15 UTC (rev 70992)
@@ -32,6 +32,7 @@
using System;
using System.IO;
using System.Configuration;
+using System.Collections;
using System.Collections.Specialized;
using System.Runtime.Serialization.Formatters.Binary;
using NUnit.Framework;
@@ -108,30 +109,22 @@
v.PropertyValue = 5;
Assert.IsTrue (v.IsDirty, "A3");
-
-#if notyet
- /* the msdn docs say that
- * SettingsPropertyValue pessimistically sets
- * IsDirty to true when you use
- * v.PropertyValue on non-primitive types */
-
/* try out a non-value type */
p = new SettingsProperty ("property",
typeof (StringWriter),
null,
true,
- null,
+ "",
SettingsSerializeAs.String,
null,
true,
false);
v = new SettingsPropertyValue (p);
- Assert.IsNull (v.PropertyValue, "A5");
+ Assert.IsNotNull (v.PropertyValue, "A5");
Console.WriteLine (v.PropertyValue);
Assert.IsTrue (v.IsDirty, "A6");
-#endif
}
[Test]
@@ -257,13 +250,11 @@
BinaryFormatter bf = new BinaryFormatter ();
MemoryStream ms = new MemoryStream (foo);
Assert.AreEqual (10, bf.Deserialize (ms), "A3");
-
-#if notyet
+
v.Deserialized = false;
v.SerializedValue = foo;
Assert.AreEqual (10, v.PropertyValue, "A4");
-#endif
}
[Test]
@@ -344,6 +335,106 @@
MyData h = (MyData) v2.PropertyValue;
Assert.AreEqual (5, h.IntProp, "A3");
}
+
+ [Test]
+ public void IsDirtyAndValueDateTime ()
+ {
+ SettingsProperty sp = new SettingsProperty ("heh");
+ sp.PropertyType = typeof (DateTime);
+
+ SettingsPropertyValue spv = new SettingsPropertyValue
(sp);
+ Assert.IsFalse (spv.IsDirty, "A1");
+ Assert.IsNotNull (spv.PropertyValue, "A2");
+ Assert.AreEqual (typeof (DateTime),
spv.PropertyValue.GetType (), "A3");
+ Assert.IsFalse (spv.IsDirty, "A4");
+ }
+
+ [Test]
+ public void IsDirtyAndValuePrimitive ()
+ {
+ SettingsProperty sp = new SettingsProperty ("heh");
+ sp.PropertyType = typeof (int);
+
+ SettingsPropertyValue spv = new SettingsPropertyValue
(sp);
+ Assert.IsFalse (spv.IsDirty, "A1");
+ Assert.AreEqual (0, spv.PropertyValue, "A2");
+ Assert.AreEqual (typeof (int),
spv.PropertyValue.GetType (), "A3");
+ Assert.IsFalse (spv.IsDirty, "A4");
+ }
+
+ [Test]
+ public void IsDirtyAndValueDecimal ()
+ {
+ SettingsProperty sp = new SettingsProperty ("heh");
+ sp.PropertyType = typeof (decimal);
+
+ SettingsPropertyValue spv = new SettingsPropertyValue
(sp);
+ Assert.IsFalse (spv.IsDirty, "A1");
+ Assert.AreEqual (0, spv.PropertyValue, "A2");
+ Assert.AreEqual (typeof (decimal),
spv.PropertyValue.GetType (), "A3");
+ Assert.IsTrue (spv.IsDirty, "A4");
+ }
+
+ [Test]
+ public void IsDirtyAndValueString ()
+ {
+ SettingsProperty sp = new SettingsProperty ("heh");
+ sp.PropertyType = typeof (string);
+
+ SettingsPropertyValue spv = new SettingsPropertyValue
(sp);
+ Assert.IsFalse (spv.IsDirty, "A1");
+ Assert.IsNull (spv.PropertyValue, "A2");
+ Assert.IsFalse (spv.IsDirty, "A3");
+
+ SettingsProperty sp2 = new SettingsProperty ("heh");
+ sp2.PropertyType = typeof (string);
+ sp2.DefaultValue = "";
+
+ SettingsPropertyValue spv2 = new SettingsPropertyValue
(sp2);
+ Assert.IsFalse (spv2.IsDirty, "A4");
+ Assert.IsNotNull (spv2.PropertyValue, "A5");
+ Assert.IsFalse (spv2.IsDirty, "A6");
+ }
+
+ [Serializable]
+ public struct MyData2
+ {
+ public int intProp;
+ }
+
+ [Test]
+ public void IsDirtyAndValueMyData2 ()
+ {
+ SettingsProperty sp = new SettingsProperty ("heh");
+ sp.PropertyType = typeof (MyData2);
+
+ SettingsPropertyValue spv = new SettingsPropertyValue
(sp);
+ Assert.IsFalse (spv.IsDirty, "A1");
+ Assert.IsNotNull (spv.PropertyValue, "A2");
+ Assert.IsTrue (spv.IsDirty, "A3");
+ }
+
+ [Test]
+ public void IsDirtyAndValueArrayList ()
+ {
+ SettingsProperty sp = new SettingsProperty ("heh");
+ sp.PropertyType = typeof (ArrayList);
+
+ SettingsPropertyValue spv = new SettingsPropertyValue
(sp);
+ Assert.IsFalse (spv.IsDirty, "A1");
+ Assert.IsNull (spv.PropertyValue, "A2");
+ Assert.IsFalse (spv.IsDirty, "A3");
+
+ SettingsProperty sp2 = new SettingsProperty ("heh");
+ sp2.PropertyType = typeof (ArrayList);
+ sp2.DefaultValue = "";
+
+ SettingsPropertyValue spv2 = new SettingsPropertyValue
(sp2);
+ Assert.IsFalse (spv2.IsDirty, "A5");
+ Assert.IsNotNull (spv2.PropertyValue, "A6");
+ Assert.AreEqual (typeof (ArrayList),
spv2.PropertyValue.GetType (), "A7");
+ Assert.IsTrue (spv2.IsDirty, "A8");
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
