Commit Graph
45 Commits
Author SHA1 Message Date
Alexander Köplinger 98cf04084a [bcl] Remove NET_4_0 defines from class libs
NET_4_0 is always defined now, so the ifdefs are redundant.
I verified the libs are exactly the same after this change, so this is effectively a no-op.
2015-07-26 15:01:49 +02:00
Alexander Köplinger 746650d1b9 [bcl] Remove more NET_2_0 checks from class libs 2015-01-17 05:45:39 +01:00
Marek Safar d82dda826c Fixed more missing protected internal modifiers 2011-01-10 08:45:01 +00:00
Marek Habersack f1d69fd4bc [asp.net] Menu 4.0 List mode rendering 2010-09-10 15:36:08 +02:00
Marek Habersack f450da9e65 2010-07-22 Marek Habersack <[email protected]>
* MenuRenderingMode.cs: added (4.0)

	* Menu.cs: added the IncludeStyleBlock and RenderingMode 4.0
	properties (not used in the code yet).

svn path=/trunk/mcs/; revision=160723
2010-07-22 10:38:45 +00:00
Marek Habersack 23d67b3f07 2010-07-14 Marek Habersack <[email protected]>
* Menu.cs: fixed skip link rendering (no child controls are added
	in the process, writing directly to HtmlTextWriter). Fixes tests
	for 4.0
	If StaticSubMenuIndent equals Unit.Empty on 4.0, default to using
	16px as the value of the margin-left CSS attribute.

Fixed all failing tests (both 2.0 and 4.0)

svn path=/trunk/mcs/; revision=160369
2010-07-14 15:55:09 +00:00
Marek Habersack 6d0b03285c 2010-07-07 Marek Habersack <[email protected]>
* TreeView.cs:
	When using registered CSS classes, the node style must use them in
	reverse order.

More 4.0 test updates (disabled some Menu tests until its rendering is updated)

svn path=/trunk/mcs/; revision=160003
2010-07-07 13:04:50 +00:00
Marek Habersack a670985119 2010-07-07 Marek Habersack <[email protected]>
* TreeView.cs: 4.0 rendering changes.

Another batch of 4.0 test updates

svn path=/trunk/mcs/; revision=159996
2010-07-07 11:29:23 +00:00
Marek Habersack d8838a6414 This commit introduces a few 4.0 rendering changes which break some tests. The broken tests
fail to work on .NET 4.0 as well, for the most part. I will fix them next week.

    2010-07-02  Marek Habersack  <[email protected]>

    	* TemplateControlParser.cs: added support for ClientIDMode
    	property

    	* Control.cs: implemented 4.0 features - ClientIDMode and
    	RenderingCompatibility.

    	* ClientIDMode.cs, IDataKeysControl.cs: added

    2010-07-02  Marek Habersack  <[email protected]>

    	* Menu.cs: 4.0 API updates.

    	* GridView.cs: implemented 4.0 properties -
    	SortedAscendingCellStyle, SortedAscendingHeaderStyle,
    	SortedDescendingCellStyle, SortedDescendingHeaderStyle,
    	ClientIDRowSuffix, ClientIDRowSuffixDataKeys, ShowHeaderWhenEmpty
    	along with associated rendering changes.

    	* DetailsView.cs, FormView.cs, GridView.cs: 4.0 API changes -
    	renamed ShowPage to SetPageIndex and made it public.
    	Added 4.0 interfaces to inheritance list and implemented them.

    	* DataKeyArray.cs: added internal constructor which accepts IList
    	instead of ArrayList. Changed the 'keys' field type to IList.

    	* ContainedTable.cs: the 'id' attribute must be rendered last.

    	* CheckBox.cs, CheckBoxList.cs, SiteMapPath.cs, Table.cs,
    	TableStyle.cs, TextBox.cs, WebControl.cs: 4.0 rendering changes.

    	* Calendar.cs, CompositeControl.cs, DropDownList.cs, HyperLink.cs,
    	Image.cs, ImageButton.cs, Label.cs, LinkButton.cs, LoginName.cs,
    	Panel.cs, Table.cs, TableCell.cs, TableRow.cs:
    	added new 4.0 property, SupportsDisabledAttribute.

    2010-07-02  Marek Habersack  <[email protected]>

    	* VersionConverter.cs: added support for checking whether the
    	passed version is equal or more than a specified minimal version.

    	* PagesSection.cs: added two 4.0 properties - ClientIDMode and
    	ControlRenderingCompatibilityVersion

    2010-07-02  Marek Habersack  <[email protected]>

    	* TemplateControlCompiler.cs: added support for ClientIDMode 4.0
    	property

    	* PageCompiler.cs, UserControlCompiler.cs: AddStatementsToInitTop
    	must call the base implementation.

svn path=/trunk/mcs/; revision=159826
2010-07-02 19:12:31 +00:00
Marek Habersack 7e02dfbdc9 Fixes to a bunch of unit tests which would fail when running on .NET and few updates to
our system.web controls.

svn path=/trunk/mcs/; revision=159495
2010-06-24 12:55:00 +00:00
Marek Habersack 104d165458 - Added VS2008 projects to compile test assemblies
- All resources are named the same on .NET and Mono for test assemblies
- Prepared SystemWebTestShim to work on .NET (to the extent it is possible)
- System.Web.Util made public when compiling tests in VS2008

svn path=/trunk/mcs/; revision=143511
2009-10-06 14:12:28 +00:00
Marek Habersack bc0513683f set svn:eol-style to native and converted several files to unix line ending
svn path=/trunk/mcs/; revision=124209
2009-01-22 14:52:09 +00:00
Marek Habersack 0caa6e73fd Disabled tests failing because of nunit 2.4 issue
svn path=/trunk/mcs/; revision=124121
2009-01-21 22:48:32 +00:00
Noam Lampert 80dd505236 Fixes for Java compilations:
1. Upgrade project/solution files to visual studio 2008
2. In Grasshopper, the InternalVisible attribute in System.Web doesn't work, so need to compile without using the internals of System.Web.

svn path=/trunk/mcs/; revision=100539
2008-04-13 07:44:03 +00:00
Dean Brettle 23000b3144 ++ Test/mainsoft/ChangeLog (working copy)
* 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
2008-03-09 22:55:22 +00:00
Igor Zelmanovich 676b57792a 2007-05-07 Igor Zelmanovich <[email protected]>
* MenuItem.cs: fixed: 
	when 'Value' property is not set, value of 'Text' property is used 
	instead and vice versa.

	* MenuTest.cs:
	new tests were added.	

svn path=/trunk/mcs/; revision=76809
2007-05-07 08:49:07 +00:00
Igor Zelmanovich 35e26b26be 2007-02-28 Igor Zelmanovich <[email protected]>
* MenuItemCollection.cs:
	fixed Save/Load viewstate. 


svn path=/trunk/mcs/; revision=73562
2007-02-28 15:45:53 +00:00
Igor Zelmanovich 79800cd52f fixed tests
svn path=/trunk/mcs/; revision=73473
2007-02-27 15:20:06 +00:00
Igor Zelmanovich 5f1c0bef03 2006-12-17 Igor Zelmanovich <[email protected]>
* SiteMapPathTest.cs: added NotWorking attribute.
	* MenuTest.cs: fixed tests.

svn path=/trunk/mcs/; revision=69588
2006-12-17 09:18:27 +00:00
Yoni Klain bd9b16e99a MenuTest.cs added new test.
svn path=/trunk/mcs/; revision=69390
2006-12-12 12:02:44 +00:00
Igor Zelmanovich 43f55c53ed 2006-12-10 Igor Zelmanovich <[email protected]>
* Menu.cs: fixed: rendering.


svn path=/trunk/mcs/; revision=69276
2006-12-10 15:26:41 +00:00
Yoni Klain 907ba25442 2006-12-06 Yoni Klain <[email protected]>
* MenuTest.cs;GridViewTest.cs;CustomValidatorTest.cs;  
  changes for 2.0 definition and category repaired.

svn path=/trunk/mcs/; revision=69105
2006-12-06 15:52:40 +00:00
Igor Zelmanovich 07ed73dc4a 2006-11-29 Igor Zelmanovich <[email protected]>
* CreateUserWizardTest.cs: fixed NunitWeb tests.
	* DetailsViewTest.cs: fixed NunitWeb tests.
	* FormParameterTest.cs: fixed NunitWeb tests.
	* FormViewTest.cs: fixed NunitWeb tests.
	* MenuTest.cs: fixed NunitWeb tests.
	* WizardStepBaseTest.cs: fixed NunitWeb tests.
	* XmlDataSourceTest.cs: fixed NunitWeb tests.
	* PageTest.cs: fixed NunitWeb tests.
	* FormsAuthenticationTest.cs: fixed NunitWeb tests.
	* StaticSiteMapProviderTest.cs: fixed NunitWeb tests.


svn path=/trunk/mcs/; revision=68673
2006-11-29 17:10:08 +00:00
Igor Zelmanovich 8e795e5ab3 2006-11-01 Igor Zelmanovich <[email protected]>
* MenuTest.cs: removed NotWorking attributes
			

svn path=/trunk/mcs/; revision=67220
2006-11-01 16:38:53 +00:00
Yoni Klain 7c74bb2430 Tests changed for run-tests-ondotnet task, and needed categodies added.
svn path=/trunk/mcs/; revision=66989
2006-10-26 12:04:44 +00:00
Igor Zelmanovich faf0338a03 corrected rendering of static and dynamic items
svn path=/trunk/mcs/; revision=64251
2006-08-23 15:32:14 +00:00
Igor Zelmanovich e34993e155 OnBubleEvent works properly - controls like Button, LinkButton nested into template can raise MenuItemClick event
ViewState of Items saved and restored properly.

svn path=/trunk/mcs/; revision=63762
2006-08-15 14:06:27 +00:00
Igor Zelmanovich 3f057c146e new tests were added
svn path=/trunk/mcs/; revision=63749
2006-08-15 09:08:42 +00:00
Igor Zelmanovich 328071955e fixed data binding feature:
ensure that items initialization occurs only once

svn path=/trunk/mcs/; revision=63710
2006-08-14 07:48:02 +00:00
Igor Zelmanovich 91e64779db fixed databinding feature
svn path=/trunk/mcs/; revision=63580
2006-08-10 11:33:41 +00:00
Vladimir Krasnov 1d6ae4f999 * WizardStepBaseTest.cs, MasterPageTest.cs, MenuTest.cs, GridViewTest.cs: removed NotWorking attributes
svn path=/trunk/mcs/; revision=63173
2006-07-31 12:13:26 +00:00
Yoni Klain 94301371da svn path=/trunk/mcs/; revision=62376 2006-07-09 11:33:27 +00:00
Yoni Klain b6820c3226 svn path=/trunk/mcs/; revision=62345 2006-07-07 09:42:19 +00:00
Andrew Skiba 5160ba326b NunitWeb test framework major API refactoring; downport to net 1.1
svn path=/trunk/mcs/; revision=61910
2006-06-21 15:57:20 +00:00
Andrew Skiba ad4b00470d Add the value of Menu.CssClass to the table class
svn path=/trunk/mcs/; revision=61691
2006-06-14 06:51:10 +00:00
Andrew Skiba 7471aaa23c sleep before AppDomain.Unload (workaround)
svn path=/trunk/mcs/; revision=61455
2006-06-05 13:27:01 +00:00
Andrew Skiba 874c468eaf rename methods to make nunit quiet
svn path=/trunk/mcs/; revision=61211
2006-05-28 14:44:59 +00:00
Andrew Skiba 940db06cba nunitweb framework works on mono
svn path=/trunk/mcs/; revision=61206
2006-05-28 12:46:08 +00:00
Yoni Klain d8f80f6e56 svn path=/trunk/mcs/; revision=60939 2006-05-22 12:13:10 +00:00
Yoni Klain 581e95b365 svn path=/trunk/mcs/; revision=60936 2006-05-22 09:18:32 +00:00
Yoni Klain 981b07d189 svn path=/trunk/mcs/; revision=60917 2006-05-21 12:50:18 +00:00
Andrew Skiba 0129196014 fix typo
svn path=/trunk/mcs/; revision=60786
2006-05-17 16:05:00 +00:00
Andrew Skiba a447f0e645 rename methods so nunit does not try to run them as tests
svn path=/trunk/mcs/; revision=60784
2006-05-17 15:50:22 +00:00
Andrew Skiba 5145ff594e NunitWeb category works with make run-test-ondotnet
svn path=/trunk/mcs/; revision=60783
2006-05-17 15:16:59 +00:00
Yoni Klain 316383ff68 svn path=/trunk/mcs/; revision=60686 2006-05-14 14:30:55 +00:00