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

Imported Upstream version 5.20.0.180

Browse Source 
Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System.Web/Makefile
View File

@@ -226,6 +226,10 @@ TEST_RESOURCE_FILES = \
Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx \
Test/mainsoft/NunitWebResources/CheckBoxList_CustomValues.aspx
TEST_RESOURCE_FILES_WITH_DIR = \
$(wildcard Test/System.Web.Caching/CacheItemPriorityQueueTestData/*.list) \
$(wildcard Test/System.Web.Caching/CacheItemPriorityQueueTestData/*.tests)
RESOURCE_DEFS = \
TranslationResources,resources/TranslationResources.resx
@@ -257,6 +261,7 @@ LIB_MCS_FLAGS = \
TEST_LIB_REFS = SystemWebTestShim
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 \
$(NUNIT_RESOURCE_FILES:%=/resource:%) \
$(foreach r, $(TEST_RESOURCE_FILES_WITH_DIR), -resource:$(r),$(r)) \
$(foreach file,$(NUNIT_APP_CODE_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_Code/\2 ;g')) \
$(foreach file,$(NUNIT_APP_GLOBALRESOURCES_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_GlobalResources/\2 ;g'))
@@ -265,6 +270,7 @@ EXTRA_DISTFILES = \
$(RESOURCE_FILES_2) \
$(RESOURCE_FILES_1) \
$(TEST_RESOURCE_FILES) \
$(TEST_RESOURCE_FILES_WITH_DIR) \
$(TEST_APP_CODE_FILES) \
$(TEST_APP_GLOBALRESOURCES_FILES) \
UplevelHelperDefinitions.xml \
@@ -273,9 +279,11 @@ EXTRA_DISTFILES = \
$(shell find Test/standalone-tests/ -name "*.cs" -type f -printf "'%p' " -o -name "*.cs.in" -type f -printf "'%p' ") \
$(shell find Test/standalone/ -path '*/.svn' -prune -o -type f -printf "'%p' ") \
$(shell find Test/tools/ -path '*/.svn' -prune -o -type f -printf "'%p' ") \
$(shell find Test/System.Web.Caching/CacheItemPriorityQueueTestData/ -name "Sequence*.*" -type f -printf "'%p' ") \
ASPState.sql
# This breaks for strange reason
# $(shell find Test/System.Web.Caching/CacheItemPriorityQueueTestData/ -name "Sequence*.*" -type f -printf "'%p' ") \
BUILT_SOURCES = System.Web/UplevelHelper.cs
include ../../build/library.make

1
mcs/class/System.Web/System.Web_test.dll.sources
View File

@@ -1,4 +1,5 @@
../../test-helpers/NunitHelpers.cs
../../test-helpers/TestResourceHelper.cs
mainsoft/MainsoftWebTest/HtmlAgilityPack/AssemblyInfo.cs
mainsoft/MainsoftWebTest/HtmlAgilityPack/crc32.cs
mainsoft/MainsoftWebTest/HtmlAgilityPack/Header.cs

17
mcs/class/System.Web/Test/System.Web.Caching/CacheItemPriorityQueueTest.cs
View File

@@ -34,14 +34,13 @@ using System.Web.Caching;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Web.Caching
{
[TestFixture]
public partial class CacheItemPriorityQueueTest
{
const string DATA_DIR = "CacheItemPriorityQueueTestData";
static readonly string dataDir;
sealed class TestCacheItem : CacheItem
{
public Guid Guid;
@@ -89,20 +88,12 @@ namespace MonoTests.System.Web.Caching
}
}
static CacheItemPriorityQueueTest ()
{
// Assumes this is compiled into mcs/class/lib/<profile>/test
string class_dir = Directory.GetParent (Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location)).Parent.Parent.FullName;
string system_web_dir = Path.Combine (class_dir, "System.Web", "Test", "System.Web.Caching");
dataDir = Path.Combine (system_web_dir, DATA_DIR);
}
void RunTest (string testsFileName, string listFileName)
{
var queue = new CacheItemPriorityQueue ();
var cacheItems = new List <TestCacheItem> ();
string listPath = Path.Combine (dataDir, listFileName);
string testsPath = Path.Combine (dataDir, testsFileName);
string listPath = TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Caching/CacheItemPriorityQueueTestData/" + listFileName);
string testsPath = TestResourceHelper.GetFullPathOfResource ("Test/System.Web.Caching/CacheItemPriorityQueueTestData/" + testsFileName);
string line;
using (var sr = new StreamReader (listPath, Encoding.UTF8)) {