Author: andrews
Date: 2006-06-20 04:43:16 -0400 (Tue, 20 Jun 2006)
New Revision: 61871
Added:
trunk/mcs/class/System.Web/Test/mainsoft/NunitWebResources/FormView.aspx
Modified:
trunk/mcs/class/System.Web/ChangeLog
trunk/mcs/class/System.Web/Makefile
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
Log:
handle CssClass property in FormView
Modified: trunk/mcs/class/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/ChangeLog 2006-06-20 06:00:45 UTC (rev
61870)
+++ trunk/mcs/class/System.Web/ChangeLog 2006-06-20 08:43:16 UTC (rev
61871)
@@ -1,3 +1,7 @@
+2006-06-20 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * Makefile: add FormView.aspx test resource file
+
2006-06-18 Andrew Skiba <[EMAIL PROTECTED]>
* System.Web_test.dll.sources: add TemplateControlCompilerTest.cs
Modified: trunk/mcs/class/System.Web/Makefile
===================================================================
--- trunk/mcs/class/System.Web/Makefile 2006-06-20 06:00:45 UTC (rev 61870)
+++ trunk/mcs/class/System.Web/Makefile 2006-06-20 08:43:16 UTC (rev 61871)
@@ -71,6 +71,7 @@
Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx \
Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config \
Test/mainsoft/NunitWebResources/menuclass.aspx \
+ Test/mainsoft/NunitWebResources/FormView.aspx \
Test/mainsoft/NunitWebResources/PageWithStyleSheet.aspx \
Test/mainsoft/NunitWebResources/PageWithTheme.aspx \
Test/mainsoft/NunitWebResources/RunTimeSetTheme.aspx \
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-06-20 06:00:45 UTC (rev 61870)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-06-20 08:43:16 UTC (rev 61871)
@@ -1,3 +1,7 @@
+2006-06-20 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * FormView.cs: handle CssClass attribute
+
2006-06-14 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* Button.cs: do something in PostBackUrl.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
2006-06-20 06:00:45 UTC (rev 61870)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/FormView.cs
2006-06-20 08:43:16 UTC (rev 61871)
@@ -1398,6 +1398,8 @@
writer.AddAttribute
(HtmlTextWriterAttribute.Cellspacing, "0");
writer.AddStyleAttribute
(HtmlTextWriterStyle.BorderCollapse, "collapse");
+ if (!string.IsNullOrEmpty (ControlStyle.CssClass))
+ writer.AddAttribute
(HtmlTextWriterAttribute.Class, ControlStyle.CssClass);
table.RenderBeginTag (writer);
foreach (FormViewRow row in table.Rows)
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-06-20 06:00:45 UTC (rev 61870)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-06-20 08:43:16 UTC (rev 61871)
@@ -1,3 +1,7 @@
+2006-06-20 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * FormViewTest.cs: add new test for CssClass attribute
+
2006-06-14 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* RepeaterItemCollectionTest.cs: New file.
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
2006-06-20 06:00:45 UTC (rev 61870)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs
2006-06-20 08:43:16 UTC (rev 61871)
@@ -37,6 +37,10 @@
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using NunitWeb;
+using System.Text.RegularExpressions;
+using System.Reflection;
+using System.Threading;
namespace MonoTests.System.Web.UI.WebControls
{
@@ -160,6 +164,38 @@
f.PageIndex = 1;
Assert.AreEqual (16, f.PageCount, "#01");
}
+
+ [TestFixtureTearDown]
+ public void TearDown ()
+ {
+ Thread.Sleep (100);
+ Helper.Unload ();
+ }
+
+ //[TestFixtureStartUp]
+ //public void StartUp ()
+ //{
+ // Helper.Instance.CopyResource
(Assembly.GetExecutingAssembly (),
+ // "FormView.aspx", "FormView.aspx");
+ //}
+
+ [Test]
+ [Category("NunitWeb")]
+ public void FormViewCssClass ()
+ {
+ Helper.Instance.CopyResource
(Assembly.GetExecutingAssembly (),
+ "FormView.aspx", "FormView.aspx");
+ string res = Helper.Instance.RunUrl ("FormView.aspx");
+ Assert.IsTrue (Regex.IsMatch (
+ res,
".*<table[^>]*class=\"[^\"]*test1[^\"]*\"[^>]*>.*",
+
RegexOptions.IgnoreCase|RegexOptions.Singleline),
+ "check that <table class=\"test1\"> is found.
Actual: "+res);
+ Assert.IsFalse (Regex.IsMatch (
+ res, ".*<table[^>]*class=\"\"[^>]*>.*",
+
RegexOptions.IgnoreCase|RegexOptions.Singleline),
+ "check that <table class=\"\"> is not found.
Actual: "+res);
+ }
+
}
}
#endif
Added: trunk/mcs/class/System.Web/Test/mainsoft/NunitWebResources/FormView.aspx
===================================================================
--- trunk/mcs/class/System.Web/Test/mainsoft/NunitWebResources/FormView.aspx
2006-06-20 06:00:45 UTC (rev 61870)
+++ trunk/mcs/class/System.Web/Test/mainsoft/NunitWebResources/FormView.aspx
2006-06-20 08:43:16 UTC (rev 61871)
@@ -0,0 +1,46 @@
+<%@ Page Language="C#" CodeFile="MyPage.aspx.cs" Inherits="MyPage" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+<html xmlns="http://www.w3.org/1999/xhtml"; >
+ <head>
+ <title>FormView class test</title>
+ </head>
+<body>
+ <form id="form1" runat="server">
+ <asp:FormView ID="formView1" runat="server" DataSourceID="DataSource1">
+ <ItemTemplate>
+ </ItemTemplate>
+ </asp:FormView>
+ <asp:FormView ID="formView2" runat="server" CssClass="test1"
DataSourceID="DataSource1">
+ <ItemTemplate>
+ </ItemTemplate>
+ </asp:FormView>
+ <asp:ObjectDataSource ID="DataSource1" runat="server"
TypeName="System.Guid" SelectMethod="ToByteArray" />
+
+ </form>
+</body>
+</html>
+<%@ Page Language="C#" CodeFile="MyPage.aspx.cs" Inherits="MyPage" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+<html xmlns="http://www.w3.org/1999/xhtml"; >
+ <head>
+ <title>FormView class test</title>
+ </head>
+<body>
+ <form id="form1" runat="server">
+ <asp:FormView ID="formView1" runat="server" DataSourceID="DataSource1">
+ <ItemTemplate>
+ </ItemTemplate>
+ </asp:FormView>
+ <asp:FormView ID="formView2" runat="server" CssClass="test1"
DataSourceID="DataSource1">
+ <ItemTemplate>
+ </ItemTemplate>
+ </asp:FormView>
+ <asp:ObjectDataSource ID="DataSource1" runat="server"
TypeName="System.Guid" SelectMethod="ToByteArray" />
+
+ </form>
+</body>
+</html>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
