* TemplateControl.jvm.cs: ParseControl not supported, added limited implementation...

* TemplateControlTest.cs: removed not working attributes, TARGET_JVM for AppRelativeVirtualPath property tests

svn path=/trunk/mcs/; revision=71513

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index b55e1bb6d8dd5c3eb4b4887109a4108791719fe4..8b827e42a5a18c5a1623b314f322aee2fe1825fd 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-23  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
+       * TemplateControl.jvm.cs: ParseControl not supported, added limited
+       implementation if TestDeviceFilter
+
 2007-01-22  Konstantin Triger <kostat@mainsoft.com>
 
        * ClientScriptManager.cs: ensure the callback client script is

diff --git a/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs b/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
index 0f138396ef2d53be1ac1b7fb170c180765b62153..ae0e731616c592a3e0b3e2737e11c48d28890d5f 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
@@ -255,10 +255,16 @@ namespace System.Web.UI {
                                eh (this, e);
                }
 
-               [MonoTODO]
+               [MonoNotSupported ("Not supported")]
                public Control ParseControl (string content)
                {
-                       return null;
+                       throw new NotSupportedException ();
+               }
+
+               [MonoLimitation ("Always returns false")]
+               public virtual bool TestDeviceFilter (string filterName)
+               {
+                       return false;
                }
 
                [MonoTODO]

diff --git a/mcs/class/System.Web/Test/System.Web.UI/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
index 56e68893e7556ca8ff0cfa6c47ac081ab286028e..2129533610bd091d71cbe343a917c3ff01501b31 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-23  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
+       * TemplateControlTest.cs: removed not working attributes, TARGET_JVM
+       for AppRelativeVirtualPath property tests
+
 2006-01-15  Ilya Kharmatsky    <ilya-at-decode-systems.com>
        
        * ControlTest.cs: removed NotWorking attributes,

diff --git a/mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs
index fdc2578165ca5006474c9c44a63e83771d6ccacd..0e0c2ee14a368bce7caba7341e62c7bf325e245b 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs
@@ -119,14 +119,14 @@ namespace MonoTests.System.Web.UI.WebControls
                        Assert.AreEqual (true, t.DoSupportAutoEvents, "SupportAutoEvents");
                }
 
+#if TARGET_JVM
                [Test]
-               [Category ("NotWorking")]
                public void TemplateControl_DefaultPropertyNotWorking ()
                {
                        PokerTemplateControl t = new PokerTemplateControl ();
-                       //Does not have definition
-                       //Assert.AreEqual (null, t.AppRelativeVirtualPath, "AppRelativeVirtualPath");
+                       Assert.AreEqual (null, t.AppRelativeVirtualPath, "AppRelativeVirtualPath");
                }
+#endif
 
                [Test]
                [Category ("NunitWeb")]
@@ -195,12 +195,12 @@ namespace MonoTests.System.Web.UI.WebControls
                public void TemplateControl_TestDeviceFilter ()
                {
                        //Have no definition to TestDeviceFilter
-                       WebTest t = new WebTest (PageInvoker.CreateOnLoad (TestDeviceFilter));
+                       WebTest t = new WebTest (PageInvoker.CreateOnLoad (DoTestDeviceFilter));
                        string html = t.Run ();
                        
                }
 
-               public static void TestDeviceFilter (Page p)
+               public static void DoTestDeviceFilter (Page p)
                {
                        //Have no definition to TestDeviceFilter
                        // bool res = p.TestDeviceFilter("test");
@@ -220,7 +220,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
                [Test]
                [Category ("NunitWeb")]
-               [Category ("NotWorking")]
                public void TemplateControl_Eval ()
                {
                        // In this test aspx page used as template control
@@ -327,11 +326,11 @@ namespace MonoTests.System.Web.UI.WebControls
 
 
                [Test]
-               [Category ("NotWorking")]
                [ExpectedException (typeof (InvalidOperationException))]
                public void TemplateControl_EvalException ()
                {
                        PokerTemplateControl t = new PokerTemplateControl ();
+                       t.Page = new Page ();
                        t.DoEval (null);
                }
                
@@ -343,27 +342,24 @@ namespace MonoTests.System.Web.UI.WebControls
                        t.LoadControl (null);
                }
 
-               
+
+#if TARGET_JVM
                [Test]
-               [Category ("NotWorking")]
-               //[ExpectedException(typeof(ArgumentNullException))]
+               [ExpectedException(typeof(ArgumentNullException))]
                public void TemplateControl_AppRelativeVirtualPathException1 ()
                {
                        PokerTemplateControl t = new PokerTemplateControl ();
-                       //Does not have definition
-                       //t.AppRelativeVirtualPath = null;
+                       t.AppRelativeVirtualPath = null;
                }
 
                [Test]
-               [Category ("NotWorking")]
-               //[ExpectedException (typeof (ArgumentException))]
+               [ExpectedException (typeof (ArgumentException))]
                public void TemplateControl_AppRelativeVirtualPathException2 ()
                {
                        PokerTemplateControl t = new PokerTemplateControl ();
-                       //Does not have definition
-                       //t.AppRelativeVirtualPath = "fake";
+                       t.AppRelativeVirtualPath = "fake";
                }
-
+#endif
                [TestFixtureTearDown]
                public void TearDown ()
                {