mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Web/Test/System.Web.Compilation/TemplateControlCompilerTest.cs
View File

@ -88,9 +88,7 @@ namespace MonoTests.System.Web.Compilation {
[Test]
[NUnit.Framework.Category ("NunitWeb")]
#if !TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ReadOnlyPropertyBindTest ()
{
new WebTest ("ReadOnlyPropertyBind.aspx").Run ();

3
mcs/class/System.Web/Test/System.Web.Hosting/ApplicationHostTest.cs
View File

@ -115,9 +115,6 @@ namespace MonoTests.System.Web.Hosting {
[Test]
[ExpectedException(typeof(SerializationException))]
#if TARGET_JVM //System.Security.Policy.Evidence not implemented
[Category ("NotWorking")]
#endif
public void Constructor_PlainType ()
{
ApplicationHost.CreateApplicationHost (typeof (ApplicationHostTest), "/app", Environment.CurrentDirectory);

4
mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlFormTest.cs
View File

@ -55,7 +55,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
}
}
#if NET_2_0 && !TARGET_JVM
#if NET_2_0
public void SetContext ()
{
SetContext (Context);
@ -201,7 +201,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
}
#if NET_2_0
#if !TARGET_DOTNET && !TARGET_JVM
#if !TARGET_DOTNET
[Test]
public void ActionStringWithQuery ()
{

3
mcs/class/System.Web/Test/System.Web.UI.WebControls/CreateUserWizardTest.cs
View File

@ -144,9 +144,6 @@ namespace MonoTests.System.Web.UI.WebControls
[Test]
[Category ("NunitWeb")]
#if TARGET_JVM
[Ignore ("TD #7024")]
#endif
public void ActiveStepIndex () {
new WebTest (PageInvoker.CreateOnLoad (ActiveStepIndex_Load)).Run ();
}

3
mcs/class/System.Web/Test/System.Web.UI.WebControls/DataBoundControlTest.cs
View File

@ -205,9 +205,6 @@ namespace MonoTests.System.Web.UI.WebControls
[Test]
[Category ("NunitWeb")]
#if TARGET_JVM
[Ignore ("TD #6665")]
#endif
public void DataBoundControl_DataBindFlow2 () {
new WebTest (PageInvoker.CreateOnLoad (DataBoundControl_DataBindFlow2_Load)).Run ();
}

2
mcs/class/System.Web/Test/System.Web.UI.WebControls/FormViewTest.cs.REMOVED.git-id
View File

@ -1 +1 @@
d1a26186f43fcc001526389f14658fb0eedf225e
416a8b9a1d1948a44af1452c03bff06ca838852b

2
mcs/class/System.Web/Test/System.Web.UI.WebControls/SessionParameterTest.cs
View File

@ -135,9 +135,7 @@ namespace MonoTests.System.Web.UI.WebControls
[Test]
[Category("NunitWeb")]
#if !TARGET_JVM
[Category("NotWorking")]
#endif
public void SessionParameter_Evaluate()
{
SessionParameterPoker sessionParam = new SessionParameterPoker("employee",TypeCode.String ,"id") ;

3
mcs/class/System.Web/Test/System.Web.UI.WebControls/TableRowTest.cs
View File

@ -38,9 +38,6 @@ using NUnit.Framework;
namespace MonoTests.System.Web.UI.WebControls {
#if TARGET_JVM
[vmw.common.ChangeInterfaceMethodNames]
#endif
public interface ITableRowTest {
// testing

3
mcs/class/System.Web/Test/System.Web.UI.WebControls/XmlDataSourceTest.cs
View File

@ -409,9 +409,6 @@ namespace MonoTests.System.Web.UI.WebControls
[Test]
[Category ("NunitWeb")]
#if TARGET_JVM
[Category ("NotWorking")] // File watcher is not supported
#endif
public void Save ()
{
string origin = @"<div>

8
mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
View File

@ -816,11 +816,7 @@ namespace MonoTests.System.Web.UI
public static void ResolveUrl_Load (Page p)
{
#if TARGET_JVM
string appPath = "/MainsoftWebApp20";
#else
string appPath = "/NunitWeb";
#endif
Control ctrl = new Control ();
p.Controls.Add (ctrl);
Assert.AreEqual (appPath + "/MyPage.aspx", ctrl.ResolveUrl ("~/MyPage.aspx"), "ResolveClientUrl Failed");
@ -866,11 +862,7 @@ namespace MonoTests.System.Web.UI
public static void ResolveUrl2_Load (Page p)
{
#if TARGET_JVM
string appPath = "/MainsoftWebApp20";
#else
string appPath = "/NunitWeb";
#endif
Control uc = p.FindControl ("WebUserControl1");
Control ctrl = uc.FindControl ("Label");

8
mcs/class/System.Web/Test/System.Web.UI/PageTest.cs
View File

@ -784,9 +784,7 @@ namespace MonoTests.System.Web.UI {
[Test]
[Category ("NunitWeb")]
#if !TARGET_JVM
[Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
#endif
public void AddOnPreRenderCompleteAsync ()
{
WebTest t = new WebTest ("AsyncPage.aspx");
@ -801,9 +799,7 @@ namespace MonoTests.System.Web.UI {
}
[Test]
#if !TARGET_JVM
[Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
#endif
[Category ("NunitWeb")]
public void ExecuteRegisteredAsyncTasks ()
{
@ -820,9 +816,7 @@ namespace MonoTests.System.Web.UI {
[Test]
[Category ("NunitWeb")]
#if !TARGET_JVM
[Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
#endif
[ExpectedException (typeof (Exception))]
public void AddOnPreRenderCompleteAsyncBeginThrows ()
{
@ -833,9 +827,7 @@ namespace MonoTests.System.Web.UI {
[Test]
[Category ("NunitWeb")]
#if !TARGET_JVM
[Category ("NotWorking")] // Mono PageParser does not handle @Page Async=true
#endif
[ExpectedException (typeof (Exception))]
public void AddOnPreRenderCompleteAsyncEndThrows ()
{

27
mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs
View File

@ -115,14 +115,6 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (true, t.DoSupportAutoEvents, "SupportAutoEvents");
}
#if TARGET_JVM
[Test]
public void TemplateControl_DefaultPropertyNotWorking ()
{
PokerTemplateControl t = new PokerTemplateControl ();
Assert.AreEqual (null, t.AppRelativeVirtualPath, "AppRelativeVirtualPath");
}
#endif
[Test]
[Category ("NunitWeb")]
@ -343,23 +335,6 @@ namespace MonoTests.System.Web.UI.WebControls
}
#if TARGET_JVM
[Test]
[ExpectedException(typeof(ArgumentNullException))]
public void TemplateControl_AppRelativeVirtualPathException1 ()
{
PokerTemplateControl t = new PokerTemplateControl ();
t.AppRelativeVirtualPath = null;
}
[Test]
[ExpectedException (typeof (ArgumentException))]
public void TemplateControl_AppRelativeVirtualPathException2 ()
{
PokerTemplateControl t = new PokerTemplateControl ();
t.AppRelativeVirtualPath = "fake";
}
#endif
[TestFixtureTearDown]
public void TearDown ()
{
@ -367,4 +342,4 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
}
#endif
#endif

6
mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
View File

@ -263,9 +263,6 @@ namespace MonoTests.System.Web {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")] // char output stream in gh make this test fail
#endif
public void Test_Response ()
{
FakeHttpWorkerRequest2 f;
@ -287,9 +284,6 @@ namespace MonoTests.System.Web {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")] // char output stream in gh make this test fail
#endif
public void TestResponse_Chunked ()
{
FakeHttpWorkerRequest2 f;

3
mcs/class/System.Web/Test/System.Web/HttpServerUtilityTest.cs
View File

@ -65,9 +65,6 @@ namespace MonoTests.System.Web {
[Test]
[Category ("NotDotNet")]
#if TARGET_JVM
[Ignore ("TD #6954")]
#endif
public void HtmlEncode_XSS ()
{
string problem = "\xff1cscript\xff1e"; // unicode looks alike <script>

11
mcs/class/System.Web/Test/System.Web/HttpUtilityTest.cs
View File

@ -151,9 +151,6 @@ namespace MonoTests.System.Web {
[Test]
[Category ("NotDotNet")]
#if TARGET_JVM
[Ignore ("TD #6954")]
#endif
public void HtmlEncode_XSS ()
{
string problem = "\xff1cscript\xff1e"; // unicode looks alike <script>
@ -306,9 +303,7 @@ namespace MonoTests.System.Web {
}
#endif
[Test]
#if !TARGET_JVM
[Category ("NotWorking")]
#endif
public void HtmlEncode ()
{
for (char c = char.MinValue; c < char.MaxValue; c++) {
@ -608,9 +603,6 @@ namespace MonoTests.System.Web {
}
[Test]
#if TARGET_JVM
[Ignore ("TD #6956")]
#endif
public void UrlEncodeUnicodeTest ()
{
string str = "sch" + (char) 0xf6 + "n";
@ -757,9 +749,6 @@ namespace MonoTests.System.Web {
[Test]
#if TARGET_JVM
[Ignore ("TD #6956")]
#endif
public void ParseQueryString ()
{
ParseQueryString_Helper (HttpUtility.ParseQueryString ("name=value"), "#1",

4
mcs/class/System.Web/Test/System.Web/VirtualPathUtilityTest.cs
View File

@ -43,11 +43,7 @@ namespace MonoTests.System.Web {
[TestFixture]
public class VirtualPathUtilityTest {
#if TARGET_JVM
const string NunitWebAppName = "MainsoftWebApp20";
#else
const string NunitWebAppName = "NunitWeb";
#endif
[Test]
public void AppendTrailingSlash ()

2
mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/AssemblyInfo.cs
View File

@ -62,7 +62,7 @@ using System.Runtime.CompilerServices;
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
// documentation for more information on this.
//
#if !(TARGET_JVM || TARGET_DOTNET)
#if !(TARGET_DOTNET)
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile ("../winfx.pub")]
#endif

2
mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlWeb.cs
View File

@ -7,7 +7,6 @@ using System.Xml.Serialization;
using System.Xml.Xsl;
using Microsoft.Win32;
#if !TARGET_JVM
namespace HtmlAgilityPack
{
/// <summary>
@ -821,4 +820,3 @@ namespace HtmlAgilityPack
}
}
}
#endif

52
mcs/class/System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/tools.cs
View File

@ -23,58 +23,6 @@ namespace HtmlAgilityPack
File.Copy(source, target, true);
}
}
#if TARGET_JVM1
internal struct HtmlLibrary
{
[Conditional("DEBUG")]
internal static void GetVersion(out string version)
{
System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(1, true);
version = sf.GetMethod().DeclaringType.Assembly.GetName().Version.ToString();
}
[Conditional("DEBUG")]
[Conditional("TRACE")]
internal static void Trace(object Value)
{
// category is the method
string name = null;
GetCurrentMethodName(2, out name);
System.Diagnostics.Trace.WriteLine(Value, name);
}
[Conditional("DEBUG")]
[Conditional("TRACE")]
internal static void TraceStackFrame(int steps)
{
string name = null;
GetCurrentMethodName(2, out name);
string trace = "";
for(int i=1;i<steps;i++)
{
System.Diagnostics.StackFrame sf = new System.Diagnostics.StackFrame(i, true);
trace += sf.ToString();
}
System.Diagnostics.Trace.WriteLine(trace, name);
System.Diagnostics.Trace.WriteLine("");
}
[Conditional("DEBUG")]
internal static void GetCurrentMethodName(out string name)
{
name = null;
GetCurrentMethodName(2, out name);
}
[Conditional("DEBUG")]
internal static void GetCurrentMethodName(int skipframe, out string name)
{
StackFrame sf = new StackFrame(skipframe, true);
name = sf.GetMethod().DeclaringType.Name + "." + sf.GetMethod().Name;
}
}
#endif
internal class HtmlCmdLine
{

9
mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/PageInvoker.cs
View File

@ -1,7 +1,3 @@
#if TARGET_JVM
#define BUG_78521_FIXED
#endif
using System;
using System.Web.UI;
@ -106,11 +102,8 @@ namespace MonoTests.SystemWeb.Framework
_page = (Page) parameters[0];
#if NET_2_0
#if BUG_78521_FIXED
_page.PreInit += OnPreInit;
#else
OnPreInit (null, null);
#endif
_page.LoadComplete += OnLoadComplete;
_page.PreLoad += OnPreLoad;
_page.PreRenderComplete += OnPreRenderComplete;

Some files were not shown because too many files have changed in this diff Show More