2006-11-22 Igor Zelmanovich <igorz@mainsoft.com>

[mono.git] / mcs / class / System.Web / Test / System.Web.UI.WebControls / BaseCompareValidatorTest.cs

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseCompareValidatorTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseCompareValidatorTest.cs
index 1b27aac81dd97fd183928e5f07852342ad526cde..6a95d3b9a26a8d8152c8fb22e09cecdd8d57b8f7 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseCompareValidatorTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseCompareValidatorTest.cs
@@ -111,20 +111,23 @@ namespace MonoTests.System.Web.UI.WebControls
        {
 
                [Test]
-               [Category("NotWorking")]
                public void DefaultProperties ()
                {
                        BaseCompareValidatorPoker p = new BaseCompareValidatorPoker ();
+                       
+                       Assert.AreEqual (ValidationDataType.String, p.Type, "CultureInvariantValues");
 #if NET_2_0
                        Assert.AreEqual (false, p.CultureInvariantValues, "CultureInvariantValues");
 #endif 
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void AssignProperties ()
                {
                        BaseCompareValidatorPoker p = new BaseCompareValidatorPoker ();
+                       
+                       p.Type = ValidationDataType.Double;
+                       Assert.AreEqual (ValidationDataType.Double, p.Type, "CultureInvariantValues");
 #if NET_2_0
                        p.CultureInvariantValues = true;
                        Assert.AreEqual (true, p.CultureInvariantValues, "CultureInvariantValues");
@@ -136,8 +139,18 @@ namespace MonoTests.System.Web.UI.WebControls
                {
                        BaseCompareValidatorPoker p = new BaseCompareValidatorPoker ();
 
-                       p.Type = ValidationDataType.String;
-                       Assert.AreEqual (p.Type, ValidationDataType.String, "A1");
+                       p.Type = ValidationDataType.Double;
+#if NET_2_0
+                       p.CultureInvariantValues = true;
+#endif
+
+                       BaseCompareValidatorPoker copy = new BaseCompareValidatorPoker ();
+                       copy.LoadState (p.SaveState ());
+
+                       Assert.AreEqual (ValidationDataType.Double, copy.Type, "A1");
+#if NET_2_0
+                       Assert.AreEqual (true, copy.CultureInvariantValues, "A1");
+#endif
                }
 
                [Test]
@@ -479,9 +492,10 @@ namespace MonoTests.System.Web.UI.WebControls
 
 #if NET_2_0
                [Test]
-               [Category ("NotWorking")]
                public void CultureInvariantValues_1 ()
                {
+                       Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
+                       //  Current date format --> "dmy"
                        Page p = new Page ();
 
                        CompareValidator v = new CompareValidator ();
@@ -514,7 +528,6 @@ namespace MonoTests.System.Web.UI.WebControls
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void CultureInvariantValues_2 ()
                {