Skip to content

Commit c397d3b

Browse files
jonpryorjonpryor
committed
[Xamarin.Android.Bcl-Tests] Add BCL test project.
What do we want? (with apologies to 48e3fc2) **MOAR** Unit tests! Specifically, we want to run the BCL unit tests which mono generates: $ cd external/mono/mcs/class/corlib $ make PROFILE=monodroid test # creates `monodroid_corlib_test.dll` Creation of `monodroid_*_test.dll` assemblies and the `make PROFILE=monodroid test` target is a relatively recent development, for which I need to buy the #runtime team some beers. In terms of `mono-runtimes.targets`, we can build *all* of the BCL unit test assemblies with: $ cd external/mono/mcs/class $ make -i do-test PROFILE=monodroid Now that we can create them, how do we *use* them? That's the trickier bit: they need to be built within mono, as part of the existing BCL build process. This in turn means that the BCL unit test assemblies need to be distributed as part of the mono bundle, as we don't want to rebuild the mono repo "from scratch" just for the unit tests. Update `build-tools/mono-runtimes/ProfileAssemblies.projitems` to include a new `@(MonoTestAssembly)` item group which contains all of the BCL unit test assemblies and related files which should be included into `bundle-*.zip`. Additionally, add `ProfileAssemblies.projitems` to `@(VersionFile)` witihin `bundle-path.targets`, so that if anything within `ProfileAssemblies.projitems` changes, we rebuild the bundle. Once we *have* the BCL unit test assemblies, and their dependencies, we need to *run* them. The new `Xamarin.Android.Bcl-Tests.csproj` project is a Xamarin.Android application project which will execute the unit tests. There's just one small problem: Xamarin.Android apps want to use `Xamarin.Android.NUnitLite.dll`. The BCL unit test assemblies instead build against their own `nunitlite.dll`, which has no Xamarin.Android integration or support. How do we use the new test assemblies? *Force* a fix by using `remap-assembly-ref` to "rename" the `nunitlite` assembly reference to `Xamarin.Android.NUnitLite.dll`. This *cannot* be done as part of the `mono-runtimes.mdproj` build, as `Xamarin.Android.NUnitLite.dll` won't yet exist. Instead, remap the assemblies within `Xamarin.Android.Bcl-Tests.targets`, and distribute the remapped assemblies with the application. Finally, address one other "small" problem: not all of the unit tests pass! Some of these are for reasons we don't know, and others will require changes to `mono`. Update `Xamarin.Android.NUnitLite` to allow *filtering* of tests: namespace Xamarin.Android.NUnitLite { partial class TestSuiteActivity { public ITestFilter Filter {get; set;} public virtual void UpdateFilter (); } partial class TestSuiteInstrumentation { public ITestFilter Filter {get; set;} public virtual void UpdateFilter (); } } `TestSuiteActivity.UpdateFilter()` is called by `TestSuiteActivity.OnCreate()`, *after* `GetIncludedCategories()` and `GetExcludedCategories()` are called, to allow subclasses to alter the `ITestFilter` which is used to determine which tests are executed. `TestSuiteInstrumentation.UpdateFilter()` is called by `TestSuiteInstrumentation.OnStart()`, *after* `GetIncludedCategories()` and `GetExcludedCategories()` are called, to allow subclasses to alter the `ITestFilter` which is used to determine which tests are executed. `Xamarin.Android.Bcl_Tests` overrides both of these and updates the `Filter` property so that "known failing" tests are excluded. This allows us to skip failing tests, giving us time to properly fix them in time while allowing the rest of this PR to be merged. The skipped tests include: * MonoTests.System.Reflection.AssemblyTest.GetReferencedAssemblies * MonoTests.System.ServiceModel.Description.WebInvokeAttributeTest.RejectTwoParametersWhenNotWrapped
1 parent daa0573 commit c397d3b

File tree

29 files changed

+691
-6
lines changed

29 files changed

+691
-6
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ run-ji-tests:
156156
TEST_APK_PROJECTS = \
157157
src/Mono.Android/Test/Mono.Android-Tests.csproj \
158158
tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj \
159-
tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj
159+
tests/locales/Xamarin.Android.Locale-Tests/Xamarin.Android.Locale-Tests.csproj \
160+
tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
160161

161162
TEST_APK_PROJECTS_RELEASE = \
162163
src/Mono.Android/Test/Mono.Android-Tests.csproj \

‎Xamarin.Android-Tests.sln‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Forms.Performance.I
4949
EndProject
5050
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Performance.Integration.Droid", "tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.csproj", "{576312CC-83FF-48B1-A473-488CDC7121AD}"
5151
EndProject
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Bcl-Tests", "tests\Xamarin.Android.Bcl-Tests\Xamarin.Android.Bcl-Tests.csproj", "{E865C28E-32AF-4210-A41D-5791C39A9D85}"
53+
EndProject
5254
Global
5355
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5456
Debug|Any CPU = Debug|Any CPU
@@ -119,10 +121,14 @@ Global
119121
{B297008B-C313-455E-B230-E119589D2D79}.Debug|Any CPU.Build.0 = Debug|Any CPU
120122
{B297008B-C313-455E-B230-E119589D2D79}.Release|Any CPU.ActiveCfg = Release|Any CPU
121123
{B297008B-C313-455E-B230-E119589D2D79}.Release|Any CPU.Build.0 = Release|Any CPU
122-
{576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123-
{576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
124-
{576312CC-83FF-48B1-A473-488CDC7121AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
125-
{576312CC-83FF-48B1-A473-488CDC7121AD}.Release|Any CPU.Build.0 = Release|Any CPU
124+
{576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
125+
{576312CC-83FF-48B1-A473-488CDC7121AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
126+
{576312CC-83FF-48B1-A473-488CDC7121AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
127+
{576312CC-83FF-48B1-A473-488CDC7121AD}.Release|Any CPU.Build.0 = Release|Any CPU
128+
{E865C28E-32AF-4210-A41D-5791C39A9D85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129+
{E865C28E-32AF-4210-A41D-5791C39A9D85}.Debug|Any CPU.Build.0 = Debug|Any CPU
130+
{E865C28E-32AF-4210-A41D-5791C39A9D85}.Release|Any CPU.ActiveCfg = Release|Any CPU
131+
{E865C28E-32AF-4210-A41D-5791C39A9D85}.Release|Any CPU.Build.0 = Release|Any CPU
126132
EndGlobalSection
127133
GlobalSection(NestedProjects) = preSolution
128134
{2305B00D-DE81-4744-B0DA-357835CAFE5A} = {43A4FB09-279A-4138-8027-EC1E1CED2E8A}

‎build-tools/bundle/bundle-path.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<!-- Files which contribute to the bundle "version" -->
2525
<ItemGroup>
2626
<VersionFile Include="..\mono-runtimes\mono-runtimes.*" />
27+
<VersionFile Include="..\mono-runtimes\ProfileAssemblies.projitems" />
2728
<VersionFile Include="..\scripts\BuildEverything.mk" />
2829
</ItemGroup>
2930
<HashFileContents

‎build-tools/mono-runtimes/ProfileAssemblies.projitems‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,63 @@
188188
<MonoProfileAssembly Include="System.Xml.Linq.dll" />
189189
<MonoProfileAssembly Include="System.Xml.Serialization.dll" />
190190
</ItemGroup>
191+
<ItemGroup>
192+
<MonoTestAssembly Include="monodroid_corlib_test.dll">
193+
<SourcePath>corlib</SourcePath>
194+
</MonoTestAssembly>
195+
<MonoTestAssembly Include="monodroid_Mono.CSharp_test.dll">
196+
<SourcePath>Mono.CSharp</SourcePath>
197+
</MonoTestAssembly>
198+
<MonoTestAssembly Include="monodroid_Mono.Data.Sqlite_test.dll">
199+
<SourcePath>Mono.Data.Sqlite</SourcePath>
200+
</MonoTestAssembly>
201+
<MonoTestAssembly Include="monodroid_Mono.Data.Tds_test.dll">
202+
<SourcePath>Mono.Data.Tds</SourcePath>
203+
</MonoTestAssembly>
204+
<MonoTestAssembly Include="monodroid_Mono.Security_test.dll">
205+
<SourcePath>Mono.Security</SourcePath>
206+
</MonoTestAssembly>
207+
<MonoTestAssembly Include="monodroid_System_test.dll">
208+
<SourcePath>System</SourcePath>
209+
</MonoTestAssembly>
210+
<MonoTestAssembly Include="monodroid_System.Core_test.dll">
211+
<SourcePath>System.Core</SourcePath>
212+
</MonoTestAssembly>
213+
<MonoTestAssembly Include="monodroid_System.Data_test.dll">
214+
<SourcePath>System.Data</SourcePath>
215+
</MonoTestAssembly>
216+
<MonoTestAssembly Include="monodroid_System.IO.Compression.FileSystem_test.dll">
217+
<SourcePath>System.IO.Compression.FileSystem</SourcePath>
218+
</MonoTestAssembly>
219+
<MonoTestAssembly Include="monodroid_System.IO.Compression_test.dll">
220+
<SourcePath>System.IO.Compression</SourcePath>
221+
</MonoTestAssembly>
222+
<MonoTestAssembly Include="monodroid_System.Json_test.dll">
223+
<SourcePath>System.Json</SourcePath>
224+
</MonoTestAssembly>
225+
<MonoTestAssembly Include="monodroid_System.Net.Http_test.dll">
226+
<SourcePath>System.Net.Http</SourcePath>
227+
</MonoTestAssembly>
228+
<MonoTestAssembly Include="monodroid_System.Numerics_test.dll">
229+
<SourcePath>System.Numerics</SourcePath>
230+
</MonoTestAssembly>
231+
<MonoTestAssembly Include="monodroid_System.Runtime.Serialization_test.dll">
232+
<SourcePath>System.Runtime.Serialization</SourcePath>
233+
</MonoTestAssembly>
234+
<MonoTestAssembly Include="monodroid_System.ServiceModel.Web_test.dll">
235+
<SourcePath>System.ServiceModel.Web</SourcePath>
236+
</MonoTestAssembly>
237+
<MonoTestAssembly Include="monodroid_System.Transactions_test.dll">
238+
<SourcePath>System.Transactions</SourcePath>
239+
</MonoTestAssembly>
240+
<MonoTestAssembly Include="monodroid_System.Xml_test.dll">
241+
<SourcePath>System.XML</SourcePath>
242+
</MonoTestAssembly>
243+
<MonoTestAssembly Include="monodroid_System.Xml.Linq_test.dll">
244+
<SourcePath>System.Xml.Linq</SourcePath>
245+
</MonoTestAssembly>
246+
<MonoTestAssembly Include="nunitlite.dll">
247+
<SourcePath>lib/monodroid</SourcePath>
248+
</MonoTestAssembly>
249+
</ItemGroup>
191250
</Project>

‎build-tools/mono-runtimes/mono-runtimes.targets‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@
5757
<_BclAssembly Include="@(MonoProfileAssembly)" />
5858
<_BclExcludeDebugSymbols Include="System.Windows.dll" />
5959
<_BclExcludeDebugSymbols Include="System.Xml.Serialization.dll" />
60+
<_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" />
61+
<_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" />
62+
<_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" />
63+
<_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename).pdb')" />
64+
</ItemGroup>
65+
<ItemGroup>
66+
<_BclTestOutput Include="@(_BclTestAssemblyDestination)" />
67+
<_BclTestOutput Include="$(XAInstallPrefix)\..\..\bcl-tests\bcl-tests.zip" />
6068
</ItemGroup>
6169
<ItemGroup>
6270
<_BclProfileItems Include="@(_BclAssembly->'$(_MonoProfileDir)\%(Identity)')" />
@@ -286,7 +294,7 @@
286294
<Target Name="_BuildRuntimes"
287295
DependsOnTargets="_GetRuntimesOutputItems;_ConfigureRuntimes"
288296
Inputs="@(_RuntimeBuildStamp)"
289-
Outputs="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource)">
297+
Outputs="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource);@(_BclTestOutput)">
290298
<Exec
291299
Condition=" '%(_MonoRuntime.DoBuild)' == 'true' "
292300
Command="make $(MakeConcurrency) # %(_MonoRuntime.Identity)"
@@ -296,6 +304,51 @@
296304
<Touch
297305
Files="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource)"
298306
/>
307+
<Exec
308+
Command="make $(MakeConcurrency) -i do-test PROFILE=monodroid"
309+
IgnoreStandardErrorWarningFormat="True"
310+
WorkingDirectory="$(MonoSourceFullPath)\mcs\class"
311+
/>
312+
<Copy
313+
SourceFiles="@(_BclTestAssemblySource)"
314+
DestinationFiles="@(_BclTestAssemblyDestination)"
315+
/>
316+
<Touch
317+
Files="@(_BclTestAssemblyDestination)"
318+
/>
319+
<ItemGroup>
320+
<_BclTestContent Include="$(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath)\Test\**\*.*" />
321+
<_BclTestContent Remove="$(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath)\Test\**\*.cs" />
322+
<_BclTestContent Remove="$(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath)\Test\**\.gitattributes" />
323+
<_BclTestContentDest Include="@(_BclTestContent->'$(XAInstallPrefix)\..\..\bcl-tests\Test\%(RecursiveDir)%(Filename)%(Extension)')" />
324+
</ItemGroup>
325+
<ItemGroup>
326+
<_BclTestContent Include="$(MonoSourceFullPath)\mcs\class\System.IO.Compression\test.nupkg" />
327+
<_BclTestContentDest Include="$(XAInstallPrefix)\..\..\bcl-tests\test.nupkg" />
328+
<_BclTestContent Include="$(MonoSourceFullPath)\mcs\class\System.IO.Compression\archive.zip" />
329+
<_BclTestContentDest Include="$(XAInstallPrefix)\..\..\bcl-tests\archive.zip" />
330+
</ItemGroup>
331+
<ItemGroup>
332+
<_ZipTestContent Include="$(MonoSourceFullPath)\mcs\class\System.IO.Compression.FileSystem\foo\**\*.*" />
333+
<_ZipTestContentDest Include="@(_ZipTestContent->'$(XAInstallPrefix)\..\..\bcl-tests\foo\%(RecursiveDir)%(Filename)%(Extension)')" />
334+
<_BclTestContent Include="@(_ZipTestContent)" />
335+
<_BclTestContentDest Include="@(_ZipTestContentDest)" />
336+
</ItemGroup>
337+
<Copy
338+
SourceFiles="@(_BclTestContent)"
339+
DestinationFiles="@(_BclTestContentDest)"
340+
/>
341+
<Exec
342+
Condition="!Exists('$(XAInstallPrefix)\..\..\bcl-tests\Test\test.db')"
343+
Command="sqlite3 &quot;$(XAInstallPrefix)\..\..\bcl-tests\Test\test.db&quot; &lt; &quot;$(MonoSourceFullPath)\mcs\class\Mono.Data.Sqlite\Test\test.sql&quot;"
344+
/>
345+
<Exec
346+
Command="zip -r bcl-tests.zip ."
347+
WorkingDirectory="$(XAInstallPrefix)\..\..\bcl-tests"
348+
/>
349+
<Touch
350+
Files="$(XAInstallPrefix)\..\..\bcl-tests\bcl-tests.zip"
351+
/>
299352
</Target>
300353
<Target Name="_InstallRuntimes"
301354
DependsOnTargets="_GetRuntimesOutputItems"
@@ -577,6 +630,7 @@
577630
<BundleItem Include="$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)"
578631
Condition=" '@(_MonoCrossRuntime)' != '' "
579632
/>
633+
<BundleItem Include="@(_BclTestOutput)" />
580634
</ItemGroup>
581635
</Target>
582636
<Target Name="ForceBuild"

‎src/Xamarin.Android.NUnitLite/Gui/Activities/TestSuiteActivity.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ protected bool GCAfterEachFixture {
3232
set { AndroidRunner.Runner.GCAfterEachFixture = value; }
3333
}
3434

35+
protected ITestFilter Filter {
36+
get { return AndroidRunner.Runner.Filter; }
37+
set { AndroidRunner.Runner.Filter = value; }
38+
}
39+
3540
protected override void OnCreate (Bundle bundle)
3641
{
3742
base.OnCreate (bundle);
@@ -49,6 +54,8 @@ protected override void OnCreate (Bundle bundle)
4954
}
5055
AndroidRunner.Runner.AddTestFilters (GetIncludedCategories (), GetExcludedCategories ());
5156

57+
UpdateFilter ();
58+
5259
FindViewById<TextView> (Resource.Id.RunTestsButton).Click += (o, e) => {
5360
AndroidRunner.Runner.Run (current_test, this);
5461
UpdateData (data, lv);
@@ -104,6 +111,12 @@ protected override void OnResume ()
104111
return null;
105112
}
106113

114+
// Subclasses can override this method to update the test filtering that the runner will use.
115+
// Subclasses should set the `Filter` property to their new filter value
116+
protected virtual void UpdateFilter ()
117+
{
118+
}
119+
107120
public void AddTest (Assembly assembly)
108121
{
109122
AndroidRunner.Runner.AddTest (assembly);

‎src/Xamarin.Android.NUnitLite/Gui/Instrumentations/TestSuiteInstrumentation.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Android.Util;
1111

1212
using NUnitLite.Runner;
13+
using NUnit.Framework.Api;
1314
using NUnit.Framework.Internal;
1415

1516
namespace Xamarin.Android.NUnitLite {
@@ -22,6 +23,11 @@ protected bool GCAfterEachFixture {
2223
set { AndroidRunner.Runner.GCAfterEachFixture = value; }
2324
}
2425

26+
protected ITestFilter Filter {
27+
get { return AndroidRunner.Runner.Filter; }
28+
set { AndroidRunner.Runner.Filter = value; }
29+
}
30+
2531
protected TestSuiteInstrumentation (IntPtr handle, JniHandleOwnership transfer)
2632
: base (handle, transfer)
2733
{
@@ -45,6 +51,8 @@ public override void OnStart ()
4551
AndroidRunner.Runner.Options.LoadFromBundle (arguments);
4652
AndroidRunner.Runner.AddTestFilters (GetIncludedCategories (), GetExcludedCategories ());
4753

54+
UpdateFilter ();
55+
4856
AndroidRunner.Runner.Initialized = true;
4957
var results = new Bundle ();
5058
int failed = 0;
@@ -145,5 +153,9 @@ protected void AddTest (Assembly assembly)
145153
{
146154
return null;
147155
}
156+
157+
protected virtual void UpdateFilter ()
158+
{
159+
}
148160
}
149161
}

‎tests/RunApkTests.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
in the toplevel Makefile so that the `.apk` is built.
1515
-->
1616
<Import Project="..\src\Mono.Android\Test\Mono.Android-Tests.projitems" />
17+
<Import Project="..\tests\Xamarin.Android.Bcl-Tests\Xamarin.Android.Bcl-Tests.projitems" />
1718
<Import Project="..\tests\CodeGen-Binding\Xamarin.Android.JcwGen-Tests\Xamarin.Android.JcwGen-Tests.projitems" Condition=" '$(Configuration)' == 'Debug' " />
1819
<Import Project="..\tests\locales\Xamarin.Android.Locale-Tests\Xamarin.Android.Locale-Tests.projitems" Condition=" '$(Configuration)' == 'Debug' " />
1920
<Import Project="..\tests\Xamarin.Forms-Performance-Integration\Droid\Xamarin.Forms.Performance.Integration.Droid.projitems" Condition=" '$(Configuration)' == 'Release' And '$(AotAssemblies)' != 'true' " />

‎tests/Xamarin.Android.Bcl-Tests/App.cs‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
using System.IO.Compression;
5+
using System.Linq;
6+
using System.Reflection;
7+
8+
using NUnit.Framework.Api;
9+
using NUnit.Framework.Internal.Filters;
10+
11+
namespace Xamarin.Android.BclTests
12+
{
13+
static partial class App
14+
{
15+
internal static string[] ExcludeAssemblyNames = {
16+
// Not needed; distributed only for "sanity"/consistency
17+
"nunitlite.dll",
18+
};
19+
20+
internal static IEnumerable<Assembly> GetTestAssemblies ()
21+
{
22+
yield return typeof (App).Assembly;
23+
24+
var names = TestAssemblyNames.Except (ExcludeAssemblyNames);
25+
foreach (var name in names) {
26+
var a = Assembly.Load (name);
27+
if (a == null) {
28+
Console.WriteLine ($"# WARNING: Unable to load assembly: {name}");
29+
continue;
30+
}
31+
yield return a;
32+
}
33+
}
34+
35+
internal static IEnumerable<string> GetExcludedCategories ()
36+
{
37+
var excluded = new List<string> {
38+
"AndroidNotWorking",
39+
"CAS",
40+
"InetAccess",
41+
"MobileNotWorking",
42+
"NotWorking",
43+
};
44+
45+
if (!System.Environment.Is64BitOperatingSystem) {
46+
excluded.Add ("LargeFileSupport");
47+
}
48+
49+
return excluded;
50+
}
51+
52+
internal static void ExtractBclTestFiles ()
53+
{
54+
var cachePath = global::Android.App.Application.Context.CacheDir.AbsolutePath;
55+
if (Directory.Exists (Path.Combine (cachePath, "Test")))
56+
return;
57+
58+
using (var files = typeof (App).Assembly.GetManifestResourceStream ("bcl-tests.zip"))
59+
using (var zip = new ZipArchive (files, ZipArchiveMode.Read)) {
60+
zip.ExtractToDirectory (cachePath);
61+
}
62+
}
63+
64+
static string[] ExcludeTestNames = new string[]{
65+
// https://jenkins.mono-project.com/job/xamarin-android-pr-builder/1720/testReport/(root)/AssemblyTest/GetReferencedAssemblies/
66+
// https://bugzilla.xamarin.com/show_bug.cgi?id=59908
67+
// AssemblyName.Flags == AssemblyNameFlags.PublicKey; expected AssemblyNameFlags.None
68+
"MonoTests.System.Reflection.AssemblyTest.GetReferencedAssemblies",
69+
// https://jenkins.mono-project.com/job/xamarin-android-pr-builder/1720/testReport/(root)/WebInvokeAttributeTest/RejectTwoParametersWhenNotWrapped/
70+
// https://bugzilla.xamarin.com/show_bug.cgi?id=59909
71+
// InvalidOperationException wasn't thrown when it was expected
72+
"MonoTests.System.ServiceModel.Description.WebInvokeAttributeTest.RejectTwoParametersWhenNotWrapped",
73+
};
74+
75+
internal static ITestFilter UpdateFilter (ITestFilter filter)
76+
{
77+
if (ExcludeTestNames?.Length == 0)
78+
return filter;
79+
var excludeTestNamesFilter = new SimpleNameFilter (ExcludeTestNames);
80+
return new AndFilter (filter, new NotFilter (excludeTestNamesFilter));
81+
}
82+
}
83+
}

‎tests/Xamarin.Android.Bcl-Tests/App.cs.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace Xamarin.Android.BclTests {
2+
partial class App {
3+
public static string[] TestAssemblyNames = {
4+
@ASSEMBLIES@
5+
};
6+
}
7+
}

0 commit comments

Comments
 (0)