[One .NET] Add Microsoft.Android-Tests unit tests #5250
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pjcollins
force-pushed
the
net5-runtime-tests
branch
8 times, most recently
from
73bb0da to
8a3bc77
Compare
pjcollins
force-pushed
the
net5-runtime-tests
branch
3 times, most recently
from
71dd3c6 to
8b367fd
Compare
pjcollins
requested review from
dellis1972,
grendello,
jonathanpeppers and
jonpryor
as code owners
src/Mono.Android/Test/Java.Interop-Tests/Java.Interop-Tests.NET.csproj
Outdated
Show resolved
Hide resolved
build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
Outdated
Show resolved
Hide resolved
radekdoulik
reviewed
Nov 9, 2020
| @@ -453,7 +454,9 @@ public ContainsExportedMethods () | |||
| Constructed = true; | |||
| } | |||
|
|
|||
| #if !NET // https://github.com/xamarin/xamarin-android/issues/5265 | |||
| [Export] | |||
There was a problem hiding this comment.
I think it should be enough to disable the CreateTypeWithExportedMethods test on dotnet?
There was a problem hiding this comment.
nm. The build error is happening even when Mono.Android.Export is referenced. I will look at how to fix #5265
dellis1972
reviewed
Nov 9, 2020
tests/Runtime-Microsoft.Android.Sdk/Microsoft.Android-Tests.projitems
Outdated
Show resolved
Hide resolved
jonpryor
reviewed
Nov 9, 2020
| @@ -0,0 +1,148 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk" > | |||
There was a problem hiding this comment.
Should this file also be added to Xamarin.Android-Tests.sln?
jonpryor
reviewed
Nov 9, 2020
| <Import Project="Microsoft.Android-Tests.projitems" /> | ||
| <Import Project="..\..\build-tools\scripts\TestApks.targets" /> | ||
|
|
||
| <Target Name="GenerateNuGetConfig" > |
There was a problem hiding this comment.
If this file is added to Xamarin.Android-Tests.sln, could you please test the following?
- Within Visual Studio for Mac,
- Load
Xamarin.Android-Tests.sln. - Add a new project to the
.sln.
What happens?
Normally, what would happen. is that every .csproj in the .sln is "re-formatted", screwing up whitespace, and requiring a git checkout -f HEAD … to clean things up.
I don't know if this is still the case for .NET 5+ projects/SDK short-form projects. This is the case for "normal" projects.
It would likely be safer to move these <Target/>s into Directory.Build.targets.
There was a problem hiding this comment.
I don't think we should add this to Xamarin.Android-Tests.sln at the moment, as it will break our macOS build job. These new project files will only compile against a specific version of .NET 5 that also has our workload installed into it. Additionally, I think there is still IDE work underway that will be needed to be able to load and use a project with a target framework of net5.0-android. I will move the targets over, but I don't think we should include any net5.0-android projects in our legacy solutions, or if we do want to do so eventually we should at least wait until there is a .NET 6 public preview available that supports it.
pjcollins
added a commit
to pjcollins/android
that referenced
this pull request
Nov 9, 2020
Context: dotnet#5250 PR dotnet#5250 will be adding another another Mono.Android-Tests project file, and it feels like a good time to move all relevant Mono.Android test source into a single location and reduce duplication where possible. The `src/Mono.Android/Test/` folder has been moved into the top level `tests` directory. The two existing `tests/Runtime-*` folders have been moved under the new `tests/Mono.Android-Tests` folder. Some duplication that existed in the .targets and .projitems files that belonged to these test projects has been cleaned up. The obsolete `TestInstrumentation` class has been deleted in favor of the newer `NUnitInstrumentation` class. The `Build.GetSerial ()` API is restricted on API 29+, so a check has been added to prevent the following exception: AndroidRuntime: FATAL EXCEPTION: Instr: xamarin.android.runtimetests.NUnitInstrumentation AndroidRuntime: Process: Mono.Android_Tests, PID: 3489 AndroidRuntime: java.lang.SecurityException: getSerial: The user 10106 does not meet the requirements to access device identifiers. AndroidRuntime: at android.os.Parcel.createException(Parcel.java:2071) AndroidRuntime: at android.os.Parcel.readException(Parcel.java:2039) AndroidRuntime: at android.os.Parcel.readException(Parcel.java:1987) AndroidRuntime: at android.os.IDeviceIdentifiersPolicyService$Stub$Proxy.getSerialForPackage(IDeviceIdentifiersPolicyService.java:159) AndroidRuntime: at android.os.Build.getSerial(Build.java:162)
pjcollins
added a commit
to pjcollins/android
that referenced
this pull request
Nov 9, 2020
Context: dotnet#5250 PR dotnet#5250 will be adding another another Mono.Android-Tests project file, and it feels like a good time to move all relevant Mono.Android test source into a single location and reduce duplication where possible. The `src/Mono.Android/Test/` folder has been moved into the top level `tests` directory. The two existing `tests/Runtime-*` folders have been moved under the new `tests/Mono.Android-Tests` folder. Some duplication that existed in the .targets and .projitems files that belonged to these test projects has been cleaned up. The obsolete `TestInstrumentation` class has been deleted in favor of the newer `NUnitInstrumentation` class. The `Build.GetSerial ()` API is restricted on API 29+, so a check has been added to prevent the following exception: AndroidRuntime: FATAL EXCEPTION: Instr: xamarin.android.runtimetests.NUnitInstrumentation AndroidRuntime: Process: Mono.Android_Tests, PID: 3489 AndroidRuntime: java.lang.SecurityException: getSerial: The user 10106 does not meet the requirements to access device identifiers. AndroidRuntime: at android.os.Parcel.createException(Parcel.java:2071) AndroidRuntime: at android.os.Parcel.readException(Parcel.java:2039) AndroidRuntime: at android.os.Parcel.readException(Parcel.java:1987) AndroidRuntime: at android.os.IDeviceIdentifiersPolicyService$Stub$Proxy.getSerialForPackage(IDeviceIdentifiersPolicyService.java:159) AndroidRuntime: at android.os.Build.getSerial(Build.java:162)
jonpryor
pushed a commit
that referenced
this pull request
Nov 11, 2020
Context: #5250 PR #5250 will be adding another another Mono.Android-Tests project file, and it feels like a good time to move all relevant Mono.Android test source into a single location and reduce duplication. Move the `src/Mono.Android/Test/` folder to the `tests/Mono.Android-Tests` directory. The two existing `tests/Runtime-*` folders have been moved under the new `tests/Mono.Android-Tests` folder. Some duplication that existed in the `.targets` and `.projitems` files that belonged to these test projects has been cleaned up. The obsolete `TestInstrumentation` class has been deleted in favor of the newer `NUnitInstrumentation` class. The `Build.GetSerial ()` API is restricted on API 29+, so a check has been added to `TestInstrumentation.LogDeviceInfo()` to prevent the following exception: AndroidRuntime: FATAL EXCEPTION: Instr: xamarin.android.runtimetests.NUnitInstrumentation AndroidRuntime: Process: Mono.Android_Tests, PID: 3489 AndroidRuntime: java.lang.SecurityException: getSerial: The user 10106 does not meet the requirements to access device identifiers. AndroidRuntime: at android.os.Parcel.createException(Parcel.java:2071) AndroidRuntime: at android.os.Parcel.readException(Parcel.java:2039) AndroidRuntime: at android.os.Parcel.readException(Parcel.java:1987) AndroidRuntime: at android.os.IDeviceIdentifiersPolicyService$Stub$Proxy.getSerialForPackage(IDeviceIdentifiersPolicyService.java:159) AndroidRuntime: at android.os.Build.getSerial(Build.java:162)
pjcollins
force-pushed
the
net5-runtime-tests
branch
3 times, most recently
from
0a57943 to
d8bde8a
Compare
A new version of Mono.Android-Tests has been added to run against the .NET 6 SDK: * `tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj` To support this, new .NET .csproj files have been added alongside all of the existing legacy Xamarin.Android unit test library projects. These projects target `net5.0-android` and build against our .NET 6 SDK: * `src/Mono.Android/Test/Java.Interop-Tests/Java.Interop-Tests.NET.csproj` * `src/Mono.Android/Test/Mono.Android-Test.Library/Mono.Android-Test.Library.NET.csproj` * `src/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.NET.csproj` * `tests/TestRunner.Core/TestRunner.Core.NET.csproj` * `tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj` The `_CreateAar` target was being skipped for the new Java.Interop-Tests.NET project, as it had no inputs. As a result, the `Mono.Android-Test-classes.jar` file required by these tests was not being included in the application project. To fix this, I've added `@(AndroidJavaLibrary)` to `@(_CreateAarInputs)` so that these items will also be considered as inputs for this target/task.
pjcollins
force-pushed
the
net5-runtime-tests
branch
from
d8bde8a to
3544199
Compare
pjcollins
commented
Nov 16, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A new version of Mono.Android-Tests has been added to run against the
.NET 6 SDK:
tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csprojTo support this, new .NET .csproj files have been added alongside all of
the existing legacy Xamarin.Android unit test library projects. These
projects target
net5.0-androidand build against our .NET 6 SDK:src/Mono.Android/Test/Java.Interop-Tests/Java.Interop-Tests.NET.csprojsrc/Mono.Android/Test/Mono.Android-Test.Library/Mono.Android-Test.Library.NET.csprojsrc/Xamarin.Android.NUnitLite/Xamarin.Android.NUnitLite.NET.csprojtests/TestRunner.Core/TestRunner.Core.NET.csprojtests/TestRunner.NUnit/TestRunner.NUnit.NET.csprojThe
_CreateAartarget was being skipped for the new Java.Interop-Tests.NETproject, as it had no inputs. As a result, the
Mono.Android-Test-classes.jarfile required by these tests was not being included in the application project.
To fix this, I've added
@(AndroidJavaLibrary)to@(_CreateAarInputs)so thatthese items will also be considered as inputs for this target/task.
All tests which have been ignored are tied back to one of the following issues: