[asp.net] Test suite configuration updates for 4.0

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.

mcs/class/System.Web/Makefile

@@ -95,7 +95,7 @@ TEST_RESOURCE_FILES = \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config \
-	Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1 \
+	Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.4.0 \
 	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 \

mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config

 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <configSections>
-		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
-				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="Everywhere"/>
-					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
-					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
-				</sectionGroup>
-			</sectionGroup>
-		</sectionGroup>
-	</configSections>
-
   <appSettings>
     <add key="strvalue" value="str" />
     <add key="intvalue" value="123" />
@@ -24,24 +11,16 @@
           </providers>
       </siteMap>
     <compilation debug="true" batch="false">
-	<assemblies>
-		<add assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-	</assemblies>
+
     </compilation>
 
 
 
     <httpHandlers>
       <add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />
-      <remove verb="*" path="*.asmx"/>
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
     <pages enableSessionState="false">
-			<controls>
-				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-			</controls>
+
     </pages>
     <membership defaultProvider="FakeProvider">
       <providers>
@@ -61,36 +40,6 @@
       </providers>
     </roleManager>
   </system.web>
-	<system.web.extensions>
-		<scripting>
-			<webServices>
-				<!-- Uncomment this line to customize maxJsonLength and add a custom converter -->
-				<!--
-      <jsonSerialization maxJsonLength="500">
-        <converters>
-          <add name="ConvertMe" type="Acme.SubAcme.ConvertMeTypeConverter"/>
-        </converters>
-      </jsonSerialization>
-      -->
-				<!-- Uncomment this line to enable the authentication service. Include requireSSL="true" if appropriate. -->
-				<!--
-        <authenticationService enabled="true" requireSSL = "true|false"/>
-      -->
-				<!-- Uncomment these lines to enable the profile service. To allow profile properties to be retrieved
-           and modified in ASP.NET AJAX applications, you need to add each property name to the readAccessProperties and
-           writeAccessProperties attributes. -->
-				<!--
-      <profileService enabled="true"
-                      readAccessProperties="propertyname1,propertyname2"
-                      writeAccessProperties="propertyname1,propertyname2" />
-      -->
-			</webServices>
-			<!--
-      <scriptResourceHandler enableCompression="true" enableCaching="true" />
-      -->
-		</scripting>
-	</system.web.extensions>
-
   <system.net>
     <mailSettings>
       <smtp from="heh@heh.com">

mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.4.0

+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<configSections>
+		<section name="CustomTags" restartOnExternalChanges="false" type="MonoTests.SystemWeb.Framework.CustomSection, System.Web_test_net_4_0" />
+	</configSections>
+	<appSettings>
+		<add key="strvalue" value="str" />
+		<add key="intvalue" value="123" />
+	</appSettings>
+	
+	<!-- DO NOT REMOVE: USED BY TESTS -->
+	<CustomTags>
+		<sections>
+			<add area="activityTemplateTitle">
+				<add name="a" />
+			</add>
+			<add area="Something">
+			</add>
+		</sections>
+	</CustomTags>
+	
+	<system.web>
+		<siteMap enabled="true">
+			<providers>
+				<add name="TestSiteMapProvider" type="Tests.TestSiteMapProvider" />
+			</providers>
+		</siteMap>
+		<compilation debug="true" batch="false" numRecompilesBeforeAppRestart="100000" />
+		<httpHandlers>
+			<add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="true" />
+			<remove verb="*" path="*.asmx"/>
+			<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+		</httpHandlers>
+		<pages enableSessionState="false" />
+		<membership defaultProvider="FakeProvider">
+			<providers>
+				<add name="FakeProvider" type="MonoTests.SystemWeb.Framework.FakeMembershipProvider"
+				     enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true"
+				     applicationName="/" requiresUniqueEmail="false" passwordFormat="Hashed"
+				     maxInvalidPasswordAttempts="5" minRequiredPasswordLength="7"
+				     minRequiredNonalphanumericCharacters="1" passwordAttemptWindow="10"
+				     passwordStrengthRegularExpression="" />
+			</providers>
+		</membership>
+
+		<roleManager defaultProvider="TheRoleProvider" enabled="true">
+			<providers>
+				<clear />
+				<add name="TheRoleProvider" type="MonoTests.SystemWeb.Framework.TestRoleProvider"/>
+			</providers>
+		</roleManager>
+	</system.web>
+	<system.net>
+		<mailSettings>
+			<smtp from="heh@heh.com">
+				<network host="localhost" port="125"/>
+			</smtp>
+		</mailSettings>
+	</system.net>
+</configuration>

mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/WebTest.cs

@@ -606,9 +606,13 @@ namespace MonoTests.SystemWeb.Framework
 #endif
 #if DOTNET
 			CopyResource (myself, "Web.config", "Web.config");
+#else
+#if NET_4_0
+			CopyResource (myself, "Web.mono.config.4.0", "Web.config");
 #else
 			CopyResource (myself, "Web.mono.config", "Web.config");
 #endif
+#endif
 #else
 			CopyResource (myself, "Web.mono.config.1.1", "Web.config");
 #endif