Skip to content

Port 'JcwGen-Tests' to .NET. #7949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2023
Merged

Port 'JcwGen-Tests' to .NET. #7949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,26 @@ stages:
extraBuildArgs: -p:TestsFlavor=AotLlvm -p:EnableLLVM=true -p:AndroidEnableProfiledAot=false
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: $(DotNetTargetFramework)-AotLlvm

- template: yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
testName: Xamarin.Android.JcwGen_Tests
project: tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
testResultsFiles: TestResult-Xamarin.Android.JcwGen_Tests-$(XA.Build.Configuration).xml
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Xamarin.Android.JcwGen_Tests-Signed.apk
artifactFolder: $(DotNetTargetFramework)-Default

- template: yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
testName: Xamarin.Android.JcwGen_Tests_FastDev
project: tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
testResultsFiles: TestResult-Xamarin.Android.JcwGen_Tests-$(XA.Build.Configuration).xml
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Xamarin.Android.JcwGen_Tests-Signed.apk
artifactFolder: $(DotNetTargetFramework)-FastDev_Assemblies_Dexes
extraBuildArgs: /p:AndroidFastDeploymentType=Assemblies:Dexes

- template: yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: Xamarin.Android.Tools.Aidl-Tests - macOS
Expand Down
6 changes: 6 additions & 0 deletions tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public void TestTimingCreateTimingIsCorrectType ()
Assert.IsTrue (t is Com.Xamarin.Android.Timing);
}

#if TODO_7794
[Test]
public void TestResourceId ()
{
Expand All @@ -37,6 +38,7 @@ public void TestNativeLibDllImportInEmbeddedArchive ()
{
Assert.AreEqual (TestNativeLib.Binding.SampleFunction2 (), 0xf200);
}
#endif // TODO_7794

[Test]
public void NamespaceTransforms ()
Expand Down Expand Up @@ -178,6 +180,9 @@ public void VirtualMethodBinding ()
}
}

#if TODO_7794
// This test requires that https://github.com/xamarin/xamarin-android/issues/7794
// be completed first, as it depends on Xamarin.Android.FixJavaAbstractMethod* projects.
[Test]
public void JavaAbstractMethodTest ()
{
Expand All @@ -202,6 +207,7 @@ public void JavaAbstractMethodTest ()
if (mi != null && mi.GetMethodBody ().LocalVariables.Count == 0)
throw new Exception ("FixAbstractMethodStep broken, MethodWithRT added, while it should not be");
}
#endif // TODO_7794

// Context https://bugzilla.xamarin.com/show_bug.cgi?id=36036
[Test]
Expand Down
28 changes: 0 additions & 28 deletions tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Transforms/metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<metadata>
<!-- Change Bxc4288.useColors() method to take and return Android.Graphics.Color -->
<attr
path="/api/package[@name='com.xamarin.android']/class[@name='Bxc4288']/method[@name='useColors']"
name="return"
>Android.Graphics.Color</attr>
<attr
path="/api/package[@name='com.xamarin.android']/class[@name='Bxc4288']/method[@name='useColors']/parameter[1]"
name="type"
>Android.Graphics.Color</attr>

<!-- Interface method parameters names are lost -->
<attr path="/api/package[@name='com.xamarin.android']/interface[@name='DataListener']/method[@name='onDataReceived']/parameter[1]" name="managedName">fromNode</attr>
<attr path="/api/package[@name='com.xamarin.android']/interface[@name='DataListener']/method[@name='onDataReceived']/parameter[2]" name="managedName">fromChannel</attr>
<attr path="/api/package[@name='com.xamarin.android']/interface[@name='DataListener']/method[@name='onDataReceived']/parameter[3]" name="managedName">payloadType</attr>
<attr path="/api/package[@name='com.xamarin.android']/interface[@name='DataListener']/method[@name='onDataReceived']/parameter[4]" name="managedName">payload</attr>
</metadata>
150 changes: 54 additions & 96 deletions tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,117 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{9479B71F-19FE-48F9-AB3F-AE764D76038A}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<TargetFramework>$(DotNetAndroidTargetFramework)</TargetFramework>
<SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<ApplicationId>Xamarin.Android.JcwGen_Tests</ApplicationId>
<ApplicationVersion>1</ApplicationVersion>
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<RootNamespace>Xamarin.Android.JcwGenTests</RootNamespace>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AssemblyName>Xamarin.Android.JcwGen-Tests</AssemblyName>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
</PropertyGroup>

<Import Project="..\..\..\Configuration.props" />

<PropertyGroup>
<TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
<OutputPath>..\..\..\bin\Test$(Configuration)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize>
<OutputPath>..\..\..\bin\TestDebug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>..\..\..\bin\TestRelease</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Xamarin.Android.NUnitLite" />
</ItemGroup>

<ItemGroup>
<Compile Include="BindingTests.cs" />
<Compile Include="KotlinUnsignedTypesTests.cs" />
<Compile Include="DimBindingTests.cs" />
<Compile Include="ExceptionTests.cs" />
<Compile Include="MainActivity.cs" />
<Compile Include="TestInstrumentation.cs" />
<Compile Include="TimingTests.cs" />
<Compile Include="TypeWithUnicodeCharacters.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<AndroidJavaSource Include="../Xamarin.Android.McwGen-Tests/java/**/*.java" />
<Compile Remove="TimingTests.cs" />
<AndroidLibrary Include="../Xamarin.Android.McwGen-Tests/Jars/KotlinUnsignedTypes.jar" />
<None Remove="Java\DefaultMethodsInterface.java" />
<None Remove="Java\StaticMethodsInterface.java" />
</ItemGroup>

<ItemGroup>
<AndroidEnvironment Include="Environment.txt" />
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.8.0.1" />
</ItemGroup>

<ItemGroup>
<None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" />
<None Include="Properties\AndroidManifest.xml" />
<ProjectReference Include="..\..\..\src\Xamarin.Android.NUnitLite\Xamarin.Android.NUnitLite.NET.csproj" />
</ItemGroup>

<ItemGroup>
<AndroidResource Include="Resources\drawable\Icon.png" />
<AndroidNamespaceReplacement Include="xamarin.example" Replacement="Example" />
<AndroidNamespaceReplacement Include="com.example" Replacement="Transformed.Namespace" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="Xamarin.Android.JcwGen-Tests.targets" />

<PropertyGroup>
<BuildDependsOn>
BuildNativeLibs;
$(BuildDependsOn)
</BuildDependsOn>
<_PackageName>$(ApplicationId)</_PackageName>
</PropertyGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\arm64-v8a\libtiming.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libtiming.so" />
<AndroidNativeLibrary Include="libs\x86\libtiming.so" />
<AndroidNativeLibrary Include="libs\x86_64\libtiming.so" />
</ItemGroup>
<PropertyGroup>
<CleanDependsOn>
$(CleanDependsOn);
CleanLocal;
</CleanDependsOn>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
</PropertyGroup>

<ItemGroup>
<AndroidJavaLibrary Include="..\Xamarin.Android.FixJavaAbstractMethod-APIv2Binding\Jars\Cursor.jar">
<Link>Jars\Cursor.jar</Link>
</AndroidJavaLibrary>
<TestApk Include="$(OutputPath)$(ApplicationId)-Signed.apk">
<Package>$(ApplicationId)</Package>
<TimingDefinitionsFilename>$(MSBuildThisFileDirectory)..\..\..\build-tools\scripts\TimingDefinitions.txt</TimingDefinitionsFilename>
<TimingResultsFilename>$(MSBuildThisFileDirectory)..\..\..\TestResult-Xamarin.Android.JcwGen_Tests-times.csv</TimingResultsFilename>
</TestApk>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Xamarin.Android.FixJavaAbstractMethod-APIv2Binding\Xamarin.Android.FixJavaAbstractMethod-APIv2Binding.csproj">
<Project>{7B9D9F32-973F-49CF-A8F8-05BDFC75556C}</Project>
<Name>Xamarin.Android.FixJavaAbstractMethod-APIv2Binding</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Android.FixJavaAbstractMethod-Library\Xamarin.Android.FixJavaAbstractMethod-Library.csproj">
<Project>{B7476528-C166-40BF-931F-EAEB02247879}</Project>
<Name>Xamarin.Android.FixJavaAbstractMethod-Library</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Android.LibraryProjectZip-LibBinding\Xamarin.Android.LibraryProjectZip-LibBinding.csproj">
<Project>{9553ED9D-92EA-411B-ADFF-21C5608CCD16}</Project>
<Name>Xamarin.Android.LibraryProjectZip-LibBinding</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Android.McwGen-Tests\Xamarin.Android.McwGen-Tests.csproj">
<Project>{EF798EB3-D639-4E09-9DB0-233E67F727B0}</Project>
<Name>Xamarin.Android.McwGen-Tests</Name>
</ProjectReference>
<TestApkInstrumentation Include="xamarin.android.jcwgentests.TestInstrumentation">
<Package>$(ApplicationId)</Package>
<ResultsPath>$(OutputPath)TestResult-Xamarin.Android.JcwGen_Tests.xml</ResultsPath>
</TestApkInstrumentation>

<TestApkPermission Include="READ_EXTERNAL_STORAGE">
<Package>$(ApplicationId)</Package>
</TestApkPermission>

<TestApkPermission Include="WRITE_EXTERNAL_STORAGE">
<Package>$(ApplicationId)</Package>
</TestApkPermission>
</ItemGroup>
</Project>

<Import Project="..\..\..\build-tools\scripts\TestApks.targets" />

</Project>
29 changes: 0 additions & 29 deletions tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.projitems
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.targets
View file
Open in desktop

This file was deleted.