This reverts commit ed11296c51.
When a ThreadAbortException is thrown during request processing in AsyncRun () the _done.Set () call is not executed.
This then results in a deadlock because _done.WaitOne () doesn't get signaled and waits forever.
One solution would be enclosing the _done.Set () in a finally clause, but even then we'd need to relaunch the AsyncRun () loop to be in a usable state.
A simpler solution is to revert the commit that introduced the AsyncRun () in the first place, as it doesn't seem necessary now (the tests pass just fine without it).
The test that was disabled in 429cdf17cf is reenabled too, as it wasn't the culprit of the problem.
WebTest is now a partial class and every code outside System.Web that uses it can copy its own
resources in addition to the common ones by implementing the CopyResourcesLocal partial method.
When running the tests on the 4.0 profile, the configuration must no longer include
the System.Web.Extensions section declarations as they are merged with machine.config right now.
* AssemblyInfo.cs: this assembly should be signed with winfx.pub
2010-05-15 Marek Habersack <[email protected]>
* HttpResponse.cs: added internal Context property
* HttpRequest.cs: added a setter to the internal Context property
* HttpContext.cs: set request and response Context properties to
'this' in the constructor.
2010-05-15 Marek Habersack <[email protected]>
* Control.cs: implemented 4.0 GetRouteUrl overloads and
GetUniqueIDRelativeTo
2010-05-15 Marek Habersack <[email protected]>
* RouteValueExpressionBuilder.cs: added
* RouteUrlExpressionBuilder.cs: implemented
svn path=/trunk/mcs/; revision=157378
* Control.cs: control cache must be filled using the local
_controls collection instead of the virtual Controls
property. Fixes bug #594238
Check if _controls isn't null before using it.
2010-04-07 Marek Habersack <[email protected]>
* ControlTest.cs: added test for bug #594238
2010-04-07 Marek Habersack <[email protected]>
* Makefile: moved App_* test resources to separate variables -
whatever is contained in those variables is preprocessed before
embedding as resource to include appropriate resource name prefix
(App_Code/, App_GlobalResources/ for now). This is used in WebTest
to automatically populate the relevant directories when running
the test suite.
2010-04-07 Marek Habersack <[email protected]>
* WebTest.cs: introduced concept of prefixed resources and added
an API which handles them - CopyPrefixedResources. All the
manifest resource names are checked for match with the given
prefix, and all the matching ones are copied to the specified
subdirectory of the test directory.
svn path=/trunk/mcs/; revision=154948
* TemplateControlCompiler.cs: GetConverterForMember now completely
relies on TypeDescriptor and description providers to retrieve
converter for a property. Fixes bug #578586
If UrlPropertyAttribute is found for a member,
GetExpressionFromString uses the preconverted value, if any, as
parameter to HandleUrlProperty.
svn path=/trunk/mcs/; revision=152040
* AppResourcesCompiler.cs: explicitly dispose all the streams and
readers+writers in CompileResource.
2010-02-11 Marek Habersack <[email protected]>
* Web.config, Web.mono.config: added test role manager
definition.
2010-02-11 Marek Habersack <[email protected]>
* RolesTest.cs: added a test for IsUserInRole. Patch from Tiaan
Geldenhuys <[email protected]>, thanks!
2010-02-11 Marek Habersack <[email protected]>
* Roles.cs: IsUserInRole checks if username is null or empty
before attempting to use it. Patch from Tiaan Geldenhuys
<[email protected]>. thanks!
2010-02-11 Marek Habersack <[email protected]>
* System.Web_test.dll.sources: added
mainsoft/NunitWeb/NunitWeb/TestRoleProvider.cs
2010-02-11 Marek Habersack <[email protected]>
* WebTest.cs: test environment setup enhancements. Contributed by
Tiaan Geldenhuys <[email protected]>, thanks!
* TestRoleProvider.cs: added. Contributed by Tiaan Geldenhuys
<[email protected]>, thanks!
svn path=/trunk/mcs/; revision=151519
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWebResources/App_GlobalResources/Resource1.resx
and
Test/mainsoft/NunitWebResources/TagWithExpressionWithinAttribute.aspx
2010-01-19 Marek Habersack <[email protected]>
* TemplateControlCompilerTest.cs: added test for bug #568631
2010-01-19 Marek Habersack <[email protected]>
* AspGenerator.cs: modified the runatServer regex to correctly
match embedded server tags which end in a sequence like: "%>"/>
Fixes bug #568631
svn path=/trunk/mcs/; revision=149855
* Assembly.cs: GetSatelliteAssembly must catch
AppDomain.LoadSatellite FileNotFoundException and attempt to load
satellites from subdirectories of current assembly's
directory. Fixes bug #548768
2009-11-03 Marek Habersack <[email protected]>
* AppResourcesCompiler.cs: put default culture resources in a
separate collection, exposed by the DefaultCultureFiles property.
* AppResourcesAssemblyBuilder.cs: compile the default assembly
before the satellite ones. Use the default assembly as template
for generation of the satellite ones.
svn path=/trunk/mcs/; revision=145280
- 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
* HostingEnvironment.cs: MapPath checks if HttpContext.Request
actually exists before using it.
2009-09-07 Marek Habersack <[email protected]>
* XmlSiteMapProviderTest.cs: added
* StaticSiteMapProviderTest.cs: added test for FindSiteMapNode
2009-09-07 Marek Habersack <[email protected]>
* XmlSiteMapProvider.cs: do not allow the provider to be
intialized more than once.
Initialize throws if it finds unknown attributes in the
'attributes' collection.
AddNode checks its arguments and throws if they are null or aren't
from the same provider.
FindStartingNode throws exceptions in several erroneous situations
now.
Added private method GetConfigDocument which performs several
checks on the source .sitemap file and throws exceptions if it
finds any errors.
BuildSiteMap clears provider state before building the map.
BuildSiteMapRecursive correctly deals with custom providers. Fixes
bug #465696
FindSiteMapNode maps url before searching. Fixes bug #465696
* VirtualPathUtility.cs: Combine a bit more efficient
* StaticSiteMapProvider.cs: FindSiteMap node checks if rawUrl is
relative to application root and if yes, makes it absolute.
MapUrl converts both rooted and not rooted urls to absolute.
* SiteMapProvider.cs: check if HttpContext.Request exists before
using it in FindSiteMapnode
* SiteMap.cs: Providers collection must be read-only.
2009-09-07 Marek Habersack <[email protected]>
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWeb/NunitWeb/Resources/sub_map_01.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_01.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_02.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_03.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_04.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_05.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_06.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_07.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_08.sitemap
Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_09.sitemap
2009-09-07 Marek Habersack <[email protected]>
* Tests/TestSiteMapProvider.cs: added
svn path=/trunk/mcs/; revision=141420
* DynamicControlTest.cs: added tests for ApplyFormatInEditMode,
Column, ConvertEmptyStringToNull, CssClass, DataField,
DataFormatString, FieldTemplate, Table, UIHint
2009-07-08 Marek Habersack <[email protected]>
* WebTest.cs: added new public property - TestBaseDir, to be used
by code which needs to access the files in the work dir.
2009-07-08 Marek Habersack <[email protected]>
* TestsSetup.cs: added the BuildPath helper method which converts
unix-style filesystem paths to the os-specific format.
svn path=/trunk/mcs/; revision=137568
* WebTestResourcesSetupAttribute.cs: added. Can be used to specify
resources setup method alternative to the default
WebTest.CopyResources (). Useful in cases when WebTest is used
outside System.Web tests and different initial resources are
required.
* WebTest.cs: check whether the assembly WebTest is found in is
decorated with the WebTestResourcesSetup attribute and, if yes,
use handler specified by the attribute to perform initial
resources copying in EnsureHosting ().
svn path=/trunk/mcs/; revision=137334
* Makefile (net_2_0_dirs): added System.Web - it now depends on
System.Core, so it needs to be recompiled one more time after
System.Core is done.
2009-01-22 Marek Habersack <[email protected]>
* System.Web.dll.sources: added
System.Web.Compilation/BuildManagerCacheItem.cs,
System.Web.Compilation/BuildManagerDirectoryBuilder.cs,
System.Web.Compilation/BuildProviderGroup.cs
* Makefile (SYSTEMCORE_DEP): added. Defines SYSTEMCORE_DEP on the
mcs command line when System.Core is present.
Added the DEVEL define, which defines DEVEL on the mcs command
line. This is used to conditionally compile development helper code in
System.Web.Util.FileUtils (and possibly other stuff later on)
2009-01-22 Marek Habersack <[email protected]>
* XsdBuildProvider.cs: added missing BuildProviderAppliesTo
attribute.
* BuildProvider.cs: added new internal virtual method,
ExtractDependencies() whose purpose is to extract virtual path
dependencies without compiling the code, if possible.
* TemplateBuildProvider.cs: implemented the new
ExtractDependencies () method which uses regular expressions to
extract file dependencies from the source without having to
compile the file.
* CompilationException.cs: added a new public property, Results,
which returns the compilation results.
* BuildProviderGroup.cs: added. A simple class descending from
List <BuildProvider> which is used to hold a compilation batch -
that is a collection of BuildProvider instances.
* BuildManagerDirectoryBuilder.cs: new class which takes care of
generating compilation batches for the requested virtual path. A
set of batches is generated from files found in the same virtual
directory as the requested virtual path and all of the
dependencies of those files. All files are grouped in batches
within which no file depends upon its siblings. An attempt is made
to sort the batches from the "least dependent" to the "most
dependent" batches - i.e. the batches which do not depend on other
batches go to the top.
Code generating the batches now correctly detects dependency loops
and throws an exception when one is encountered.
Batches are represented as instances of a new class -
BuildProviderGroup.
* BuildManagerCacheItem.cs: added. Contains all the compilation
result information needed by BuildManager. See below.
* BuildManager.cs: complete batch building rewrite:
- only one build lock is held instead of a set of compilation
tickets. Only one thread can compile anything at one given
time.
- retrieving types from the build cache now uses a slim rw lock,
so that readers aren't blocked while compilation is in
progress. Writer lock is acquired only when adding a newly
compiled type to the build cache and when removing it after its
dependencies made it invalid.
- assembly references for each compilation are now collected
dynamically as the source is being compiled, this removed a lot
of complexity in dealing with assembles containing conflicting
types. As a consequence right now there may exist several
loaded assemblies containing the same type, but only the latest
of them will be used in new compiles.
- the thread compiling code can recurse into the Build method
which causes the recursively referenced code to be compiled
into a separate, uniquely named, assembly. This deals with all
recursion loops and dependency problems.
- automatic app domain restart after a certain number of compiles
is enabled now.
- improved compilation error handling. If a compilation error
occurs, the code attempts to recompile the assembly up to 3
times, each time removing from the batch the files/virtual
paths which failed parsing/compilation. If the attempts failed,
another one is made to compile only the virtual path requested
by the calling code. Only should that fail a compilation
exception is thrown. All the compilation errors are written to
stdout if the application is in the debug mode.
- changed assembly naming. It now generates assembly names based
on whether the compilation is recursive and whether the batch
being compiled contains more than one code unit or
not.
- compilation results are now stored in the cache as instances of
the new BuildManagerCacheItem class, which contains all the
information required by BuildManager to return types,
assemblies, dependencies etc.
- GetReferencedAssemblies now correctly returns only the
assemblies defined in the .config files.
- GetVirtualPathDependencies does not need to compile code
anymore in order to extract virtual path dependencies. New code
in BuildProvider.ExtractDependencies () takes care of that.
- a BuildManagerDirectoryBuilder class instance is used to
generate compilation batches.
* AssemblyBuilder.cs: added support for keeping track of which
code unit was generated by which BuildProvider andr which
BuildProvider produced a given source file. Both changes serve the
purpose of dealing with compilation errors in BuildManager.
* ApplicationFileBuildProvider.cs: added missing
BuildProviderAppliesTo attribute
2009-01-22 Marek Habersack <[email protected]>
* FileUtils.cs: added two conditionally compiled methods (they
require DEVEL to be defined) which output lines to a log file.
2009-01-22 Marek Habersack <[email protected]>
* WebTest.cs: Run () sets the internal field
BuildManager.suppressDebugModeMessages to true.
2009-01-22 Marek Habersack <[email protected]>
* Web.mono.config: added numRecompilesBeforeAppRestart attribute
to the compilation element, set to 100000, to avoid appdomain
restarts during tests.
svn path=/trunk/mcs/; revision=124179
* NunitWeb/Makefile (NunitWeb.dll): added NunitWeb/CustomSection.cs
* NunitWebResources/CustomSectionEmptyCollection.aspx: added
2008-12-23 Marek Habersack <[email protected]>
* WebConfigurationManagerTest.cs: added new test.
2008-12-23 Marek Habersack <[email protected]>
* CustomSection.cs: added. Implementation of custom configuration
elements for WebConfigurationManager tests.
2008-12-23 Marek Habersack <[email protected]>
* Web.mono.config: added CustomTags section definition, used in
WebConfiguratioManager tests.
2008-12-23 Marek Habersack <[email protected]>
* WebConfigurationManager.cs: GetSection should call
OpenWebConfiguration using the actual directory path, not a file
path. If it fails to do so, System.Configuration may treat the
top-level Web.config file as a child one which, in turn, in
certain circumstances will lead to duplicate keys inserted in
collections.
2008-12-23 Marek Habersack <[email protected]>
* Makefile (TEST_RESOURCE_FILES): added Test/mainsoft/NunitWebResources/CustomSectionEmptyCollection.aspx
* System.Web_test.dll.sources: added mainsoft/NunitWeb/NunitWeb/CustomSection.cs
svn path=/trunk/mcs/; revision=122024
* Makefile (TEST_RESOURCE_FILES): added
Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1
2008-12-02 Marek Habersack <[email protected]>
* WebTest.cs: for 1.1, copy the Web.mono.config.1.1 resource
2008-12-02 Marek Habersack <[email protected]>
* Web.config: added ASP.NET AJAX 1.0 configuration entries
* Web.config.1.1: copied from the last revision before the above
changes, so that 1.1 tests don't fail.
* Web.mono.config.1.1: copied from revision before the AJAX
changes below, so that 1.1 tests don't fail.
svn path=/trunk/mcs/; revision=120442
* WebTest.cs: made the Host property internal. It is used to
access the host's application domain when necessary in some
tests.
* MyTemplateControls.cs: added
2008-10-09 Marek Habersack <[email protected]>
* NunitWebResources/TemplateControlParsingTest.aspx: added
2008-10-09 Marek Habersack <[email protected]>
* TemplateControlCompilerTest.cs: compile the file on 1.1 as well.
Added a test for template parsing in compound controls.
svn path=/trunk/mcs/; revision=115324
* MasterPage.cs: decouple processing of content templates in
CreateMasterPage from checking whether all the content place
holder ids are defined. Fixes bug #325114
2008-07-28 Marek Habersack <[email protected]>
* StandardUrl.cs: added a new standard url -
PAGE_WITH_MASTER_INVALID_PLACE_HOLDER.
2008-07-28 Marek Habersack <[email protected]>
* MyPageWithMasterInvalidPlaceHolder.aspx: added
2008-07-28 Marek Habersack <[email protected]>
* MasterPageTest.cs: added a test for situations when a page tries
to use a content place holder not defined in the associated master
page (bug #325114)
2008-07-28 Marek Habersack <[email protected]>
* NunitWeb/Makefile (NunitWeb.dll): added dependency on
NunitWeb/Resources/MyPageWithMasterInvalidPlaceHolder.aspx, it is
also included in the resources.
svn path=/trunk/mcs/; revision=108975