mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 17:10:20 -10:00
* add new resources: PageWithAdapter.aspx for PageTest and PageAdapterTest. TestCapability.browser for AppBrowsersTest. * NunitWebResources/adapters.browser, NunitWebResources/AppBrowsersTest.browser: modified to support testing reference nodes with captures, and adapters. * NunitWeb/NunitWeb/WebTest.cs: ensure that, during AppDomain unload, no new requests are sent to the app host and any pending requests are completed before the the unload occurs. Also added WebTest.AppUnloaded event that tests can use to wait for the app to unload (e.g. after touching Global.asax), and WebTest.CleanApp() which can be called to restart the app with the a skeleton directory structure. Tests which add files that could effect other tests (e.g. App_Browsers/*.browser files) should call WebTest.CleanApp() during TearDown to return the app to a pristine environment. ++ Test/mainsoft/MainsoftWebTest/ChangeLog (working copy) * HtmlAgilityPack/AssemblyInfo.cs: made assembly delay signed so that tests can access System.Web internals now that System.Web is InternalsVisibleTo this assembly. ++ Test/System.Web/ChangeLog (working copy) * AppBrowsersTest.cs: added. Includes tests for Control.Adapter, Control.ResolveAdapter, Control.TagWriter, and Control.CreateHtmlTextWriter, when using App_Browsers/*.browser files. AppBrowsersTest is currently tagged [Ignore], pending a fix for bug #351878. * HttpRuntimeTest.cs: added. Includes test for HttpRuntime.UnloadAppDomain(). Marked [Ignore], pending a fix for bug #351878. ++ Test/System.Web.UI.Adapters/ChangeLog (revision 0) * PageAdapterTest.cs: added tests for PageAdapter. * ControlAdapterTest.cs (ConfigCapabilitiesNotCalled): added test to ensure that HttpCapabilitiesBase.ConfigCapabilities() is not called during normal page processing if no files are in App_Browsers. * ControlAdapterTest.cs: added tests for ControlAdapter. ++ Test/System.Web.UI/ChangeLog (working copy) * PageTest.cs: add tests for using a PageAdapter. * ControlTest.cs: moved commented out ResolveAdapter_1 test to ../System.Web/AppBrowsersTest.cs. Fixed typo in test name. Added Customcontroladapter.Adapter property for use by AppBrowsersTest. ++ Test/System.Web.UI.WebControls.Adapters/ChangeLog (revision 0) * MenuAdapterTest.cs: added * WebControlAdapterTest.cs, HierarchicalDataBoundControlAdapterTest.cs, DataBoundControlAdapterTest.cs, HideDisabledControlAdapterTest.cs: added ++ Test/System.Web.UI.WebControls/ChangeLog (working copy) * MenuTest.cs (Menu_RenderStaticItems): added tests to check that result was the same when using the base MenuAdapter as when using no adapter. * MenuTest.cs (Menu_RenderStaticItemsWithAdapter): added test to ensure that MenuAdapter.RenderItem() is called. * HierarchicalDataBoundControlTest.cs, WebControlTest.cs, DataBoundControlTest.cs: added test for use of ControlAdapters when present. * WebControl.cs: added test for IsEnabled. ++ System.Web/ChangeLog (working copy) * HttpApplicationFactory.cs: Added support for detecting App_Browsers/*.browser files and using them to determine capabilities. Also restart the app if the App_Browsers, App_Code, or App_GlobalResources directories are created. * BrowserCapabilities.cs (TagWriter): get value via internal virtual GetTagWriter() method, which is overridden in nBrowser.Result. * HttpRequest.cs (BrowserMightHaveSpecialWriter, BrowserMightHaveAdapters): internal properties added to allow Page and Control methods to avoid accessing Request.Browser to get browser-specific HtmlTextWriters or ControlAdapters. Those things only exist when there are App_Browsers files. ++ System.Web.UI.Adapters/ChangeLog (working copy) * ControlAdapter.cs: made control field internal so derived internal classes can access it without using base.Control which can involved several typecasts. * PageAdapter.cs: implemented all members. * ControlAdapter.cs: implemented all members. * PageAdapter.cs, ControlAdapter.cs: add MonoTODO's. ++ System.Web.UI/ChangeLog (working copy) * Page.cs (SavePageControlState, LoadPageControlState): save/load adapter state in 2.0 profile. * Page.cs (CreateHtmlTextWriter): call Browser.CreateHtmlTextWriter() in 2.0 profile. * Page.cs (RenderPage): call CreateHtmlTextWriter() to get the writer in 2.0 profile. * Page.cs (DeterminePostBackMode, InitOutputCache, RenderClientScriptFormDeclaration, InternalProcessRequest, PageStatePersister): added support for PageAdapters. * Control.cs (Adapter, ResolveAdapter): implemented. Adapter calls ResolveAdapter and remembers result. ResolveAdapter checks for adapters of the Type hierarchy until it finds one. * Control.cs (SaveViewStateRecursive, LoadViewStateRecursive): save/load adapter state in 2.0 profile. * HtmlTextWriter.cs (BeginRender, EndRender): added empty virtual methods required by 2.0 profile. These are called by corresponding methods of System.Web.UI.Adapters.ControlAdapter. * Page.cs, Control.cs: don't access Request.Browser if it couldn't have any adapters/writers because there are no files in App_Browsers/. ++ Assembly/ChangeLog (working copy) * AssemblyInfo.cs: made InternalsVisibleTo System.Web.test_net_2_0.dll to support ControlAdapterTest.ConfigCapabilitiesNotCalled(). ++ ChangeLog (working copy) * System.Web_test.dll.sources: added System.Web.UI.WebControls.Adapters/MenuAdapterTest.cs System.Web.UI.WebControls.Adapters/WebControlAdapterTest.cs System.Web.UI.WebControls.Adapters/HierarchicalDataBoundControlAdapterTest.cs System.Web.UI.WebControls.Adapters/DataBoundControlAdapterTest.cs System.Web.UI.WebControls.Adapters/HideDisabledControlAdapterTest.cs System.Web.UI.Adapters/PageAdapterTest.cs System.Web.UI.Adapters/ControlAdapterTest.cs * Makefile (RESOURCE_FILES_2): added System.Web.Configuration_2.0/RandomRoboBotKeywords.txt * Makefile (TEST_RESOURCE_FILES): added Test/mainsoft/NunitWebResources/PageWithAdapter.aspx * System.Web.dll.sources: added System.Web.Configuration_2.0/CapabilitiesBuild.cs System.Web.Configuration_2.0/CapabilitiesChecksum.cs System.Web.Configuration_2.0/CapabilitiesResult.cs System.Web.Configuration_2.0/ICapabilitiesProcess.cs System.Web.Configuration_2.0/nBrowser/Result.cs System.Web.Configuration_2.0/nBrowser/NodeTypes.cs System.Web.Configuration_2.0/nBrowser/Identification.cs System.Web.Configuration_2.0/nBrowser/File.cs System.Web.Configuration_2.0/nBrowser/Build.cs System.Web.Configuration_2.0/nBrowser/Node.cs System.Web.Configuration_2.0/nBrowser/Exception.cs ++ System.Web.UI.WebControls.Adapters/ChangeLog (working copy) * WebControlAdapter.cs, HierarchicalDataBoundControlAdapter.cs, DataBoundControlAdapter.cs: changed to use ControlAdapter.control instead of using base.Control or using a new control field. * MenuAdapter.cs: added internal constructor that takes a Menu parameter. The constructor is used when writing unit tests. * MenuAdapter.cs (OnInit, OnPreRender, RenderBeginTag, RenderContents, RenderEndTag): delegate to base instead of Control. * MenuAdapter.cs (LoadAdapterControlState, SaveAdapterControlState, RaisePostBackEvent, RenderItem): implemented. * WebControlAdapter.cs (RenderContents): changed to call control.RenderContents() instead of control.Render(). * WebControlAdapter.cs, HierarchicalDataBoundControlAdapter.cs, DataBoundControlAdapter.cs, HideDisabledControlAdapter.cs: added internal constructor that takes a parameter of the corresponding Control type. The construct is used when writing unit tests. ++ System.Web.Configuration_2.0/ChangeLog (working copy) * nBrowser/Result.cs, nBrowser/NodeTypes.cs, nBrowser/Identification.cs, nBrowser/File.cs, nBrowser/Build.cs, nBrowser/Node.cs, nBrowser/Exception.cs: added. The code under nBrowser handles *.browser files. It is based on Owen "Ocean" Brady's code, with the following changes and improvements. Replaced Result.Adapter property with AdapterTypeMap property which maps control Type to adapter Type. Added Result.MarkupTextWriter property. Added overrides for Result.GetAdapters and Result.GetTagWriter to return MarkupTextWriter and AdapterTypeMap, resp. Changed tree building algorithm to not depend on nodes with id="Default" and to inject defaultBrowser nodes as parents of regular nodes with the same ids. Changed Node.cs to use Item instead of Add when adding a capability or sample header, so that values get replaced instead of appended. Added support for reference nodes (ie. nodes with refID="someID"). * CapabilitiesResult.cs: load RandomRoboBotKeywords.txt resource using the correct name. * RandomRoboBotKeywords.txt: added * HttpCapabilitiesBase.cs (CreateHtmlWriter, Adapters): Added support for *.browsers. Adapters property calls internal virtual GetAdapters() method which is overrided in nBrowser.Result returned by nBrowser code. CreateHtmlWriter uses type specified by TagWriter property. ++ System.Web.UI.WebControls/ChangeLog (working copy) * DetailsView.cs, ListControl.cs, DataBoundControl.cs, FormView.cs, HierarchicalDataBoundControl.cs, WebControl.cs: added support for using ControlAdapters when present. * WebControl.cs: fixed implementation of IsEnabled to match documentation. * Menu.cs (RenderMenuBody): call Adapter.RenderItem() instead of RenderMenuItem() if an adapter is present. MenuAdapter.RenderItem() calls back to new Menu.RenderItem() internal method which calls RenderMenuItem() with the appropriate parameters. ++ System.Web.Configuration/ChangeLog (working copy) * HttpCapabilitiesBase.cs: changed to use nBrowser for *.browser support. Also added internal GetConfigCapabilities_called flag used by ControlAdapterTest.ConfigCapabilitiesNotCalled() to test that GetConfigCapabilities() is not called during normal page processing when there are no files in App_Browsers/. svn path=/trunk/mcs/; revision=97824
180 lines
5.2 KiB
C#
180 lines
5.2 KiB
C#
//
|
|
// System.Web.UI.Adapters.PageAdapter
|
|
//
|
|
// Author:
|
|
// Dick Porter <[email protected]>
|
|
//
|
|
// Copyright (C) 2005 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
|
|
// "Software"), to deal in the Software without restriction, including
|
|
// without limitation the rights to use, copy, modify, merge, publish,
|
|
// distribute, sublicense, and/or sell copies of the Software, and to
|
|
// permit persons to whom the Software is furnished to do so, subject to
|
|
// the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be
|
|
// included in all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
//
|
|
|
|
#if NET_2_0
|
|
using System.Web.UI;
|
|
using System.Web.UI.WebControls;
|
|
using System.Collections;
|
|
using System.Collections.Specialized;
|
|
|
|
namespace System.Web.UI.Adapters
|
|
{
|
|
public abstract class PageAdapter : ControlAdapter
|
|
{
|
|
protected PageAdapter ()
|
|
{
|
|
}
|
|
|
|
internal PageAdapter (Page p) : base (p)
|
|
{
|
|
}
|
|
|
|
public virtual StringCollection CacheVaryByHeaders {
|
|
get { return null; }
|
|
}
|
|
|
|
public virtual StringCollection CacheVaryByParams {
|
|
get { return null; }
|
|
}
|
|
|
|
protected string ClientState
|
|
{
|
|
get {
|
|
return Page.GetSavedViewState ();
|
|
}
|
|
}
|
|
|
|
public virtual NameValueCollection DeterminePostBackMode ()
|
|
{
|
|
return Page.DeterminePostBackMode ();
|
|
}
|
|
|
|
public virtual ICollection GetRadioButtonsByGroup (string groupName)
|
|
{
|
|
if (radio_button_group == null)
|
|
return new ArrayList();
|
|
ArrayList radioButtons = (ArrayList) radio_button_group [groupName];
|
|
if (radioButtons == null)
|
|
return new ArrayList();
|
|
return radioButtons;
|
|
}
|
|
|
|
public virtual PageStatePersister GetStatePersister ()
|
|
{
|
|
return new HiddenFieldPageStatePersister ((Page)Control);
|
|
}
|
|
|
|
public virtual void RegisterRadioButton (RadioButton radioButton)
|
|
{
|
|
if (radio_button_group == null)
|
|
radio_button_group = new ListDictionary();
|
|
ArrayList radioButtons = (ArrayList) radio_button_group [radioButton.GroupName];
|
|
if (radioButtons == null)
|
|
radio_button_group [radioButton.GroupName] = radioButtons = new ArrayList();
|
|
if (!radioButtons.Contains(radioButton))
|
|
radioButtons.Add(radioButton);
|
|
}
|
|
|
|
public virtual void RenderBeginHyperlink (HtmlTextWriter w,
|
|
string targetUrl,
|
|
bool encodeUrl,
|
|
string softKeyLabel)
|
|
{
|
|
InternalRenderBeginHyperlink (w, targetUrl, encodeUrl, softKeyLabel, null);
|
|
}
|
|
|
|
public virtual void RenderBeginHyperlink (HtmlTextWriter w,
|
|
string targetUrl,
|
|
bool encodeUrl,
|
|
string softKeyLabel,
|
|
string accessKey)
|
|
{
|
|
if (accessKey != null && accessKey.Length > 1)
|
|
throw new ArgumentOutOfRangeException("accessKey");
|
|
InternalRenderBeginHyperlink (w, targetUrl, encodeUrl, softKeyLabel, accessKey);
|
|
}
|
|
|
|
void InternalRenderBeginHyperlink (HtmlTextWriter w,
|
|
string targetUrl,
|
|
bool encodeUrl,
|
|
string softKeyLabel,
|
|
string accessKey)
|
|
{
|
|
w.AddAttribute (HtmlTextWriterAttribute.Href, targetUrl, encodeUrl);
|
|
if (accessKey != null)
|
|
w.AddAttribute (HtmlTextWriterAttribute.Accesskey, accessKey);
|
|
w.RenderBeginTag (HtmlTextWriterTag.A);
|
|
}
|
|
|
|
|
|
public virtual void RenderEndHyperlink (HtmlTextWriter w)
|
|
{
|
|
w.RenderEndTag();
|
|
}
|
|
|
|
public virtual void RenderPostBackEvent (HtmlTextWriter w,
|
|
string target,
|
|
string argument,
|
|
string softKeyLabel,
|
|
string text)
|
|
{
|
|
RenderPostBackEvent (w, target, argument, softKeyLabel, text, Page.Request.FilePath, null, true);
|
|
}
|
|
|
|
public virtual void RenderPostBackEvent (HtmlTextWriter w,
|
|
string target,
|
|
string argument,
|
|
string softKeyLabel,
|
|
string text,
|
|
string postUrl,
|
|
string accessKey)
|
|
{
|
|
RenderPostBackEvent (w, target, argument, softKeyLabel, text, postUrl, accessKey, true);
|
|
}
|
|
|
|
protected void RenderPostBackEvent (HtmlTextWriter w,
|
|
string target,
|
|
string argument,
|
|
string softKeyLabel,
|
|
string text,
|
|
string postUrl,
|
|
string accessKey,
|
|
bool encode)
|
|
{
|
|
string url = String.Format ("{0}?__VIEWSTATE={1}&__EVENTTARGET={2}&__EVENTARGUMENT={3}&__PREVIOUSPAGE={4}",
|
|
postUrl, HttpUtility.UrlEncode (Page.GetSavedViewState ()), target, argument, Page.Request.FilePath);
|
|
RenderBeginHyperlink (w, url, encode, softKeyLabel, accessKey);
|
|
w.Write(text);
|
|
RenderEndHyperlink(w);
|
|
}
|
|
|
|
public virtual string TransformText (string text)
|
|
{
|
|
return text;
|
|
}
|
|
|
|
protected internal virtual string GetPostBackFormReference (string formID)
|
|
{
|
|
return String.Format("document.forms['{0}']", formID);
|
|
}
|
|
|
|
private ListDictionary radio_button_group;
|
|
}
|
|
}
|
|
#endif
|