From 328766d4d23dc67385e04e2c5c2a0b325f8912b0 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 7 Nov 2019 10:06:20 -0600 Subject: [PATCH 1/2] Convert Test projects to SDK style projects. --- Java.Interop.sln | 45 +- Makefile | 22 +- NuGet.Config | 11 + build-tools/automation/azure-pipelines.yaml | 3 +- build-tools/scripts/RunNUnitTests.targets | 4 +- .../Java.Interop.Dynamic.csproj | 3 - .../Tests/Dynamic-Tests.projitems | 15 - .../Tests/Dynamic-Tests.shproj | 11 - .../Tests/Java.Interop.Dynamic-Tests.csproj | 71 -- .../Java.Interop.Export.csproj | 4 - .../Tests/Export-Tests.projitems | 17 - .../Tests/Export-Tests.shproj | 11 - .../Tests/Export-Tests.targets | 17 - ....Interop.Tools.JavaCallableWrappers.csproj | 6 +- ...op.Tools.JavaCallableWrappers-Tests.csproj | 81 -- .../Test/packages.config | 4 - src/Java.Interop/Java.Interop.csproj | 1 - .../Cadenza.Collections/DictionaryContract.cs | 218 ------ .../Tests/Interop-Tests.projitems | 57 -- src/Java.Interop/Tests/Interop-Tests.shproj | 11 - src/Java.Interop/Tests/Interop-Tests.targets | 24 - ....Android.Tools.ApiXmlAdjuster-Tests.csproj | 57 -- .../Tests/packages.config | 4 - ...amarin.Android.Tools.ApiXmlAdjuster.csproj | 8 +- .../Tests/packages.config | 5 - .../Xamarin.Android.Tools.Bytecode.csproj | 6 - .../Java.Interop-PerformanceTests.csproj | 93 +-- .../Java.Interop}/JavaTiming.cs | 0 .../Java.Interop}/TimingTests.cs | 0 .../interop/performance/JavaTiming.java | 0 .../packages.config | 4 - .../Cadenza.Collections/CollectionContract.cs | 0 .../Cadenza.Collections/EnumerableContract.cs | 0 .../Cadenza.Collections/ListContract.cs | 0 .../Cadenza/BaseRocksFixture.cs | 0 .../Java.Interop-Tests.csproj | 110 ++- .../Java.Interop/CallNonvirtualBase.cs | 0 .../Java.Interop/CallNonvirtualDerived.cs | 0 .../Java.Interop/CallNonvirtualDerived2.cs | 0 .../CallVirtualFromConstructorBase.cs | 0 .../CallVirtualFromConstructorDerived.cs | 0 .../InvokeVirtualFromConstructorTests.cs | 0 .../Java.Interop/JavaArrayContract.cs | 0 .../JavaBooleanArrayContractTests.cs | 0 .../JavaCharArrayContractTests.cs | 0 .../JavaDoubleArrayContractTests.cs | 0 .../Java.Interop/JavaExceptionTests.cs | 0 .../JavaInt16ArrayContractTests.cs | 0 .../JavaInt32ArrayContractTests.cs | 0 .../JavaInt64ArrayContractTests.cs | 0 .../Java.Interop/JavaManagedGCBridgeTests.cs | 0 .../Java.Interop/JavaObjectArrayTest.cs | 0 .../Java.Interop/JavaObjectExtensionsTests.cs | 0 .../Java.Interop/JavaObjectTest.cs | 0 .../JavaPrimitiveArrayContract.cs | 0 .../JavaSByteArrayContractTests.cs | 0 .../JavaSingleArrayContractTests.cs | 0 .../Java.Interop/JavaVMFixture.Partial.cs | 0 .../Java.Interop/JniEnvironmentTests.cs | 0 .../Java.Interop/JniInstanceMethodIDTest.cs | 0 .../Java.Interop/JniMarshalTests.cs | 0 .../Java.Interop/JniPeerMembersTests.cs | 0 .../JniReferenceSafeHandleTest.cs | 0 .../JniRuntime.JniValueManagerTests.cs | 0 .../Java.Interop/JniRuntimeTest.cs | 0 .../Java.Interop/JniTransitionTest.cs | 0 .../Java.Interop/JniTypeManagerTests.cs | 0 .../JniTypeSignatureAttributeTest.cs | 0 .../Java.Interop/JniTypeSignatureTest.cs | 0 .../Java.Interop/JniTypeTest.cs | 0 .../JniValueMarshalerAttributeTests.cs | 0 .../JniValueMarshalerContractTests.cs | 0 .../Java.Interop/MethodBindingTests.cs | 0 .../Java.Interop/SelfRegistration.cs | 0 .../Java.Interop/SelfRegistrationTests.cs | 0 .../Java.Interop/TestType.cs | 0 .../Java.Interop/TestTypeTests.cs | 0 .../xamarin/interop/CallNonvirtualBase.java | 0 .../interop/CallNonvirtualDerived.java | 0 .../interop/CallNonvirtualDerived2.java | 0 .../CallVirtualFromConstructorBase.java | 0 .../CallVirtualFromConstructorDerived.java | 0 .../xamarin/interop/CrossReferenceBridge.java | 0 .../com/xamarin/interop/SelfRegistration.java | 0 .../java/com/xamarin/interop/TestType.java | 0 tests/Java.Interop-Tests/packages.config | 11 - .../Java.Interop.Dynamic-Tests.csproj | 83 +- .../Java.Interop}/DynamicJavaClassTests.cs | 0 .../Java.Interop}/DynamicJavaInstanceTests.cs | 0 .../packages.config | 11 - .../Java.Interop.Export-Tests.csproj | 100 +-- .../Java.Interop/ExportTest.cs | 0 .../Java.Interop/MarshalMemberBuilderTest.cs | 0 .../xamarin/interop/export/ExportType.java | 0 .../Java.Interop.Export-Tests/packages.config | 11 - .../Android.App/ActivityAttribute.cs | 0 .../Android.App/ApplicationAttribute.cs | 0 .../Android.App/InstrumentationAttribute.cs | 0 .../Android.App/ServiceAttribute.cs | 0 .../BroadcastReceiverAttribute.cs | 0 .../ContentProviderAttribute.cs | 0 ...op.Tools.JavaCallableWrappers-Tests.csproj | 34 + .../Crc64Tests.cs | 0 .../IdentifierValidatorTests.cs | 0 .../JavaCallableWrapperGeneratorTests.cs | 0 .../JavaNativeTypeManagerTests.cs | 0 .../SupportDeclarations.cs | 0 .../TypeNameMapGeneratorTests.cs | 0 .../PerformanceTests.projitems | 17 - .../PerformanceTests/PerformanceTests.shproj | 11 - .../PerformanceTests/PerformanceTests.targets | 17 - tests/TestJVM/TestJVM.csproj | 70 +- .../GenericInheritanceMappingTest.cs | 0 .../JavaApiTest.cs | 0 .../JavaApiTestHelper.cs | 7 +- .../OverrideMarkerTest.cs | 0 .../TypeResolverTest.cs | 0 ....Android.Tools.ApiXmlAdjuster-Tests.csproj | 27 + .../api-24.xml.in | 0 .../ClassFileFixture.cs | 23 +- .../ClassFileTests.cs | 0 .../ExpectedFieldDeclaration.cs | 0 .../ExpectedInnerClassInfo.cs | 0 .../ExpectedMethodDeclaration.cs | 0 .../ExpectedTypeDeclaration.cs | 0 .../IJavaInterfaceTests.cs | 0 .../JavaAnnotationTests.cs | 0 .../JavaEnumTests.cs | 0 .../JavaType.1Tests.cs | 0 .../JavaType.ASCTests.cs | 0 .../JavaType.PSCTests.cs | 0 .../JavaType.RNC.RPNCTests.cs | 0 .../JavaType.RNCTests.cs | 0 .../JavaTypeTests.cs | 0 .../KotlinFixupsTests.cs | 0 .../KotlinMetadataTests.cs | 4 +- .../NonGenericGlobalTypeTests.cs | 0 .../ParameterFixupTests.cs | 0 .../Resources}/IJavaInterface.xml | 0 .../Resources}/JavaAnnotation.xml | 0 .../Resources}/JavaEnum.xml | 0 .../Resources}/JavaType$1.xml | 0 .../Resources}/JavaType$ASC.xml | 0 .../Resources}/JavaType$PSC.xml | 0 .../Resources}/JavaType$RNC$RPNC.xml | 0 .../Resources}/JavaType$RNC.xml | 0 .../Resources}/JavaType.xml | 0 .../Resources}/NonGenericGlobalType.xml | 0 .../Resources}/ParameterDescription.txt | 0 .../Resources}/ParameterFixup.xml | 0 .../Resources}/ParameterFixupApiXmlDocs.xml | 0 .../ParameterFixupFromDescriptionText.xml | 0 .../Resources}/ParameterFixupFromDocs.xml | 0 ...amarin.Android.Tools.Bytecode-Tests.csproj | 74 ++ .../java/NonGenericGlobalType.java | 0 .../java/com/xamarin/IJavaInterface.java | 0 .../java/com/xamarin/IParameterInterface.java | 0 .../java/com/xamarin/JavaAnnotation.java | 0 .../java/com/xamarin/JavaType.java | 0 .../java/com/xamarin/NestedInterface.java | 0 .../com/xamarin/ParameterAbstractClass.java | 0 .../java/com/xamarin/ParameterClass.java | 0 .../java/com/xamarin/ParameterClass2.java | 0 .../java/java/util/Collection.java | 0 .../kotlin/CompanionObject$Companion.class | Bin 0 -> 752 bytes .../kotlin/CompanionObject.class | Bin 0 -> 705 bytes .../kotlin/CompanionObject.kt | 3 + .../kotlin/DataClass.class | Bin 0 -> 2800 bytes .../kotlin/DataClass.kt | 3 + .../kotlin/EnumClass.class | Bin 0 -> 1196 bytes .../kotlin/EnumClass.kt | 3 + .../kotlin/EnumClassWithInterfaces$PLUS.class | Bin 0 -> 928 bytes .../EnumClassWithInterfaces$TIMES.class | Bin 0 -> 931 bytes .../kotlin/EnumClassWithInterfaces.class | Bin 0 -> 1840 bytes .../kotlin/EnumClassWithInterfaces.kt | 15 + .../EnumClassWithInterfacesInterface.class | Bin 0 -> 496 bytes .../kotlin/ExtensionMethods.class | Bin 0 -> 1295 bytes .../kotlin/ExtensionMethods.kt | 7 + .../kotlin/InlineClass.class | Bin 0 -> 2431 bytes .../kotlin/InlineClass.kt | 1 + .../kotlin/Interfaces.kt | 26 + .../kotlin/InternalClass.class | Bin .../kotlin/InternalClass.kt | 0 .../kotlin/InternalConstructor.class | Bin 0 -> 570 bytes .../kotlin/InternalConstructor.kt | 1 + .../kotlin/InternalMethod.class | Bin 0 -> 570 bytes .../kotlin/InternalMethod.kt | 5 + .../kotlin/InternalProperty.class | Bin 0 -> 1079 bytes .../kotlin/InternalProperty.kt | 3 + .../kotlin/META-INF/main.kotlin_module | Bin 0 -> 16 bytes .../kotlin/MethodImplementation.class | Bin 0 -> 2377 bytes .../kotlin/MethodImplementation.kt | 7 + .../kotlin/MyInterface$DefaultImpls.class | Bin 0 -> 949 bytes .../kotlin/MyInterface.class | Bin 0 -> 744 bytes .../kotlin/MyInterface2$DefaultImpls.class | Bin 0 -> 866 bytes .../kotlin/MyInterface2.class | Bin 0 -> 554 bytes .../kotlin/MyInterfaceChild.class | Bin 0 -> 1136 bytes .../kotlin/Object.class | Bin 0 -> 538 bytes .../kotlin/Object.kt | 1 + .../kotlin/ParameterName.class | Bin 0 -> 391 bytes .../kotlin/ParameterName.kt | 3 + .../kotlin/PrivateClass.class | Bin .../kotlin/PrivateClass.kt | 0 .../kotlin/PublicClass$ProtectedClass.class | Bin .../kotlin/PublicClass.class | Bin .../kotlin/PublicClass.kt | 0 .../kotlin/RenameExtensionParameter.kt | 1 + .../kotlin/RenameExtensionParameterKt.class | Bin 0 -> 1073 bytes .../kotlin/SealedClass.class | Bin 0 -> 455 bytes .../kotlin/SealedClass.kt | 1 + .../kotlin/SetterParameterName.class | Bin 0 -> 641 bytes .../kotlin/SetterParameterName.kt | 3 + .../Integration-Tests/AccessModifiers.cs | 0 .../Integration-Tests/Adapters.cs | 0 .../Android_Graphics_Color.cs | 0 .../Integration-Tests/Arrays.cs | 0 .../Integration-Tests/BaseGeneratorTest.cs | 0 .../Integration-Tests/CSharpKeywords.cs | 0 .../Integration-Tests/Compiler.cs | 4 +- .../Integration-Tests/Constructors.cs | 0 .../Integration-Tests/Enumerations.cs | 0 .../Integration-Tests/GenericArguments.cs | 0 .../InterfaceMethodsConflict.cs | 0 .../Integration-Tests/Interfaces.cs | 0 .../Integration-Tests/Java_Lang_Enum.cs | 0 .../Integration-Tests/Java_Lang_Object.cs | 0 .../Integration-Tests/Java_Util_List.cs | 0 .../Integration-Tests/NestedTypes.cs | 0 .../Integration-Tests/NonStaticFields.cs | 0 .../Integration-Tests/NormalMethods.cs | 0 .../Integration-Tests/NormalProperties.cs | 0 .../Integration-Tests/PamareterXPath.cs | 0 .../Integration-Tests/StaticFields.cs | 0 .../Integration-Tests/StaticMethods.cs | 0 .../Integration-Tests/StaticProperties.cs | 0 .../Integration-Tests/Streams.cs | 0 .../Tests => tests/generator-Tests}/README.md | 0 .../Android_Runtime_CharSequence.cs | 0 .../SupportFiles/GeneratedEnumAttribute.cs | 0 .../SupportFiles/IJavaObject.cs | 0 .../SupportFiles/IntDefinitionAttribute.cs | 0 .../generator-Tests}/SupportFiles/JNIEnv.cs | 0 .../generator-Tests}/SupportFiles/JNIEnv.g.cs | 0 .../SupportFiles/JObjectRefType.cs | 0 .../generator-Tests}/SupportFiles/JValue.cs | 0 .../SupportFiles/JavaArray.cs | 0 .../SupportFiles/JavaCollection.cs | 0 .../SupportFiles/JavaConvert.cs | 0 .../SupportFiles/JavaDictionary.cs | 0 .../JavaInterfaceDefaultMethodAttribute.cs | 0 .../SupportFiles/JavaObject.cs | 0 .../SupportFiles/JavaObjectExtensions.cs | 0 .../JavaTypeParametersAttribute.cs | 0 .../SupportFiles/Java_Lang_ICharSequence.cs | 0 .../SupportFiles/Java_Lang_Object.cs | 0 .../SupportFiles/Java_Lang_String.cs | 0 .../SupportFiles/Java_Lang_Throwable.cs | 0 .../SupportFiles/JniHandleOwnership.cs | 0 .../SupportFiles/NamespaceMappingAttribute.cs | 0 .../SupportFiles/PreserveAttribute.cs | 0 .../SupportFiles/RegisterAttribute.cs | 0 .../SupportFiles/TypeManager.cs | 0 .../generator-Tests}/Tests-Core/.gitignore | 0 .../generator-Tests}/Tests-Core/api-cp.xml | 0 .../generator-Tests}/Tests-Core/api.xml | 0 .../expected.cp/GeneratedFiles.projitems | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../expected.cp/Java.Lang.Object.cs | 0 .../expected.cp/Java.Lang.String.cs | 0 .../Xamarin.Test.Invalidnames.In.cs | 0 ...in.Test.Invalidnames.InvalidNameMembers.cs | 0 .../expected.cp/__NamespaceMapping__.cs | 0 .../Tests-Core/expected.cp/enumlist | 0 .../expected.ji/Android.Text.ISpannable.cs | 0 .../expected.ji/Android.Text.ISpanned.cs | 0 .../expected.ji/Android.Text.SpanTypes.cs | 0 .../Android.Text.SpannableString.cs | 0 .../Android.Text.SpannableStringInternal.cs | 0 .../expected.ji/Android.Views.View.cs | 0 .../expected.ji/GeneratedFiles.projitems | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../expected.ji/Java.Lang.Object.cs | 0 .../expected.ji/__NamespaceMapping__.cs | 0 .../Tests-Core/expected.ji/enumlist | 0 .../expected/Android.Text.ISpannable.cs | 0 .../expected/Android.Text.ISpanned.cs | 0 .../expected/Android.Text.SpanTypes.cs | 0 .../expected/Android.Text.SpannableString.cs | 0 .../Android.Text.SpannableStringInternal.cs | 0 .../Tests-Core/expected/Android.Views.View.cs | 0 .../expected/GeneratedFiles.projitems | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../Tests-Core/expected/Java.Lang.Object.cs | 0 .../expected/__NamespaceMapping__.cs | 0 .../Tests-Core/expected/enumlist | 0 .../generator-Tests}/Tests-Core/fields-cp.xml | 0 .../generator-Tests}/Tests-Core/fields.xml | 0 .../Tests-Core/methods-cp.xml | 0 .../generator-Tests}/Tests-Core/methods.xml | 0 .../Unit-Tests/AdjusterTests.cs | 0 .../Common/WriteCharSequenceEnumerator.txt | 0 .../Common/WriteClassAbstractMembers.txt | 0 .../Common/WriteInterfaceEventArgs.txt | 0 .../Common/WriteInterfaceEventHandler.txt | 0 .../Common/WriteInterfaceEventHandlerImpl.txt | 0 .../WriteInterfaceEventHandlerImplContent.txt | 0 .../Common/WriteInterfaceExtensionMethods.txt | 0 .../WriteInterfaceExtensionsDeclaration.txt | 0 .../Common/WriteInterfaceListenerEvent.txt | 0 ...erfaceListenerEventWithHandlerArgument.txt | 0 .../Common/WriteInterfaceListenerProperty.txt | 0 .../Common/WriteInterfaceMethodInvokers.txt | 0 .../WriteInterfaceMethodInvokersWithSkips.txt | 0 .../Common/WriteInterfaceMethods.txt | 0 .../Common/WriteInterfaceProperties.txt | 0 .../Common/WriteInterfacePropertyInvokers.txt | 0 ...riteInterfacePropertyInvokersWithSkips.txt | 0 .../WriteInterfaceRedeclaredDefaultMethod.txt | 0 .../WritePropertyAbstractDeclaration.txt | 0 .../Common/WritePropertyCallbacks.txt | 0 .../Common/WritePropertyDeclaration.txt | 0 .../Common/WritePropertyInvoker.txt | 0 .../Common/WritePropertyStringVariant.txt | 0 .../JavaInterop1/WriteClass.txt | 0 .../JavaInterop1/WriteClassConstructors.txt | 0 .../JavaInterop1/WriteClassHandle.txt | 0 .../JavaInterop1/WriteClassInvoker.txt | 0 .../JavaInterop1/WriteClassInvokerHandle.txt | 0 .../JavaInterop1/WriteClassInvokerMembers.txt | 0 .../JavaInterop1/WriteClassMethodInvokers.txt | 0 .../WriteClassMethodInvokersWithSkips.txt | 0 .../JavaInterop1/WriteClassMethods.txt | 0 .../JavaInterop1/WriteClassProperties.txt | 0 .../WriteClassPropertyInvokers.txt | 0 .../WriteClassPropertyInvokersWithSkips.txt | 0 .../WriteConstSugarInterfaceFields.txt | 0 .../JavaInterop1/WriteCtor.txt | 0 .../JavaInterop1/WriteCtorDeprecated.txt | 0 .../WriteCtorWithStringOverload.txt | 0 .../WriteDefaultInterfaceMethodInvoker.txt | 0 .../JavaInterop1/WriteFieldConstant.txt | 0 .../WriteFieldConstantWithIntValue.txt | 0 .../WriteFieldConstantWithStringValue.txt | 0 .../JavaInterop1/WriteFieldGetBody.txt | 0 .../JavaInterop1/WriteFieldIdField.txt | 0 .../JavaInterop1/WriteFieldInt.txt | 0 .../JavaInterop1/WriteFieldSetBody.txt | 0 .../JavaInterop1/WriteFieldString.txt | 0 .../JavaInterop1/WriteInterface.txt | 0 .../WriteInterfaceDeclaration.txt | 0 .../WriteInterfaceDefaultMethod.txt | 0 .../WriteInterfaceDefaultProperty.txt | 0 ...riteInterfaceDefaultPropertyGetterOnly.txt | 0 .../JavaInterop1/WriteInterfaceFields.txt | 0 .../JavaInterop1/WriteInterfaceInvoker.txt | 0 .../WriteMethodAbstractWithVoidReturn.txt | 0 .../WriteMethodAsyncifiedWithIntReturn.txt | 0 .../WriteMethodAsyncifiedWithVoidReturn.txt | 0 .../JavaInterop1/WriteMethodBody.txt | 0 .../WriteMethodFinalWithVoidReturn.txt | 0 .../JavaInterop1/WriteMethodIdField.txt | 0 .../JavaInterop1/WriteMethodProtected.txt | 0 .../WriteMethodStaticWithVoidReturn.txt | 0 .../JavaInterop1/WriteMethodWithIntReturn.txt | 0 .../WriteMethodWithStringReturn.txt | 0 .../WriteMethodWithVoidReturn.txt | 0 .../WriteParameterListCallArgs.txt | 0 .../WriteParameterListCallArgsForInvoker.txt | 0 .../JavaInterop1/WriteProperty.txt | 0 .../WriteStaticInterfaceMethod.txt | 0 .../WriteStaticInterfaceProperty.txt | 0 .../XAJavaInterop1/WriteClass.txt | 0 .../XAJavaInterop1/WriteClassConstructors.txt | 0 .../XAJavaInterop1/WriteClassHandle.txt | 0 .../XAJavaInterop1/WriteClassInvoker.txt | 0 .../WriteClassInvokerHandle.txt | 0 .../WriteClassInvokerMembers.txt | 0 .../WriteClassMethodInvokers.txt | 0 .../WriteClassMethodInvokersWithSkips.txt | 0 .../XAJavaInterop1/WriteClassMethods.txt | 0 .../XAJavaInterop1/WriteClassProperties.txt | 0 .../WriteClassPropertyInvokers.txt | 0 .../WriteClassPropertyInvokersWithSkips.txt | 0 .../XAJavaInterop1/WriteCtor.txt | 0 .../XAJavaInterop1/WriteCtorDeprecated.txt | 0 .../WriteCtorWithStringOverload.txt | 0 .../WriteDefaultInterfaceMethodInvoker.txt | 0 .../XAJavaInterop1/WriteFieldConstant.txt | 0 .../WriteFieldConstantWithIntValue.txt | 0 .../WriteFieldConstantWithStringValue.txt | 0 .../XAJavaInterop1/WriteFieldGetBody.txt | 0 .../XAJavaInterop1/WriteFieldIdField.txt | 0 .../XAJavaInterop1/WriteFieldInt.txt | 0 .../XAJavaInterop1/WriteFieldSetBody.txt | 0 .../XAJavaInterop1/WriteFieldString.txt | 0 .../XAJavaInterop1/WriteInterface.txt | 0 .../WriteInterfaceDeclaration.txt | 0 .../WriteInterfaceDefaultMethod.txt | 0 .../WriteInterfaceDefaultProperty.txt | 0 ...riteInterfaceDefaultPropertyGetterOnly.txt | 0 .../XAJavaInterop1/WriteInterfaceInvoker.txt | 0 .../WriteMethodAbstractWithVoidReturn.txt | 0 .../WriteMethodAsyncifiedWithIntReturn.txt | 0 .../WriteMethodAsyncifiedWithVoidReturn.txt | 0 .../XAJavaInterop1/WriteMethodBody.txt | 0 .../WriteMethodFinalWithVoidReturn.txt | 0 .../XAJavaInterop1/WriteMethodIdField.txt | 0 .../XAJavaInterop1/WriteMethodProtected.txt | 0 .../WriteMethodStaticWithVoidReturn.txt | 0 .../WriteMethodWithIntReturn.txt | 0 .../WriteMethodWithStringReturn.txt | 0 .../WriteMethodWithVoidReturn.txt | 0 .../WriteParameterListCallArgs.txt | 0 .../WriteParameterListCallArgsForInvoker.txt | 0 .../XAJavaInterop1/WriteProperty.txt | 0 .../WriteStaticInterfaceMethod.txt | 0 .../WriteStaticInterfaceProperty.txt | 0 .../XamarinAndroid/WriteClass.txt | 0 .../XamarinAndroid/WriteClassConstructors.txt | 0 .../XamarinAndroid/WriteClassHandle.txt | 0 .../XamarinAndroid/WriteClassInvoker.txt | 0 .../WriteClassInvokerHandle.txt | 0 .../WriteClassInvokerMembers.txt | 0 .../WriteClassMethodInvokers.txt | 0 .../WriteClassMethodInvokersWithSkips.txt | 0 .../XamarinAndroid/WriteClassMethods.txt | 0 .../XamarinAndroid/WriteClassProperties.txt | 0 .../WriteClassPropertyInvokers.txt | 0 .../WriteClassPropertyInvokersWithSkips.txt | 0 .../WriteConstSugarInterfaceFields.txt | 0 .../XamarinAndroid/WriteCtor.txt | 0 .../XamarinAndroid/WriteCtorDeprecated.txt | 0 .../WriteCtorWithStringOverload.txt | 0 .../XamarinAndroid/WriteFieldConstant.txt | 0 .../WriteFieldConstantWithIntValue.txt | 0 .../WriteFieldConstantWithStringValue.txt | 0 .../XamarinAndroid/WriteFieldGetBody.txt | 0 .../XamarinAndroid/WriteFieldIdField.txt | 0 .../XamarinAndroid/WriteFieldInt.txt | 0 .../XamarinAndroid/WriteFieldSetBody.txt | 0 .../XamarinAndroid/WriteFieldString.txt | 0 .../XamarinAndroid/WriteInterface.txt | 0 .../WriteInterfaceDeclaration.txt | 0 .../XamarinAndroid/WriteInterfaceFields.txt | 0 .../XamarinAndroid/WriteInterfaceInvoker.txt | 0 .../WriteMethodAbstractWithVoidReturn.txt | 0 .../WriteMethodAsyncifiedWithIntReturn.txt | 0 .../WriteMethodAsyncifiedWithVoidReturn.txt | 0 .../XamarinAndroid/WriteMethodBody.txt | 0 .../WriteMethodFinalWithVoidReturn.txt | 0 .../XamarinAndroid/WriteMethodIdField.txt | 0 .../XamarinAndroid/WriteMethodProtected.txt | 0 .../WriteMethodStaticWithVoidReturn.txt | 0 .../WriteMethodWithIntReturn.txt | 0 .../WriteMethodWithStringReturn.txt | 0 .../WriteMethodWithVoidReturn.txt | 0 .../WriteParameterListCallArgs.txt | 0 .../WriteParameterListCallArgsForInvoker.txt | 0 .../XamarinAndroid/WriteProperty.txt | 0 .../Unit-Tests/CodeGeneratorTestBase.cs | 0 .../Unit-Tests/CodeGeneratorTests.cs | 0 .../DefaultInterfaceMethodsTests.cs | 0 .../WriteBasicEnum.txt | 0 .../WriteEnumWithGens.txt | 0 .../WriteFlagsEnum.txt | 0 .../Unit-Tests/EnumGeneratorTests.cs | 0 .../Unit-Tests/InterfaceConstantsTests.cs | 0 .../Unit-Tests/InterfaceTests.cs | 0 .../Unit-Tests/ManagedExtensionsTests.cs | 0 .../Unit-Tests/ManagedTests.cs | 0 .../Unit-Tests/SupportTypes.cs | 0 .../Unit-Tests/TestExtensions.cs | 0 .../Unit-Tests/TypeNameUtilitiesTests.cs | 0 .../Unit-Tests/XmlApiImporterTests.cs | 0 .../generator-Tests}/Unit-Tests/XmlTests.cs | 0 .../AccessModifiers/Mono.Android.projitems | 0 .../Xamarin.Test.BasePublicClass.cs | 0 .../Xamarin.Test.ExtendPublicClass.cs | 0 .../Xamarin.Test.PublicClass.cs | 0 .../Xamarin.Test.PublicFinalClass.cs | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../expected.ji/Adapters/Java.Lang.Object.cs | 0 .../Adapters/Mono.Android.projitems | 0 .../Adapters/Xamarin.Test.AbsSpinner.cs | 0 .../Adapters/Xamarin.Test.AdapterView.cs | 0 .../Xamarin.Test.GenericReturnObject.cs | 0 .../Adapters/Xamarin.Test.IAdapter.cs | 0 .../Adapters/Xamarin.Test.ISpinnerAdapter.cs | 0 .../Adapters/__NamespaceMapping__.cs | 0 .../expected.ji/Adapters/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../Java.Lang.Object.cs | 0 .../Mono.Android.projitems | 0 .../Xamarin.Test.SomeObject.cs | 0 .../__NamespaceMapping__.cs | 0 .../Android.Graphics.Color/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../expected.ji/Arrays/Java.Lang.Object.cs | 0 .../expected.ji/Arrays/Mono.Android.projitems | 0 .../Arrays/Xamarin.Test.SomeObject.cs | 0 .../Arrays/__NamespaceMapping__.cs | 0 .../expected.ji/Arrays/enumlist | 0 .../CSharpKeywords/CSharpKeywords.xml | 0 .../CSharpKeywords/Mono.Android.projitems | 0 .../Xamarin.Test.CSharpKeywords.cs | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../Constructors/Java.Lang.Object.cs | 0 .../Constructors/Mono.Android.projitems | 0 .../Constructors/Xamarin.Test.SomeObject.cs | 0 .../Constructors/__NamespaceMapping__.cs | 0 .../expected.ji/Constructors/enumlist | 0 ...Android.Exoplayer.Drm.FrameworkMediaDrm.cs | 0 ...ogle.Android.Exoplayer.Drm.IExoMediaDrm.cs | 0 .../GenericArguments/GenericArguments.xml | 0 .../GenericArguments/Java.Lang.Object.cs | 0 .../InterfaceMethodsConflict.xml | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../Xamarin.Test.II1.cs | 0 .../Xamarin.Test.II2.cs | 0 .../Xamarin.Test.SomeObject.cs | 0 .../Xamarin.Test.SomeObject2.cs | 0 .../__NamespaceMapping__.cs | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../NestedTypes/Java.Lang.Object.cs | 0 .../NestedTypes/Mono.Android.projitems | 0 .../Xamarin.Test.NotificationCompatBase.cs | 0 .../NestedTypes/__NamespaceMapping__.cs | 0 .../expected.ji/NestedTypes/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../NonStaticFields/Java.Lang.Object.cs | 0 .../NonStaticFields/Mono.Android.projitems | 0 .../Xamarin.Test.SomeObject.cs | 0 .../NonStaticFields/__NamespaceMapping__.cs | 0 .../expected.ji/NonStaticFields/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../NormalMethods/Java.Lang.Class.cs | 0 .../NormalMethods/Java.Lang.Integer.cs | 0 .../NormalMethods/Java.Lang.Object.cs | 0 .../NormalMethods/Java.Lang.Throwable.cs | 0 .../NormalMethods/Mono.Android.projitems | 0 .../NormalMethods/Xamarin.Test.A.cs | 0 .../NormalMethods/Xamarin.Test.C.cs | 0 .../NormalMethods/Xamarin.Test.SomeObject.cs | 0 .../NormalMethods/__NamespaceMapping__.cs | 0 .../expected.ji/NormalMethods/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../NormalProperties/Java.Lang.Object.cs | 0 .../NormalProperties/Mono.Android.projitems | 0 .../Xamarin.Test.SomeObject.cs | 0 .../NormalProperties/__NamespaceMapping__.cs | 0 .../expected.ji/NormalProperties/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../ParameterXPath/Java.Lang.Integer.cs | 0 .../ParameterXPath/Java.Lang.Object.cs | 0 .../ParameterXPath/Mono.Android.projitems | 0 .../ParameterXPath/Xamarin.Test.A.cs | 0 .../ParameterXPath/__NamespaceMapping__.cs | 0 .../expected.ji/ParameterXPath/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../StaticFields/Java.Lang.Object.cs | 0 .../StaticFields/Mono.Android.projitems | 0 .../StaticFields/Xamarin.Test.SomeObject.cs | 0 .../StaticFields/__NamespaceMapping__.cs | 0 .../expected.ji/StaticFields/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../StaticMethods/Java.Lang.Object.cs | 0 .../StaticMethods/Mono.Android.projitems | 0 .../StaticMethods/Xamarin.Test.SomeObject.cs | 0 .../StaticMethods/__NamespaceMapping__.cs | 0 .../expected.ji/StaticMethods/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../StaticProperties/Java.Lang.Object.cs | 0 .../StaticProperties/Mono.Android.projitems | 0 .../Xamarin.Test.SomeObject.cs | 0 .../StaticProperties/__NamespaceMapping__.cs | 0 .../expected.ji/StaticProperties/enumlist | 0 .../Streams/Java.IO.FilterOutputStream.cs | 0 .../Streams/Java.IO.IOException.cs | 0 .../Streams/Java.IO.InputStream.cs | 0 .../Streams/Java.IO.OutputStream.cs | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../expected.ji/Streams/Java.Lang.Object.cs | 0 .../Streams/Java.Lang.Throwable.cs | 0 .../Streams/Mono.Android.projitems | 0 .../Streams/__NamespaceMapping__.cs | 0 .../expected.ji/Streams/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../TestInterface/Java.Lang.Object.cs | 0 .../TestInterface/Java.Lang.String.cs | 0 .../TestInterface/Mono.Android.projitems | 0 .../Test.ME.GenericImplementation.cs | 0 ....ME.GenericObjectPropertyImplementation.cs | 0 .../Test.ME.GenericStringImplementation.cs | 0 ....ME.GenericStringPropertyImplementation.cs | 0 .../Test.ME.IGenericInterface.cs | 0 .../Test.ME.IGenericPropertyInterface.cs | 0 .../TestInterface/Test.ME.ITestInterface.cs | 0 .../Test.ME.TestInterfaceImplementation.cs | 0 .../TestInterface/__NamespaceMapping__.cs | 0 .../expected.ji/TestInterface/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../java.lang.Enum/Java.Lang.Enum.cs | 0 .../java.lang.Enum/Java.Lang.IComparable.cs | 0 .../java.lang.Enum/Java.Lang.Object.cs | 0 .../java.lang.Enum/Java.Lang.State.cs | 0 .../java.lang.Enum/Mono.Android.projitems | 0 .../java.lang.Enum/__NamespaceMapping__.cs | 0 .../expected.ji/java.lang.Enum/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../java.lang.Object/Java.Lang.Object.cs | 0 .../java.lang.Object/Mono.Android.projitems | 0 .../java.lang.Object/__NamespaceMapping__.cs | 0 .../expected.ji/java.lang.Object/enumlist | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../java.util.List/Java.Lang.Object.cs | 0 .../java.util.List/Mono.Android.projitems | 0 .../java.util.List/Xamarin.Test.SomeObject.cs | 0 .../java.util.List/__NamespaceMapping__.cs | 0 .../expected.ji/java.util.List/enumlist | 0 .../AccessModifiers/AccessModifiers.xml | 0 .../Xamarin.Test.BasePublicClass.cs | 0 .../Xamarin.Test.ExtendPublicClass.cs | 0 .../Xamarin.Test.IExtendedInterface.cs | 0 .../Xamarin.Test.PublicClass.cs | 0 .../Xamarin.Test.PublicFinalClass.cs | 0 .../AccessModifiers/Xamarin.Test.TestClass.cs | 0 .../expected/Adapters/Adapters.xml | 0 .../Adapters/SupportFiles/AdapterView.cs | 0 .../Adapters/Xamarin.Test.AbsSpinner.cs | 0 .../Adapters/Xamarin.Test.AdapterView.cs | 0 .../Xamarin.Test.GenericReturnObject.cs | 0 .../Adapters/Xamarin.Test.IAdapter.cs | 0 .../Adapters/Xamarin.Test.ISpinnerAdapter.cs | 0 .../Android.Graphics.Color.xml | 0 .../Xamarin.Test.SomeObject.cs | 0 .../expected/Arrays/Arrays.xml | 0 .../Arrays/Xamarin.Test.SomeObject.cs | 0 .../CSharpKeywords/CSharpKeywords.xml | 0 .../Xamarin.Test.CSharpKeywords.cs | 0 .../expected/Constructors/Constructors.xml | 0 .../Constructors/Xamarin.Test.SomeObject.cs | 0 .../Constructors/Xamarin.Test.SomeObject2.cs | 0 .../EnumerationFixup/EnumerationFixup.xml | 0 .../EnumerationFixup/EnumerationFixupMap.xml | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../EnumerationFixup/Java.Lang.Object.cs | 0 .../Xamarin.Test.SomeObject.cs | 0 .../Xamarin.Test.SomeObject2.cs | 0 .../Xamarin.Test.SomeValues.cs | 0 .../EnumerationFixup/__NamespaceMapping__.cs | 0 .../expected/EnumerationFixup/enumlist | 0 ...Android.Exoplayer.Drm.FrameworkMediaDrm.cs | 0 ...ogle.Android.Exoplayer.Drm.IExoMediaDrm.cs | 0 .../GenericArguments/GenericArguments.xml | 0 .../GenericArguments/Java.Lang.Object.cs | 0 .../InterfaceMethodsConflict.xml | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../Xamarin.Test.II1.cs | 0 .../Xamarin.Test.II2.cs | 0 .../Xamarin.Test.SomeObject.cs | 0 .../Xamarin.Test.SomeObject2.cs | 0 .../__NamespaceMapping__.cs | 0 .../expected/NestedTypes/NestedTypes.xml | 0 .../Xamarin.Test.NotificationCompatBase.cs | 0 .../NonStaticFields/NonStaticField.xml | 0 .../Xamarin.Test.SomeObject.cs | 0 .../NormalMethods/Java.Lang.Throwable.cs | 0 .../expected/NormalMethods/NormalMethods.xml | 0 .../expected/NormalMethods/Xamarin.Test.A.cs | 0 .../expected/NormalMethods/Xamarin.Test.C.cs | 0 .../NormalMethods/Xamarin.Test.SomeObject.cs | 0 .../NormalProperties/NormalProperties.xml | 0 .../Xamarin.Test.SomeObject.cs | 0 .../ParameterXPath/ParameterXPath.xml | 0 .../expected/ParameterXPath/Xamarin.Test.A.cs | 0 .../expected/StaticFields/StaticField.xml | 0 .../StaticFields/Xamarin.Test.SomeObject.cs | 0 .../expected/StaticMethods/StaticMethod.xml | 0 .../StaticMethods/Xamarin.Test.SomeObject.cs | 0 .../StaticProperties/StaticProperties.xml | 0 .../Xamarin.Test.SomeObject.cs | 0 .../Streams/Java.IO.FilterOutputStream.cs | 0 .../expected/Streams/Java.IO.IOException.cs | 0 .../expected/Streams/Java.IO.InputStream.cs | 0 .../expected/Streams/Java.IO.OutputStream.cs | 0 .../expected/Streams/Java.Lang.Throwable.cs | 0 .../expected/Streams/Streams.xml | 0 .../SupportFiles/InputStreamAdapter.cs | 0 .../SupportFiles/InputStreamInvoker.cs | 0 .../SupportFiles/OutputStreamAdapter.cs | 0 .../SupportFiles/OutputStreamInvoker.cs | 0 .../TestInterface/ClassWithoutNamespace.cs | 0 .../IInterfaceWithoutNamespace.cs | 0 .../Test.ME.GenericImplementation.cs | 0 ....ME.GenericObjectPropertyImplementation.cs | 0 .../Test.ME.GenericStringImplementation.cs | 0 ....ME.GenericStringPropertyImplementation.cs | 0 .../Test.ME.IGenericInterface.cs | 0 .../Test.ME.IGenericPropertyInterface.cs | 0 .../TestInterface/Test.ME.ITestInterface.cs | 0 .../Test.ME.TestInterfaceImplementation.cs | 0 .../expected/TestInterface/TestInterface.xml | 0 .../expected/java.lang.Enum/Java.Lang.Enum.cs | 0 .../java.lang.Enum/Java.Lang.Enum.xml | 0 .../java.lang.Enum/Java.Lang.IComparable.cs | 0 .../java.lang.Enum/Java.Lang.Object.cs | 0 .../java.lang.Enum/Java.Lang.State.cs | 0 .../Java.Interop.__TypeRegistrations.cs | 0 .../java.lang.Object/Java.Lang.Object.cs | 0 .../java.lang.Object/__NamespaceMapping__.cs | 0 .../expected/java.lang.Object/enumlist | 0 .../java.lang.Object/java.lang.Object.xml | 0 .../java.util.List/Xamarin.Test.SomeObject.cs | 0 .../java.util.List/java.util.List.xml | 0 tests/generator-Tests/generator-Tests.csproj | 58 ++ .../logcat-parse-Tests}/GrefsTest.cs | 38 +- .../logcat-parse-Tests}/JniHandleInfoTests.cs | 0 .../LogcatParse-Tests.csproj | 31 + .../logcat-Invoker-java_class_ref.txt | 0 .../Resources/logcat-ag-rg.txt | 0 .../Resources/logcat-alias.txt | 0 .../Resources/logcat-disposed.txt | 0 .../Resources/logcat-get_class_ref.txt | 0 .../Resources/logcat-gwd.txt | 0 .../Resources/logcat-resurrection.txt | 0 .../Resources/stdio-Finalized-threads.txt | 0 .../Resources/stdio-JavaList.txt | 0 .../Resources/stdio-ag-rg.txt | 0 .../Resources/stdio-repeated-handles.txt | 0 .../Resources/stdout-ag-rg.txt | 0 .../Resources/timestamp-ag-rg.txt | 0 tools/generator/Tests/generator-Tests.csproj | 707 ------------------ tools/generator/Tests/packages.config | 6 - .../Tests/LogcatParse-Tests.csproj | 97 --- tools/logcat-parse/Tests/packages.config | 4 - 735 files changed, 536 insertions(+), 1915 deletions(-) create mode 100644 NuGet.Config delete mode 100644 src/Java.Interop.Dynamic/Tests/Dynamic-Tests.projitems delete mode 100644 src/Java.Interop.Dynamic/Tests/Dynamic-Tests.shproj delete mode 100644 src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj delete mode 100644 src/Java.Interop.Export/Tests/Export-Tests.projitems delete mode 100644 src/Java.Interop.Export/Tests/Export-Tests.shproj delete mode 100644 src/Java.Interop.Export/Tests/Export-Tests.targets delete mode 100644 src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj delete mode 100644 src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config delete mode 100644 src/Java.Interop/Tests/Cadenza.Collections/DictionaryContract.cs delete mode 100644 src/Java.Interop/Tests/Interop-Tests.projitems delete mode 100644 src/Java.Interop/Tests/Interop-Tests.shproj delete mode 100644 src/Java.Interop/Tests/Interop-Tests.targets delete mode 100644 src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj delete mode 100644 src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/packages.config delete mode 100644 src/Xamarin.Android.Tools.Bytecode/Tests/packages.config rename tests/{PerformanceTests => Java.Interop-PerformanceTests/Java.Interop}/JavaTiming.cs (100%) rename tests/{PerformanceTests => Java.Interop-PerformanceTests/Java.Interop}/TimingTests.cs (100%) rename tests/{PerformanceTests => Java.Interop-PerformanceTests}/java/com/xamarin/interop/performance/JavaTiming.java (100%) delete mode 100644 tests/Java.Interop-PerformanceTests/packages.config rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Cadenza.Collections/CollectionContract.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Cadenza.Collections/EnumerableContract.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Cadenza.Collections/ListContract.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Cadenza/BaseRocksFixture.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/CallNonvirtualBase.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/CallNonvirtualDerived.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/CallNonvirtualDerived2.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/CallVirtualFromConstructorBase.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/CallVirtualFromConstructorDerived.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/InvokeVirtualFromConstructorTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaArrayContract.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaBooleanArrayContractTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaCharArrayContractTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaDoubleArrayContractTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaExceptionTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaInt16ArrayContractTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaInt32ArrayContractTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaInt64ArrayContractTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaManagedGCBridgeTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaObjectArrayTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaObjectExtensionsTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaObjectTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaPrimitiveArrayContract.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaSByteArrayContractTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JavaSingleArrayContractTests.cs (100%) rename src/Java.Interop/Tests/Java.Interop/JavaVMFixture.cs => tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.Partial.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniEnvironmentTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniInstanceMethodIDTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniMarshalTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniPeerMembersTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniReferenceSafeHandleTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniRuntime.JniValueManagerTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniRuntimeTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniTransitionTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniTypeManagerTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniTypeSignatureAttributeTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniTypeSignatureTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniTypeTest.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniValueMarshalerAttributeTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/JniValueMarshalerContractTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/MethodBindingTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/SelfRegistration.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/SelfRegistrationTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/TestType.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/Java.Interop/TestTypeTests.cs (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/java/com/xamarin/interop/CallNonvirtualBase.java (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/java/com/xamarin/interop/CallNonvirtualDerived.java (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/java/com/xamarin/interop/CallNonvirtualDerived2.java (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/java/com/xamarin/interop/CallVirtualFromConstructorBase.java (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/java/com/xamarin/interop/CallVirtualFromConstructorDerived.java (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/java/com/xamarin/interop/CrossReferenceBridge.java (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/java/com/xamarin/interop/SelfRegistration.java (100%) rename {src/Java.Interop/Tests => tests/Java.Interop-Tests}/java/com/xamarin/interop/TestType.java (100%) delete mode 100644 tests/Java.Interop-Tests/packages.config rename {src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic => tests/Java.Interop.Dynamic-Tests/Java.Interop}/DynamicJavaClassTests.cs (100%) rename {src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic => tests/Java.Interop.Dynamic-Tests/Java.Interop}/DynamicJavaInstanceTests.cs (100%) delete mode 100644 tests/Java.Interop.Dynamic-Tests/packages.config rename {src/Java.Interop.Export/Tests => tests/Java.Interop.Export-Tests}/Java.Interop/ExportTest.cs (100%) rename {src/Java.Interop.Export/Tests => tests/Java.Interop.Export-Tests}/Java.Interop/MarshalMemberBuilderTest.cs (100%) rename {src/Java.Interop.Export/Tests => tests/Java.Interop.Export-Tests}/java/com/xamarin/interop/export/ExportType.java (100%) delete mode 100644 tests/Java.Interop.Export-Tests/packages.config rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Android.App/ActivityAttribute.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Android.App/ApplicationAttribute.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Android.App/InstrumentationAttribute.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Android.App/ServiceAttribute.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Android.Content/BroadcastReceiverAttribute.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Android.Content/ContentProviderAttribute.cs (100%) create mode 100644 tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Java.Interop.Tools.JavaCallableWrappers/Crc64Tests.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Java.Interop.Tools.JavaCallableWrappers/IdentifierValidatorTests.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Java.Interop.Tools.JavaCallableWrappers/SupportDeclarations.cs (100%) rename {src/Java.Interop.Tools.JavaCallableWrappers/Test => tests/Java.Interop.Tools.JavaCallableWrappers-Tests}/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGeneratorTests.cs (100%) delete mode 100644 tests/PerformanceTests/PerformanceTests.projitems delete mode 100644 tests/PerformanceTests/PerformanceTests.shproj delete mode 100644 tests/PerformanceTests/PerformanceTests.targets rename {src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests => tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests}/GenericInheritanceMappingTest.cs (100%) rename {src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests => tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests}/JavaApiTest.cs (100%) rename {src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests => tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests}/JavaApiTestHelper.cs (86%) rename {src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests => tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests}/OverrideMarkerTest.cs (100%) rename {src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests => tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests}/TypeResolverTest.cs (100%) create mode 100644 tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj rename {src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests => tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests}/api-24.xml.in (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/ClassFileFixture.cs (85%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/ClassFileTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/ExpectedFieldDeclaration.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/ExpectedInnerClassInfo.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/ExpectedMethodDeclaration.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/ExpectedTypeDeclaration.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/IJavaInterfaceTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/JavaAnnotationTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/JavaEnumTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/JavaType.1Tests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/JavaType.ASCTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/JavaType.PSCTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/JavaType.RNC.RPNCTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/JavaType.RNCTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/JavaTypeTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/KotlinFixupsTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/KotlinMetadataTests.cs (98%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/NonGenericGlobalTypeTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/ParameterFixupTests.cs (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/IJavaInterface.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/JavaAnnotation.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/JavaEnum.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/JavaType$1.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/JavaType$ASC.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/JavaType$PSC.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/JavaType$RNC$RPNC.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/JavaType$RNC.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/JavaType.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/NonGenericGlobalType.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/ParameterDescription.txt (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/ParameterFixup.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/ParameterFixupApiXmlDocs.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/ParameterFixupFromDescriptionText.xml (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests/Resources}/ParameterFixupFromDocs.xml (100%) create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/NonGenericGlobalType.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/com/xamarin/IJavaInterface.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/com/xamarin/IParameterInterface.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/com/xamarin/JavaAnnotation.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/com/xamarin/JavaType.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/com/xamarin/NestedInterface.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/com/xamarin/ParameterAbstractClass.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/com/xamarin/ParameterClass.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/com/xamarin/ParameterClass2.java (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/java/java/util/Collection.java (100%) create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject$Companion.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/DataClass.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/DataClass.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClass.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClass.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces$PLUS.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces$TIMES.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfacesInterface.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ExtensionMethods.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ExtensionMethods.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InlineClass.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InlineClass.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Interfaces.kt rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/kotlin/InternalClass.class (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/kotlin/InternalClass.kt (100%) create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalConstructor.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalConstructor.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalMethod.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalMethod.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalProperty.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalProperty.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/META-INF/main.kotlin_module create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MethodImplementation.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MethodImplementation.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface$DefaultImpls.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface2$DefaultImpls.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface2.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterfaceChild.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Object.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Object.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ParameterName.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ParameterName.kt rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/kotlin/PrivateClass.class (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/kotlin/PrivateClass.kt (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/kotlin/PublicClass$ProtectedClass.class (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/kotlin/PublicClass.class (100%) rename {src/Xamarin.Android.Tools.Bytecode/Tests => tests/Xamarin.Android.Tools.Bytecode-Tests}/kotlin/PublicClass.kt (100%) create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/RenameExtensionParameter.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/RenameExtensionParameterKt.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SealedClass.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SealedClass.kt create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SetterParameterName.class create mode 100644 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SetterParameterName.kt rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/AccessModifiers.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Adapters.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Android_Graphics_Color.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Arrays.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/BaseGeneratorTest.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/CSharpKeywords.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Compiler.cs (96%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Constructors.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Enumerations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/GenericArguments.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/InterfaceMethodsConflict.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Interfaces.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Java_Lang_Enum.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Java_Lang_Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Java_Util_List.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/NestedTypes.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/NonStaticFields.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/NormalMethods.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/NormalProperties.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/PamareterXPath.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/StaticFields.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/StaticMethods.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/StaticProperties.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Integration-Tests/Streams.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/README.md (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/Android_Runtime_CharSequence.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/GeneratedEnumAttribute.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/IJavaObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/IntDefinitionAttribute.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JNIEnv.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JNIEnv.g.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JObjectRefType.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JValue.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JavaArray.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JavaCollection.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JavaConvert.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JavaDictionary.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JavaInterfaceDefaultMethodAttribute.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JavaObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JavaObjectExtensions.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JavaTypeParametersAttribute.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/Java_Lang_ICharSequence.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/Java_Lang_Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/Java_Lang_String.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/Java_Lang_Throwable.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/JniHandleOwnership.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/NamespaceMappingAttribute.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/PreserveAttribute.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/RegisterAttribute.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/SupportFiles/TypeManager.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/.gitignore (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/api-cp.xml (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/api.xml (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.cp/GeneratedFiles.projitems (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.cp/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.cp/Java.Lang.Object.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.cp/Java.Lang.String.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.In.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.InvalidNameMembers.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.cp/__NamespaceMapping__.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.cp/enumlist (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/Android.Text.ISpannable.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/Android.Text.ISpanned.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/Android.Text.SpanTypes.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/Android.Text.SpannableString.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/Android.Views.View.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/GeneratedFiles.projitems (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/Java.Lang.Object.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/__NamespaceMapping__.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected.ji/enumlist (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/Android.Text.ISpannable.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/Android.Text.ISpanned.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/Android.Text.SpanTypes.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/Android.Text.SpannableString.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/Android.Text.SpannableStringInternal.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/Android.Views.View.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/GeneratedFiles.projitems (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/Java.Lang.Object.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/__NamespaceMapping__.cs (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/expected/enumlist (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/fields-cp.xml (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/fields.xml (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/methods-cp.xml (100%) rename {tools/generator => tests/generator-Tests}/Tests-Core/methods.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/AdjusterTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteCharSequenceEnumerator.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteClassAbstractMembers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventArgs.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandler.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImpl.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImplContent.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionMethods.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionsDeclaration.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEvent.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEventWithHandlerArgument.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerProperty.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethods.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceProperties.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyDeclaration.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyStringVariant.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassConstructors.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerMembers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokersWithSkips.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokersWithSkips.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteConstSugarInterfaceFields.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtor.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorDeprecated.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorWithStringOverload.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstant.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithIntValue.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithStringValue.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldGetBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldIdField.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldInt.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldSetBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldString.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDeclaration.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceFields.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodFinalWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodIdField.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodStaticWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgs.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgsForInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassConstructors.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerMembers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokersWithSkips.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokersWithSkips.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtor.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorDeprecated.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorWithStringOverload.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstant.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithIntValue.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithStringValue.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldGetBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldIdField.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldInt.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldSetBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldString.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDeclaration.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodFinalWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodIdField.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodStaticWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgs.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgsForInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassConstructors.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassHandle.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerHandle.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerMembers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokersWithSkips.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokers.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokersWithSkips.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteConstSugarInterfaceFields.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtor.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorDeprecated.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorWithStringOverload.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstant.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithIntValue.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithStringValue.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldGetBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldIdField.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldInt.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldSetBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldString.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceDeclaration.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceFields.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodBody.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodFinalWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodIdField.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodStaticWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgs.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgsForInvoker.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorTestBase.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/CodeGeneratorTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/DefaultInterfaceMethodsTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/EnumGeneratorExpectedResults/WriteBasicEnum.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/EnumGeneratorExpectedResults/WriteEnumWithGens.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/EnumGeneratorExpectedResults/WriteFlagsEnum.txt (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/EnumGeneratorTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/InterfaceConstantsTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/InterfaceTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/ManagedExtensionsTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/ManagedTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/SupportTypes.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/TestExtensions.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/TypeNameUtilitiesTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/XmlApiImporterTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/Unit-Tests/XmlTests.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/AccessModifiers/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/Xamarin.Test.AdapterView.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/Xamarin.Test.IAdapter.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Adapters/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Android.Graphics.Color/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Android.Graphics.Color/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Android.Graphics.Color/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Arrays/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Arrays/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Arrays/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Arrays/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Arrays/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Arrays/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/CSharpKeywords/CSharpKeywords.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/CSharpKeywords/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Constructors/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Constructors/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Constructors/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Constructors/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Constructors/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Constructors/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/GenericArguments/GenericArguments.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/GenericArguments/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/InterfaceMethodsConflict/InterfaceMethodsConflict.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NestedTypes/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NestedTypes/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NestedTypes/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NestedTypes/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NestedTypes/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NonStaticFields/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NonStaticFields/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NonStaticFields/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NonStaticFields/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NonStaticFields/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Java.Lang.Class.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Java.Lang.Integer.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Java.Lang.Throwable.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Xamarin.Test.A.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Xamarin.Test.C.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalMethods/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalProperties/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalProperties/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalProperties/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalProperties/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/NormalProperties/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/ParameterXPath/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/ParameterXPath/Java.Lang.Integer.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/ParameterXPath/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/ParameterXPath/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/ParameterXPath/Xamarin.Test.A.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/ParameterXPath/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/ParameterXPath/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticFields/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticFields/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticFields/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticFields/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticFields/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticMethods/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticMethods/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticMethods/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticMethods/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticMethods/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticProperties/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticProperties/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticProperties/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticProperties/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/StaticProperties/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/Java.IO.FilterOutputStream.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/Java.IO.IOException.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/Java.IO.InputStream.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/Java.IO.OutputStream.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/Java.Lang.Throwable.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/Streams/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Java.Lang.String.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Test.ME.GenericImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Test.ME.IGenericInterface.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Test.ME.ITestInterface.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/TestInterface/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Enum/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Enum/Java.Lang.Enum.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Enum/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Enum/Java.Lang.State.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Enum/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Enum/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Enum/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Object/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Object/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Object/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Object/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.lang.Object/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.util.List/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.util.List/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.util.List/Mono.Android.projitems (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.util.List/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected.ji/java.util.List/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/AccessModifiers/AccessModifiers.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/AccessModifiers/Xamarin.Test.PublicClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/AccessModifiers/Xamarin.Test.PublicFinalClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/AccessModifiers/Xamarin.Test.TestClass.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Adapters/Adapters.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Adapters/SupportFiles/AdapterView.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Adapters/Xamarin.Test.AbsSpinner.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Adapters/Xamarin.Test.AdapterView.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Adapters/Xamarin.Test.GenericReturnObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Adapters/Xamarin.Test.IAdapter.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Adapters/Xamarin.Test.ISpinnerAdapter.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Android.Graphics.Color/Android.Graphics.Color.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Arrays/Arrays.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Arrays/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/CSharpKeywords/CSharpKeywords.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Constructors/Constructors.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Constructors/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Constructors/Xamarin.Test.SomeObject2.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/EnumerationFixup.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/EnumerationFixupMap.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/Xamarin.Test.SomeValues.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/EnumerationFixup/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/GenericArguments/GenericArguments.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/GenericArguments/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/InterfaceMethodsConflict/InterfaceMethodsConflict.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NestedTypes/NestedTypes.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NonStaticFields/NonStaticField.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NonStaticFields/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NormalMethods/Java.Lang.Throwable.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NormalMethods/NormalMethods.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NormalMethods/Xamarin.Test.A.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NormalMethods/Xamarin.Test.C.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NormalMethods/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NormalProperties/NormalProperties.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/NormalProperties/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/ParameterXPath/ParameterXPath.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/ParameterXPath/Xamarin.Test.A.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/StaticFields/StaticField.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/StaticFields/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/StaticMethods/StaticMethod.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/StaticMethods/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/StaticProperties/StaticProperties.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/StaticProperties/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/Java.IO.FilterOutputStream.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/Java.IO.IOException.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/Java.IO.InputStream.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/Java.IO.OutputStream.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/Java.Lang.Throwable.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/Streams.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/SupportFiles/InputStreamAdapter.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/SupportFiles/InputStreamInvoker.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/SupportFiles/OutputStreamAdapter.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/Streams/SupportFiles/OutputStreamInvoker.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/ClassWithoutNamespace.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/IInterfaceWithoutNamespace.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/Test.ME.GenericImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/Test.ME.GenericStringImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/Test.ME.IGenericInterface.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/Test.ME.ITestInterface.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/TestInterface/TestInterface.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Enum/Java.Lang.Enum.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Enum/Java.Lang.Enum.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Enum/Java.Lang.IComparable.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Enum/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Enum/Java.Lang.State.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Object/Java.Interop.__TypeRegistrations.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Object/Java.Lang.Object.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Object/__NamespaceMapping__.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Object/enumlist (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.lang.Object/java.lang.Object.xml (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.util.List/Xamarin.Test.SomeObject.cs (100%) rename {tools/generator/Tests => tests/generator-Tests}/expected/java.util.List/java.util.List.xml (100%) create mode 100644 tests/generator-Tests/generator-Tests.csproj rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/GrefsTest.cs (94%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/JniHandleInfoTests.cs (100%) create mode 100644 tests/logcat-parse-Tests/LogcatParse-Tests.csproj rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/logcat-Invoker-java_class_ref.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/logcat-ag-rg.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/logcat-alias.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/logcat-disposed.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/logcat-get_class_ref.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/logcat-gwd.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/logcat-resurrection.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/stdio-Finalized-threads.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/stdio-JavaList.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/stdio-ag-rg.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/stdio-repeated-handles.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/stdout-ag-rg.txt (100%) rename {tools/logcat-parse/Tests => tests/logcat-parse-Tests}/Resources/timestamp-ag-rg.txt (100%) delete mode 100644 tools/generator/Tests/generator-Tests.csproj delete mode 100644 tools/generator/Tests/packages.config delete mode 100644 tools/logcat-parse/Tests/LogcatParse-Tests.csproj delete mode 100644 tools/logcat-parse/Tests/packages.config diff --git a/Java.Interop.sln b/Java.Interop.sln index 716c91b73..3196c59c3 100644 --- a/Java.Interop.sln +++ b/Java.Interop.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2003 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29424.173 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{C8F58966-94BF-407F-914A-8654F8B8AE3B}" EndProject @@ -25,16 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Dynamic", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Export", "src\Java.Interop.Export\Java.Interop.Export.csproj", "{B501D075-6183-4E1D-92C9-F7B5002475B1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core-Tests", "Core-Tests", "{647B3EED-85D7-45E6-A297-44DC70C79503}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Interop-Tests", "src\Java.Interop\Tests\Interop-Tests.shproj", "{0ADB8D72-7479-49AF-8809-E03AE4A4EAE2}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Dynamic-Tests", "src\Java.Interop.Dynamic\Tests\Dynamic-Tests.shproj", "{8A190F28-74C7-45D8-A701-5864CDF4124A}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Export-Tests", "src\Java.Interop.Export\Tests\Export-Tests.shproj", "{849ABEDC-6A9C-44F0-8543-5298C096A3FB}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PerformanceTests", "tests\PerformanceTests\PerformanceTests.shproj", "{0FBECD2A-7C91-41AB-A4B4-B781E8EC8479}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Desktop", "Desktop", "{0998E45F-8BCE-4791-A944-962CD54E2D80}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Runtime.Environment", "src\Java.Runtime.Environment\Java.Runtime.Environment.csproj", "{5887B410-D448-4257-A46B-EAC03C80BE93}" @@ -59,13 +49,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Dynamic-Tests" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Export-Tests", "tests\Java.Interop.Export-Tests\Java.Interop.Export-Tests.csproj", "{82F24161-F0CA-44CC-AEC3-885D613605E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogcatParse-Tests", "tools\logcat-parse\Tests\LogcatParse-Tests.csproj", "{DB05D566-0BA0-4935-868D-689E2F03688E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogcatParse-Tests", "tests\logcat-parse-Tests\LogcatParse-Tests.csproj", "{DB05D566-0BA0-4935-868D-689E2F03688E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Bytecode-Tests", "src\Xamarin.Android.Tools.Bytecode\Tests\Xamarin.Android.Tools.Bytecode-Tests.csproj", "{C9FA4492-DEB0-4932-A6B8-E2C4E0581692}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Bytecode-Tests", "tests\Xamarin.Android.Tools.Bytecode-Tests\Xamarin.Android.Tools.Bytecode-Tests.csproj", "{C9FA4492-DEB0-4932-A6B8-E2C4E0581692}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.ApiXmlAdjuster-Tests", "src\Xamarin.Android.Tools.ApiXmlAdjuster\Tests\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj", "{891F2E04-5614-4A26-A78F-3778025ECF43}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.ApiXmlAdjuster-Tests", "tests\Xamarin.Android.Tools.ApiXmlAdjuster-Tests\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj", "{891F2E04-5614-4A26-A78F-3778025ECF43}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator-Tests", "tools\generator\Tests\generator-Tests.csproj", "{4EEAB1A7-99C1-4302-9C18-01A7B481409B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator-Tests", "tests\generator-Tests\generator-Tests.csproj", "{4EEAB1A7-99C1-4302-9C18-01A7B481409B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{D5A93398-AEB1-49F3-89DC-3904A47DB0C7}" EndProject @@ -85,7 +75,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.Diagnost EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jcw-gen", "tools\jcw-gen\jcw-gen.csproj", "{52C7D9B6-E8C8-47D0-9471-652D278D7D77}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers-Tests", "src\Java.Interop.Tools.JavaCallableWrappers\Test\Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers-Tests", "tests\Java.Interop.Tools.JavaCallableWrappers-Tests\Java.Interop.Tools.JavaCallableWrappers-Tests.csproj", "{58B564A1-570D-4DA2-B02D-25BDDB1A9F4F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Cecil", "src\Xamarin.Android.Cecil\Xamarin.Android.Cecil.csproj", "{15945D4B-FF56-4BCC-B598-2718D199DD08}" EndProject @@ -99,21 +89,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Andro EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - src\Java.Interop\Tests\Interop-Tests.projitems*{04e28441-36ff-4964-add7-efbb47cce406}*SharedItemsImports = 4 - src\Java.Interop\Tests\Interop-Tests.projitems*{0adb8d72-7479-49af-8809-e03ae4a4eae2}*SharedItemsImports = 13 - tests\PerformanceTests\PerformanceTests.projitems*{0fbecd2a-7c91-41ab-a4b4-b781e8ec8479}*SharedItemsImports = 13 src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 4 - tests\PerformanceTests\PerformanceTests.projitems*{6970466b-f6d1-417a-8a27-4fed8555ebd0}*SharedItemsImports = 4 - src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{82b1dd53-69ca-4a61-b6b1-f06f1525ef4d}*SharedItemsImports = 4 - src\Java.Interop.Export\Tests\Export-Tests.projitems*{82f24161-f0ca-44cc-aec3-885d613605e0}*SharedItemsImports = 4 - src\Java.Interop.Export\Tests\Export-Tests.projitems*{849abedc-6a9c-44f0-8543-5298c096a3fb}*SharedItemsImports = 13 - src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{8a190f28-74c7-45d8-a701-5864cdf4124a}*SharedItemsImports = 13 - src\Java.Interop.Dynamic\Tests\Dynamic-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4 - src\Java.Interop.Export\Tests\Export-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4 - src\Java.Interop\Tests\Interop-Tests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4 - tests\PerformanceTests\PerformanceTests.projitems*{c5176170-4025-4a87-b143-11dc64f9bdd1}*SharedItemsImports = 4 src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{d1295a8f-4f42-461d-a046-564476c10002}*SharedItemsImports = 4 - src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{d18fcf91-8876-48a0-a693-2dc1e7d3d80a}*SharedItemsImports = 4 src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{fe789f04-5e95-42c5-aef1-e33f8df06b3f}*SharedItemsImports = 13 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -157,10 +134,6 @@ Global {B501D075-6183-4E1D-92C9-F7B5002475B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|Any CPU.Build.0 = Release|Any CPU - {5FBF138D-1119-4C29-99E1-E928B5209D06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FBF138D-1119-4C29-99E1-E928B5209D06}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5176170-4025-4A87-B143-11DC64F9BDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5176170-4025-4A87-B143-11DC64F9BDD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {5887B410-D448-4257-A46B-EAC03C80BE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5887B410-D448-4257-A46B-EAC03C80BE93}.Debug|Any CPU.Build.0 = Debug|Any CPU {5887B410-D448-4257-A46B-EAC03C80BE93}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -279,10 +252,6 @@ Global {BB0AB9F7-0979-41A7-B7A9-877260655F94} = {4C173212-371D-45D8-BA83-9226194F48DC} {AD4468F8-8883-434B-9D4C-E1801BB3B52A} = {4C173212-371D-45D8-BA83-9226194F48DC} {B501D075-6183-4E1D-92C9-F7B5002475B1} = {4C173212-371D-45D8-BA83-9226194F48DC} - {0ADB8D72-7479-49AF-8809-E03AE4A4EAE2} = {647B3EED-85D7-45E6-A297-44DC70C79503} - {8A190F28-74C7-45D8-A701-5864CDF4124A} = {647B3EED-85D7-45E6-A297-44DC70C79503} - {849ABEDC-6A9C-44F0-8543-5298C096A3FB} = {647B3EED-85D7-45E6-A297-44DC70C79503} - {0FBECD2A-7C91-41AB-A4B4-B781E8EC8479} = {647B3EED-85D7-45E6-A297-44DC70C79503} {5887B410-D448-4257-A46B-EAC03C80BE93} = {0998E45F-8BCE-4791-A944-962CD54E2D80} {B17475BC-45A2-47A3-B8FC-62F3A0959EE0} = {0998E45F-8BCE-4791-A944-962CD54E2D80} {07BC4495-1267-4B78-9EA6-B76FEEA2A64A} = {0998E45F-8BCE-4791-A944-962CD54E2D80} diff --git a/Makefile b/Makefile index e4369801e..a460a070b 100644 --- a/Makefile +++ b/Makefile @@ -174,37 +174,37 @@ run-test-jnimarshal: bin/Test$(CONFIGURATION)/Java.Interop.Export-Tests.dll bin/ define GEN_CORE_OUTPUT -$(RM) -Rf $(1) mkdir -p $(1) - $(RUNTIME) bin/Test$(CONFIGURATION)/generator.exe -o $(1) $(3) --api-level=20 tools/generator/Tests-Core/api$(2).xml \ - --enummethods=tools/generator/Tests-Core/methods$(2).xml \ - --enumfields=tools/generator/Tests-Core/fields$(2).xml \ + $(RUNTIME) bin/Test$(CONFIGURATION)/generator.exe -o $(1) $(3) --api-level=20 tests/generator-Tests/Tests-Core/api$(2).xml \ + --enummethods=tests/generator-Tests/Tests-Core/methods$(2).xml \ + --enumfields=tests/generator-Tests/Tests-Core/fields$(2).xml \ --enumdir=$(1) endef run-test-generator-core: bin/Test$(CONFIGURATION)/generator.exe $(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core) - diff -rup --strip-trailing-cr tools/generator/Tests-Core/expected bin/Test$(CONFIGURATION)/generator-core + diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected bin/Test$(CONFIGURATION)/generator-core $(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core,,--codegen-target=JavaInterop1) - diff -rup --strip-trailing-cr tools/generator/Tests-Core/expected.ji bin/Test$(CONFIGURATION)/generator-core + diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected.ji bin/Test$(CONFIGURATION)/generator-core $(call GEN_CORE_OUTPUT,bin/Test$(CONFIGURATION)/generator-core,-cp) - diff -rup --strip-trailing-cr tools/generator/Tests-Core/expected.cp bin/Test$(CONFIGURATION)/generator-core + diff -rup --strip-trailing-cr tests/generator-Tests/Tests-Core/expected.cp bin/Test$(CONFIGURATION)/generator-core bin/Test$(CONFIGURATION)/generator.exe: bin/$(CONFIGURATION)/generator.exe cp $<* `dirname "$@"` update-test-generator-core: - $(call GEN_CORE_OUTPUT,tools/generator/Tests-Core/expected) - $(call GEN_CORE_OUTPUT,tools/generator/Tests-Core/expected.ji,--codegen-target=JavaInterop1) + $(call GEN_CORE_OUTPUT,tests/generator-Tests/Tests-Core/expected) + $(call GEN_CORE_OUTPUT,tests/generator-Tests/Tests-Core/expected.ji,--codegen-target=JavaInterop1) update-test-generator-nunit: -$(MAKE) run-tests TESTS=bin/Test$(CONFIGURATION)/generator-Tests.dll - for f in `find tools/generator/Tests/expected -name \*.cs` ; do \ - source=`echo $$f | sed 's#^tools/generator/Tests/expected#bin/Test$(CONFIGURATION)/out#'` ; \ + for f in `find tests/generator-Tests/expected -name \*.cs` ; do \ + source=`echo $$f | sed 's#^tests/generator-Tests/expected#bin/Test$(CONFIGURATION)/out#'` ; \ if [ -f "$$source" ]; then \ cp -f "$$source" "$$f" ; \ fi; \ done for source in `find bin/Test$(CONFIGURATION)/out.ji -type f` ; do \ - f=`echo $$source | sed 's#^bin/Test$(CONFIGURATION)/out.ji#tools/generator/Tests/expected.ji#'` ; \ + f=`echo $$source | sed 's#^bin/Test$(CONFIGURATION)/out.ji#tests/generator-Tests/expected.ji#'` ; \ mkdir -p `dirname $$f`; \ cp -f "$$source" "$$f" ; \ done diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 000000000..d58617e17 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 654692318..c5b8aadfd 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -38,7 +38,8 @@ jobs: inputs: solution: Java.Interop.sln configuration: $(Build.Configuration) - + msbuildArguments: '/t:Restore,Build' + - task: MSBuild@1 displayName: MSBuild RunNUnitTests.targets inputs: diff --git a/build-tools/scripts/RunNUnitTests.targets b/build-tools/scripts/RunNUnitTests.targets index 20251ff05..d4bd86dee 100644 --- a/build-tools/scripts/RunNUnitTests.targets +++ b/build-tools/scripts/RunNUnitTests.targets @@ -5,7 +5,7 @@ <_TopDir>$(MSBuildThisFileDirectory)..\.. <_Runtime Condition=" '$(RUNTIME)' != '' ">$(RUNTIME) <_Runtime Condition=" '$(RUNTIME)' == '' And '$(OS)' != 'Windows_NT' ">mono --debug - <_NUnit>$(_Runtime) packages\NUnit.ConsoleRunner.3.9.0\tools\nunit3-console.exe + <_NUnit>$(_Runtime) packages\nunit.consolerunner\3.9.0\tools\nunit3-console.exe <_Run Condition=" '$(RUN)' != '' ">--run="$(RUN)" diff --git a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj index 3da2f5a2e..6aa6aa87e 100644 --- a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj +++ b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj @@ -17,9 +17,6 @@ ..\..\bin\Release - - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} diff --git a/src/Java.Interop.Dynamic/Tests/Dynamic-Tests.projitems b/src/Java.Interop.Dynamic/Tests/Dynamic-Tests.projitems deleted file mode 100644 index 964db7332..000000000 --- a/src/Java.Interop.Dynamic/Tests/Dynamic-Tests.projitems +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {8A190F28-74C7-45D8-A701-5864CDF4124A} - - - Tests - - - - - - \ No newline at end of file diff --git a/src/Java.Interop.Dynamic/Tests/Dynamic-Tests.shproj b/src/Java.Interop.Dynamic/Tests/Dynamic-Tests.shproj deleted file mode 100644 index 7fa179176..000000000 --- a/src/Java.Interop.Dynamic/Tests/Dynamic-Tests.shproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - {8A190F28-74C7-45D8-A701-5864CDF4124A} - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj b/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj deleted file mode 100644 index 5b884709d..000000000 --- a/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj +++ /dev/null @@ -1,71 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {447A2149-60AA-494C-A5CB-8B186F522F5D} - Library - Java.Interop.DynamicTests - Java.Interop.Dynamic-Tests - v4.6.1 - - - true - ..\..\..\bin\TestDebug - prompt - false - false - false - - - 4 - false - - - ..\..\..\bin\TestRelease - prompt - false - false - false - - - 4 - false - - - - - ..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll - - - - - - - - - - - {5887B410-D448-4257-A46B-EAC03C80BE93} - Java.Runtime.Environment - - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} - Java.Interop - - - {A76309AB-98AC-4AE2-BA30-75481420C52F} - TestJVM - - - {0C001D50-4176-45AE-BDC8-BA626508B0CC} - Mono.Linq.Expressions - - - {AD4468F8-8883-434B-9D4C-E1801BB3B52A} - Java.Interop.Dynamic - - - \ No newline at end of file diff --git a/src/Java.Interop.Export/Java.Interop.Export.csproj b/src/Java.Interop.Export/Java.Interop.Export.csproj index 8d6b18f57..c60f6387e 100644 --- a/src/Java.Interop.Export/Java.Interop.Export.csproj +++ b/src/Java.Interop.Export/Java.Interop.Export.csproj @@ -16,10 +16,6 @@ ..\..\bin\Release - - - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} diff --git a/src/Java.Interop.Export/Tests/Export-Tests.projitems b/src/Java.Interop.Export/Tests/Export-Tests.projitems deleted file mode 100644 index e57f873c8..000000000 --- a/src/Java.Interop.Export/Tests/Export-Tests.projitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {849ABEDC-6A9C-44F0-8543-5298C096A3FB} - - - Java.Interop.ExportTests - - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop.Export/Tests/Export-Tests.shproj b/src/Java.Interop.Export/Tests/Export-Tests.shproj deleted file mode 100644 index 9cd3bb32d..000000000 --- a/src/Java.Interop.Export/Tests/Export-Tests.shproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - {849ABEDC-6A9C-44F0-8543-5298C096A3FB} - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop.Export/Tests/Export-Tests.targets b/src/Java.Interop.Export/Tests/Export-Tests.targets deleted file mode 100644 index 0ebfd0300..000000000 --- a/src/Java.Interop.Export/Tests/Export-Tests.targets +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj index 6ffcdcb85..54105d9e4 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -15,10 +15,6 @@ - - - - JavaNativeTypeManager.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj deleted file mode 100644 index 1ae521ced..000000000 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {58B564A1-570D-4DA2-B02D-25BDDB1A9F4F} - Library - Java.Interop.Tools.JavaCallableWrappersTests - Java.Interop.Tools.JavaCallableWrappers-Tests - v4.6.1 - - - true - full - false - ..\..\..\bin\TestDebug - DEBUG;HAVE_CECIL;JCW_ONLY_TYPE_NAMES - prompt - 4 - false - - - true - ..\..\..\bin\TestRelease - HAVE_CECIL;JCW_ONLY_TYPE_NAMES - prompt - 4 - false - - - - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - {D18FCF91-8876-48A0-A693-2DC1E7D3D80A} - Java.Interop.Tools.JavaCallableWrappers - - - {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD} - Java.Interop.Tools.Cecil - - - {64CC4E44-CE3A-4319-BF3F-6CF8BD513870} - Java.Interop.Tools.Diagnostics - - - {15945D4B-FF56-4BCC-B598-2718D199DD08} - Xamarin.Android.Cecil - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config b/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config deleted file mode 100644 index b5529657b..000000000 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Test/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj index f9a1771b4..79f62ff99 100644 --- a/src/Java.Interop/Java.Interop.csproj +++ b/src/Java.Interop/Java.Interop.csproj @@ -28,7 +28,6 @@ ..\..\bin\BuildRelease - diff --git a/src/Java.Interop/Tests/Cadenza.Collections/DictionaryContract.cs b/src/Java.Interop/Tests/Cadenza.Collections/DictionaryContract.cs deleted file mode 100644 index e8182ad84..000000000 --- a/src/Java.Interop/Tests/Cadenza.Collections/DictionaryContract.cs +++ /dev/null @@ -1,218 +0,0 @@ -// -// IEnumerableContract.cs -// -// Author: -// Jonathan Pryor -// -// Copyright (c) 2010 Novell, Inc. (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Collections.Generic; -using System.Linq; - -using NUnit.Framework; - -using Cadenza.Collections; -using Cadenza.Tests; - -namespace Cadenza.Collections.Tests { - - public abstract class DictionaryContract : BaseRocksFixture { - - protected abstract IDictionary CreateDictionary (IEnumerable> values); - - [Test] - public void Add () - { - var d = CreateDictionary (new KeyValuePair [0]); - - var n = d.Count; - Assert.AreEqual (n, d.Keys.Count); - Assert.AreEqual (n, d.Values.Count); - - // key cannot be null - try { - d.Add ("key", "value"); - Assert.IsTrue (d.ContainsKey ("key")); - Assert.IsFalse (d.ContainsKey ("value")); - Assert.AreEqual (n+1, d.Keys.Count); - Assert.AreEqual (n+1, d.Values.Count); - Assert.IsTrue (d.Keys.Contains ("key")); - Assert.IsTrue (d.Values.Contains ("value")); - - // Cannot use Add() w/ the same key - Assert.Throws(() => d.Add ("key", "value2")); - - Assert.Throws(() => d.Add (null, null)); - } - catch (NotSupportedException) { - Assert.IsTrue (d.IsReadOnly); - } - } - - [Test] - public void ContainsKey () - { - var d = CreateDictionary (new KeyValuePair []{ - new KeyValuePair ("another-key", "another-value"), - }); - Assert.Throws(() => d.ContainsKey (null)); - Assert.IsFalse (d.ContainsKey ("key")); - Assert.IsTrue (d.ContainsKey ("another-key")); - Assert.IsTrue (d.Keys.Contains ("another-key")); - } - - [Test] - public void Remove () - { - var d = CreateDictionary (new KeyValuePair []{ - new KeyValuePair ("another-key", "another-value"), - }); - var n = d.Count; - try { - Assert.IsFalse (d.Remove ("key")); - Assert.AreEqual (n, d.Count); - Assert.IsTrue (d.Remove ("another-key")); - Assert.AreEqual (n-1, d.Count); - Assert.AreEqual (n-1, d.Keys.Count); - Assert.AreEqual (n-1, d.Values.Count); - Assert.IsFalse (d.Keys.Contains ("another-key")); - Assert.IsFalse (d.Values.Contains ("another-value")); - - Assert.Throws(() => d.Remove (null)); - } - catch (NotSupportedException) { - Assert.IsTrue (d.IsReadOnly); - } - } - - [Test] - public void TryGetValue () - { - var d = CreateDictionary (new KeyValuePair []{ - new KeyValuePair ("key", "value"), - }); - string v = null; - Assert.Throws(() => d.TryGetValue (null, out v)); - Assert.IsFalse (d.TryGetValue ("another-key", out v)); - Assert.IsTrue (d.TryGetValue ("key", out v)); - Assert.AreEqual ("value", v); - } - - [Test] - public void Item () - { - var d = CreateDictionary (new KeyValuePair []{ - new KeyValuePair ("key", "value"), - }); - #pragma warning disable 0168 - Assert.Throws(() => {var _ = d [null];}); - Assert.Throws(() => {var _ = d ["another-key"];}); - #pragma warning restore - try { - d ["key"] = "another-value"; - Assert.IsFalse (d.Values.Contains ("value")); - Assert.IsTrue (d.Values.Contains ("another-value")); - Assert.AreEqual ("another-value", d ["key"]); - Assert.AreEqual (1, d.Keys.Count); - Assert.AreEqual (1, d.Values.Count); - } - catch (NotSupportedException) { - Assert.IsTrue (d.IsReadOnly); - } - - } - - [Test] - public void Keys_And_Values_Order_Must_Match () - { - var d = CreateDictionary (new KeyValuePair []{ - new KeyValuePair ("a", "1"), - new KeyValuePair ("b", "2"), - new KeyValuePair ("c", "3"), - }); - Assert.AreEqual (GetIndexOf (d.Keys, "a"), GetIndexOf (d.Values, "1")); - Assert.AreEqual (GetIndexOf (d.Keys, "b"), GetIndexOf (d.Values, "2")); - Assert.AreEqual (GetIndexOf (d.Keys, "c"), GetIndexOf (d.Values, "3")); - } - - static int GetIndexOf (IEnumerable c, T value) - { - int i = -1; - foreach (var e in c) { - i++; - if (EqualityComparer.Default.Equals (e, value)) - return i; - } - return -1; - } - - class SubCollectionContract : CollectionContract { - DictionaryContract dictContract; - Func, ICollection> collectionSelector; - - public SubCollectionContract (DictionaryContract dictContract, - Func, ICollection> collectionSelector) - { - this.dictContract = dictContract; - this.collectionSelector = collectionSelector; - } - - protected override ICollection CreateCollection (IEnumerable values) - { - var d = dictContract.CreateDictionary (values.Select (v => new KeyValuePair(v, v))); - var c = collectionSelector (d); - Assert.IsTrue (c.IsReadOnly); - return c; - } - - protected override string CreateValueA () - { - return "A"; - } - - protected override string CreateValueB () - { - return "B"; - } - - protected override string CreateValueC () - { - return "C"; - } - } - - [Test] - public void Keys () - { - new SubCollectionContract (this, d => d.Keys).RunAllTests (); - } - - [Test] - public void Values () - { - new SubCollectionContract (this, d => d.Values).RunAllTests (); - } - } -} - diff --git a/src/Java.Interop/Tests/Interop-Tests.projitems b/src/Java.Interop/Tests/Interop-Tests.projitems deleted file mode 100644 index 6779bc470..000000000 --- a/src/Java.Interop/Tests/Interop-Tests.projitems +++ /dev/null @@ -1,57 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {0ADB8D72-7479-49AF-8809-E03AE4A4EAE2} - - - Java.InteropTests - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop/Tests/Interop-Tests.shproj b/src/Java.Interop/Tests/Interop-Tests.shproj deleted file mode 100644 index 8cd97918b..000000000 --- a/src/Java.Interop/Tests/Interop-Tests.shproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - {0ADB8D72-7479-49AF-8809-E03AE4A4EAE2} - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop/Tests/Interop-Tests.targets b/src/Java.Interop/Tests/Interop-Tests.targets deleted file mode 100644 index 47d5b044e..000000000 --- a/src/Java.Interop/Tests/Interop-Tests.targets +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj deleted file mode 100644 index 24ebc379e..000000000 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj +++ /dev/null @@ -1,57 +0,0 @@ - - - - - Debug - AnyCPU - {891F2E04-5614-4A26-A78F-3778025ECF43} - Library - Xamarin.Android.Tools.ApiXmlAdjusterTests - Xamarin.Android.Tools.ApiXmlAdjuster-Tests - v4.6.1 - 8.0.30703 - 2.0 - - - true - full - false - ..\..\..\bin\TestDebug - DEBUG; - prompt - 4 - false - - - true - ..\..\..\bin\TestRelease - prompt - 4 - false - - - - - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - {1268EADF-8344-431C-81F6-FCB7CBC99F49} - Xamarin.Android.Tools.ApiXmlAdjuster - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/packages.config b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/packages.config deleted file mode 100644 index b5529657b..000000000 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj index a7285ec81..339d7724b 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj +++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -12,10 +12,4 @@ ..\..\bin\Release - - - - - - diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/packages.config b/src/Xamarin.Android.Tools.Bytecode/Tests/packages.config deleted file mode 100644 index 020925a0b..000000000 --- a/src/Xamarin.Android.Tools.Bytecode/Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj b/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj index 7e02c8bc2..0f65a140b 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj +++ b/src/Xamarin.Android.Tools.Bytecode/Xamarin.Android.Tools.Bytecode.csproj @@ -12,12 +12,6 @@ ..\..\bin\Release - - - - - - diff --git a/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj b/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj index bf0223d5c..820ca6bc5 100644 --- a/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj +++ b/tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj @@ -1,73 +1,44 @@ - - - + + - Debug - AnyCPU - 10.0.0 - 2.0 - {6970466B-F6D1-417A-8A27-4FED8555EBD0} - Library - Java.Interop.PerformanceTests - Java.Interop-PerformanceTests - v4.6.1 + net472 + false + true + false - - true - full - false + + ..\..\bin\TestDebug - DEBUG; - prompt - 4 - false - true - - full - true + + ..\..\bin\TestRelease - prompt - 4 - false - true + - - - ..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - + + + + + - - - - - - - BuildPerformanceTestJar; - $(BuildDependsOn); - - - - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} - Java.Interop - - - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF} - Java.Interop.GenericMarshaler - - - {5887B410-D448-4257-A46B-EAC03C80BE93} - Java.Runtime.Environment - - - {A76309AB-98AC-4AE2-BA30-75481420C52F} - TestJVM - + + + + + + + - + - \ No newline at end of file + + + + + + + + diff --git a/tests/PerformanceTests/JavaTiming.cs b/tests/Java.Interop-PerformanceTests/Java.Interop/JavaTiming.cs similarity index 100% rename from tests/PerformanceTests/JavaTiming.cs rename to tests/Java.Interop-PerformanceTests/Java.Interop/JavaTiming.cs diff --git a/tests/PerformanceTests/TimingTests.cs b/tests/Java.Interop-PerformanceTests/Java.Interop/TimingTests.cs similarity index 100% rename from tests/PerformanceTests/TimingTests.cs rename to tests/Java.Interop-PerformanceTests/Java.Interop/TimingTests.cs diff --git a/tests/PerformanceTests/java/com/xamarin/interop/performance/JavaTiming.java b/tests/Java.Interop-PerformanceTests/java/com/xamarin/interop/performance/JavaTiming.java similarity index 100% rename from tests/PerformanceTests/java/com/xamarin/interop/performance/JavaTiming.java rename to tests/Java.Interop-PerformanceTests/java/com/xamarin/interop/performance/JavaTiming.java diff --git a/tests/Java.Interop-PerformanceTests/packages.config b/tests/Java.Interop-PerformanceTests/packages.config deleted file mode 100644 index b5529657b..000000000 --- a/tests/Java.Interop-PerformanceTests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Java.Interop/Tests/Cadenza.Collections/CollectionContract.cs b/tests/Java.Interop-Tests/Cadenza.Collections/CollectionContract.cs similarity index 100% rename from src/Java.Interop/Tests/Cadenza.Collections/CollectionContract.cs rename to tests/Java.Interop-Tests/Cadenza.Collections/CollectionContract.cs diff --git a/src/Java.Interop/Tests/Cadenza.Collections/EnumerableContract.cs b/tests/Java.Interop-Tests/Cadenza.Collections/EnumerableContract.cs similarity index 100% rename from src/Java.Interop/Tests/Cadenza.Collections/EnumerableContract.cs rename to tests/Java.Interop-Tests/Cadenza.Collections/EnumerableContract.cs diff --git a/src/Java.Interop/Tests/Cadenza.Collections/ListContract.cs b/tests/Java.Interop-Tests/Cadenza.Collections/ListContract.cs similarity index 100% rename from src/Java.Interop/Tests/Cadenza.Collections/ListContract.cs rename to tests/Java.Interop-Tests/Cadenza.Collections/ListContract.cs diff --git a/src/Java.Interop/Tests/Cadenza/BaseRocksFixture.cs b/tests/Java.Interop-Tests/Cadenza/BaseRocksFixture.cs similarity index 100% rename from src/Java.Interop/Tests/Cadenza/BaseRocksFixture.cs rename to tests/Java.Interop-Tests/Cadenza/BaseRocksFixture.cs diff --git a/tests/Java.Interop-Tests/Java.Interop-Tests.csproj b/tests/Java.Interop-Tests/Java.Interop-Tests.csproj index 64d2e9740..d803a2f97 100644 --- a/tests/Java.Interop-Tests/Java.Interop-Tests.csproj +++ b/tests/Java.Interop-Tests/Java.Interop-Tests.csproj @@ -1,82 +1,56 @@ - - - + + - Debug - AnyCPU - 8.0.30703 - 2.0 - {04E28441-36FF-4964-ADD7-EFBB47CCE406} - Library - Java.InteropTests - Java.Interop-Tests - v4.6.1 - true - ..\..\product.snk + net472 + false + true + false - - true - full - false + + ..\..\bin\TestDebug - DEBUG; - prompt - 4 - false - true - - full - true + + ..\..\bin\TestRelease - prompt - 4 - false - true - - - - - ..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - - - - - BuildInteropTestJar; - $(BuildDependsOn) - + - + + - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} - Java.Interop - - - {D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF} - Java.Interop.GenericMarshaler - - - {0C001D50-4176-45AE-BDC8-BA626508B0CC} - Mono.Linq.Expressions - - - {5887B410-D448-4257-A46B-EAC03C80BE93} - Java.Runtime.Environment - - - {A76309AB-98AC-4AE2-BA30-75481420C52F} - TestJVM - + + + + + - + + + + + + + + - + + + + + + + + - \ No newline at end of file + + + + + + + + diff --git a/src/Java.Interop/Tests/Java.Interop/CallNonvirtualBase.cs b/tests/Java.Interop-Tests/Java.Interop/CallNonvirtualBase.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/CallNonvirtualBase.cs rename to tests/Java.Interop-Tests/Java.Interop/CallNonvirtualBase.cs diff --git a/src/Java.Interop/Tests/Java.Interop/CallNonvirtualDerived.cs b/tests/Java.Interop-Tests/Java.Interop/CallNonvirtualDerived.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/CallNonvirtualDerived.cs rename to tests/Java.Interop-Tests/Java.Interop/CallNonvirtualDerived.cs diff --git a/src/Java.Interop/Tests/Java.Interop/CallNonvirtualDerived2.cs b/tests/Java.Interop-Tests/Java.Interop/CallNonvirtualDerived2.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/CallNonvirtualDerived2.cs rename to tests/Java.Interop-Tests/Java.Interop/CallNonvirtualDerived2.cs diff --git a/src/Java.Interop/Tests/Java.Interop/CallVirtualFromConstructorBase.cs b/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/CallVirtualFromConstructorBase.cs rename to tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorBase.cs diff --git a/src/Java.Interop/Tests/Java.Interop/CallVirtualFromConstructorDerived.cs b/tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/CallVirtualFromConstructorDerived.cs rename to tests/Java.Interop-Tests/Java.Interop/CallVirtualFromConstructorDerived.cs diff --git a/src/Java.Interop/Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs b/tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs rename to tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaArrayContract.cs b/tests/Java.Interop-Tests/Java.Interop/JavaArrayContract.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaArrayContract.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaArrayContract.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaBooleanArrayContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaBooleanArrayContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaBooleanArrayContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaBooleanArrayContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaCharArrayContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaCharArrayContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaCharArrayContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaCharArrayContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaDoubleArrayContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaDoubleArrayContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaDoubleArrayContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaDoubleArrayContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaExceptionTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaExceptionTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaExceptionTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaExceptionTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaInt16ArrayContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaInt16ArrayContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaInt16ArrayContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaInt16ArrayContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaInt32ArrayContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaInt32ArrayContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaInt32ArrayContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaInt32ArrayContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaInt64ArrayContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaInt64ArrayContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaInt64ArrayContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaInt64ArrayContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaManagedGCBridgeTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaManagedGCBridgeTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaManagedGCBridgeTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaObjectArrayTest.cs b/tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaObjectArrayTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaObjectArrayTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaObjectExtensionsTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaObjectExtensionsTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaObjectExtensionsTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaObjectExtensionsTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaObjectTest.cs b/tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaObjectTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaPrimitiveArrayContract.cs b/tests/Java.Interop-Tests/Java.Interop/JavaPrimitiveArrayContract.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaPrimitiveArrayContract.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaPrimitiveArrayContract.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaSByteArrayContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaSByteArrayContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaSByteArrayContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaSByteArrayContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaSingleArrayContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JavaSingleArrayContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaSingleArrayContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaSingleArrayContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JavaVMFixture.cs b/tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.Partial.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JavaVMFixture.cs rename to tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.Partial.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniEnvironmentTests.cs b/tests/Java.Interop-Tests/Java.Interop/JniEnvironmentTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniEnvironmentTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JniEnvironmentTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniInstanceMethodIDTest.cs b/tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniInstanceMethodIDTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JniInstanceMethodIDTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniMarshalTests.cs b/tests/Java.Interop-Tests/Java.Interop/JniMarshalTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniMarshalTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JniMarshalTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniPeerMembersTests.cs b/tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniPeerMembersTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JniPeerMembersTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniReferenceSafeHandleTest.cs b/tests/Java.Interop-Tests/Java.Interop/JniReferenceSafeHandleTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniReferenceSafeHandleTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JniReferenceSafeHandleTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs b/tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniRuntimeTest.cs b/tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniRuntimeTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniTransitionTest.cs b/tests/Java.Interop-Tests/Java.Interop/JniTransitionTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniTransitionTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JniTransitionTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniTypeManagerTests.cs b/tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniTypeManagerTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JniTypeManagerTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniTypeSignatureAttributeTest.cs b/tests/Java.Interop-Tests/Java.Interop/JniTypeSignatureAttributeTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniTypeSignatureAttributeTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JniTypeSignatureAttributeTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniTypeSignatureTest.cs b/tests/Java.Interop-Tests/Java.Interop/JniTypeSignatureTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniTypeSignatureTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JniTypeSignatureTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniTypeTest.cs b/tests/Java.Interop-Tests/Java.Interop/JniTypeTest.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniTypeTest.cs rename to tests/Java.Interop-Tests/Java.Interop/JniTypeTest.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniValueMarshalerAttributeTests.cs b/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniValueMarshalerAttributeTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerAttributeTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/JniValueMarshalerContractTests.cs b/tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/JniValueMarshalerContractTests.cs rename to tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/MethodBindingTests.cs b/tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/MethodBindingTests.cs rename to tests/Java.Interop-Tests/Java.Interop/MethodBindingTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/SelfRegistration.cs b/tests/Java.Interop-Tests/Java.Interop/SelfRegistration.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/SelfRegistration.cs rename to tests/Java.Interop-Tests/Java.Interop/SelfRegistration.cs diff --git a/src/Java.Interop/Tests/Java.Interop/SelfRegistrationTests.cs b/tests/Java.Interop-Tests/Java.Interop/SelfRegistrationTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/SelfRegistrationTests.cs rename to tests/Java.Interop-Tests/Java.Interop/SelfRegistrationTests.cs diff --git a/src/Java.Interop/Tests/Java.Interop/TestType.cs b/tests/Java.Interop-Tests/Java.Interop/TestType.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/TestType.cs rename to tests/Java.Interop-Tests/Java.Interop/TestType.cs diff --git a/src/Java.Interop/Tests/Java.Interop/TestTypeTests.cs b/tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs similarity index 100% rename from src/Java.Interop/Tests/Java.Interop/TestTypeTests.cs rename to tests/Java.Interop-Tests/Java.Interop/TestTypeTests.cs diff --git a/src/Java.Interop/Tests/java/com/xamarin/interop/CallNonvirtualBase.java b/tests/Java.Interop-Tests/java/com/xamarin/interop/CallNonvirtualBase.java similarity index 100% rename from src/Java.Interop/Tests/java/com/xamarin/interop/CallNonvirtualBase.java rename to tests/Java.Interop-Tests/java/com/xamarin/interop/CallNonvirtualBase.java diff --git a/src/Java.Interop/Tests/java/com/xamarin/interop/CallNonvirtualDerived.java b/tests/Java.Interop-Tests/java/com/xamarin/interop/CallNonvirtualDerived.java similarity index 100% rename from src/Java.Interop/Tests/java/com/xamarin/interop/CallNonvirtualDerived.java rename to tests/Java.Interop-Tests/java/com/xamarin/interop/CallNonvirtualDerived.java diff --git a/src/Java.Interop/Tests/java/com/xamarin/interop/CallNonvirtualDerived2.java b/tests/Java.Interop-Tests/java/com/xamarin/interop/CallNonvirtualDerived2.java similarity index 100% rename from src/Java.Interop/Tests/java/com/xamarin/interop/CallNonvirtualDerived2.java rename to tests/Java.Interop-Tests/java/com/xamarin/interop/CallNonvirtualDerived2.java diff --git a/src/Java.Interop/Tests/java/com/xamarin/interop/CallVirtualFromConstructorBase.java b/tests/Java.Interop-Tests/java/com/xamarin/interop/CallVirtualFromConstructorBase.java similarity index 100% rename from src/Java.Interop/Tests/java/com/xamarin/interop/CallVirtualFromConstructorBase.java rename to tests/Java.Interop-Tests/java/com/xamarin/interop/CallVirtualFromConstructorBase.java diff --git a/src/Java.Interop/Tests/java/com/xamarin/interop/CallVirtualFromConstructorDerived.java b/tests/Java.Interop-Tests/java/com/xamarin/interop/CallVirtualFromConstructorDerived.java similarity index 100% rename from src/Java.Interop/Tests/java/com/xamarin/interop/CallVirtualFromConstructorDerived.java rename to tests/Java.Interop-Tests/java/com/xamarin/interop/CallVirtualFromConstructorDerived.java diff --git a/src/Java.Interop/Tests/java/com/xamarin/interop/CrossReferenceBridge.java b/tests/Java.Interop-Tests/java/com/xamarin/interop/CrossReferenceBridge.java similarity index 100% rename from src/Java.Interop/Tests/java/com/xamarin/interop/CrossReferenceBridge.java rename to tests/Java.Interop-Tests/java/com/xamarin/interop/CrossReferenceBridge.java diff --git a/src/Java.Interop/Tests/java/com/xamarin/interop/SelfRegistration.java b/tests/Java.Interop-Tests/java/com/xamarin/interop/SelfRegistration.java similarity index 100% rename from src/Java.Interop/Tests/java/com/xamarin/interop/SelfRegistration.java rename to tests/Java.Interop-Tests/java/com/xamarin/interop/SelfRegistration.java diff --git a/src/Java.Interop/Tests/java/com/xamarin/interop/TestType.java b/tests/Java.Interop-Tests/java/com/xamarin/interop/TestType.java similarity index 100% rename from src/Java.Interop/Tests/java/com/xamarin/interop/TestType.java rename to tests/Java.Interop-Tests/java/com/xamarin/interop/TestType.java diff --git a/tests/Java.Interop-Tests/packages.config b/tests/Java.Interop-Tests/packages.config deleted file mode 100644 index 94cf2213a..000000000 --- a/tests/Java.Interop-Tests/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj b/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj index ac16cc2e2..b38dc167e 100644 --- a/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj +++ b/tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj @@ -1,72 +1,37 @@ - - - + + - Debug - AnyCPU - 8.0.30703 - 2.0 - {82B1DD53-69CA-4A61-B6B1-F06F1525EF4D} - Library - Java.Interop.DynamicTests - Java.Interop.Dynamic-Tests - v4.6.1 + net472 + false + true + false - - true - full - false + + ..\..\bin\TestDebug - DEBUG; - prompt - 4 - false - true - - full - true + + ..\..\bin\TestRelease - prompt - 4 - false - true + - - - ..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - - - - + - + + + + + - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} - Java.Interop - - - {AD4468F8-8883-434B-9D4C-E1801BB3B52A} - Java.Interop.Dynamic - - - {5887B410-D448-4257-A46B-EAC03C80BE93} - Java.Runtime.Environment - - - {A76309AB-98AC-4AE2-BA30-75481420C52F} - TestJVM - - - {0C001D50-4176-45AE-BDC8-BA626508B0CC} - Mono.Linq.Expressions - + + + + + - \ No newline at end of file + + diff --git a/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic/DynamicJavaClassTests.cs b/tests/Java.Interop.Dynamic-Tests/Java.Interop/DynamicJavaClassTests.cs similarity index 100% rename from src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic/DynamicJavaClassTests.cs rename to tests/Java.Interop.Dynamic-Tests/Java.Interop/DynamicJavaClassTests.cs diff --git a/src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic/DynamicJavaInstanceTests.cs b/tests/Java.Interop.Dynamic-Tests/Java.Interop/DynamicJavaInstanceTests.cs similarity index 100% rename from src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic/DynamicJavaInstanceTests.cs rename to tests/Java.Interop.Dynamic-Tests/Java.Interop/DynamicJavaInstanceTests.cs diff --git a/tests/Java.Interop.Dynamic-Tests/packages.config b/tests/Java.Interop.Dynamic-Tests/packages.config deleted file mode 100644 index 94cf2213a..000000000 --- a/tests/Java.Interop.Dynamic-Tests/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj index b05f14973..8fd1cf0a8 100644 --- a/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj +++ b/tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj @@ -1,79 +1,45 @@ - - + + - Debug - AnyCPU - 8.0.30703 - 2.0 - {82F24161-F0CA-44CC-AEC3-885D613605E0} - Library - Java.Interop.ExportTests - Java.Interop.Export-Tests - v4.6.1 + net472 + false + true + false - - true - full - false + + ..\..\bin\TestDebug - DEBUG; - prompt - 4 - false - true - - full - true + + ..\..\bin\TestRelease - prompt - 4 - false - true + - - ..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - - - - - - BuildExportTestJar; - $(BuildDependsOn) - - - - - - - - {5887B410-D448-4257-A46B-EAC03C80BE93} - Java.Runtime.Environment - - - {A76309AB-98AC-4AE2-BA30-75481420C52F} - TestJVM - - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} - Java.Interop - - - {B501D075-6183-4E1D-92C9-F7B5002475B1} - Java.Interop.Export - - - {0C001D50-4176-45AE-BDC8-BA626508B0CC} - Mono.Linq.Expressions - + + + + + - + + + + + + + + - + - \ No newline at end of file + + + + + + + + diff --git a/src/Java.Interop.Export/Tests/Java.Interop/ExportTest.cs b/tests/Java.Interop.Export-Tests/Java.Interop/ExportTest.cs similarity index 100% rename from src/Java.Interop.Export/Tests/Java.Interop/ExportTest.cs rename to tests/Java.Interop.Export-Tests/Java.Interop/ExportTest.cs diff --git a/src/Java.Interop.Export/Tests/Java.Interop/MarshalMemberBuilderTest.cs b/tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs similarity index 100% rename from src/Java.Interop.Export/Tests/Java.Interop/MarshalMemberBuilderTest.cs rename to tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs diff --git a/src/Java.Interop.Export/Tests/java/com/xamarin/interop/export/ExportType.java b/tests/Java.Interop.Export-Tests/java/com/xamarin/interop/export/ExportType.java similarity index 100% rename from src/Java.Interop.Export/Tests/java/com/xamarin/interop/export/ExportType.java rename to tests/Java.Interop.Export-Tests/java/com/xamarin/interop/export/ExportType.java diff --git a/tests/Java.Interop.Export-Tests/packages.config b/tests/Java.Interop.Export-Tests/packages.config deleted file mode 100644 index 08e9308ab..000000000 --- a/tests/Java.Interop.Export-Tests/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ActivityAttribute.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.App/ActivityAttribute.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ActivityAttribute.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.App/ActivityAttribute.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ApplicationAttribute.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.App/ApplicationAttribute.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ApplicationAttribute.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.App/ApplicationAttribute.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/InstrumentationAttribute.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.App/InstrumentationAttribute.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/InstrumentationAttribute.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.App/InstrumentationAttribute.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ServiceAttribute.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.App/ServiceAttribute.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.App/ServiceAttribute.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.App/ServiceAttribute.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.Content/BroadcastReceiverAttribute.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.Content/BroadcastReceiverAttribute.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.Content/BroadcastReceiverAttribute.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.Content/BroadcastReceiverAttribute.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.Content/ContentProviderAttribute.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.Content/ContentProviderAttribute.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Android.Content/ContentProviderAttribute.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Android.Content/ContentProviderAttribute.cs diff --git a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj new file mode 100644 index 000000000..c0474c24c --- /dev/null +++ b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj @@ -0,0 +1,34 @@ + + + + net472 + false + false + $(DefineConstants);HAVE_CECIL;JCW_ONLY_TYPE_NAMES + + + + ..\..\bin\TestDebug + + + + ..\..\bin\TestRelease + + + + + + + + + + + + + + + + + + + diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/Crc64Tests.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/Crc64Tests.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/Crc64Tests.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/Crc64Tests.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/IdentifierValidatorTests.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/IdentifierValidatorTests.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/IdentifierValidatorTests.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/IdentifierValidatorTests.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/SupportDeclarations.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/SupportDeclarations.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/SupportDeclarations.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/SupportDeclarations.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGeneratorTests.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGeneratorTests.cs similarity index 100% rename from src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGeneratorTests.cs rename to tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGeneratorTests.cs diff --git a/tests/PerformanceTests/PerformanceTests.projitems b/tests/PerformanceTests/PerformanceTests.projitems deleted file mode 100644 index 7348a062f..000000000 --- a/tests/PerformanceTests/PerformanceTests.projitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {0FBECD2A-7C91-41AB-A4B4-B781E8EC8479} - - - - Java.Interop.PerformanceTests - - - - - - - diff --git a/tests/PerformanceTests/PerformanceTests.shproj b/tests/PerformanceTests/PerformanceTests.shproj deleted file mode 100644 index c1ce57fac..000000000 --- a/tests/PerformanceTests/PerformanceTests.shproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - {0FBECD2A-7C91-41AB-A4B4-B781E8EC8479} - - - - - - - \ No newline at end of file diff --git a/tests/PerformanceTests/PerformanceTests.targets b/tests/PerformanceTests/PerformanceTests.targets deleted file mode 100644 index 4805bbf32..000000000 --- a/tests/PerformanceTests/PerformanceTests.targets +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/tests/TestJVM/TestJVM.csproj b/tests/TestJVM/TestJVM.csproj index 310f4c7ab..e1c2c8007 100644 --- a/tests/TestJVM/TestJVM.csproj +++ b/tests/TestJVM/TestJVM.csproj @@ -1,61 +1,29 @@ - - + + - Debug - AnyCPU - 8.0.30703 - 2.0 - {A76309AB-98AC-4AE2-BA30-75481420C52F} - Library - TestJVM - TestJVM - v4.6.1 - true - ..\..\product.snk + net472 + false + false - - true - full + + ..\..\bin\TestDebug - prompt - false - false - false - - - 4 - false - DEBUG - + + ..\..\bin\TestRelease - prompt - false - false - false - - - 4 - false + - - - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll - + + + + - + - + + - - - {5887B410-D448-4257-A46B-EAC03C80BE93} - Java.Runtime.Environment - - - {94BD81F7-B06F-4295-9636-F8A3B6BDC762} - Java.Interop - - - \ No newline at end of file + + diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/GenericInheritanceMappingTest.cs b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/GenericInheritanceMappingTest.cs similarity index 100% rename from src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/GenericInheritanceMappingTest.cs rename to tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/GenericInheritanceMappingTest.cs diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/JavaApiTest.cs b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/JavaApiTest.cs similarity index 100% rename from src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/JavaApiTest.cs rename to tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/JavaApiTest.cs diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/JavaApiTestHelper.cs b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/JavaApiTestHelper.cs similarity index 86% rename from src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/JavaApiTestHelper.cs rename to tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/JavaApiTestHelper.cs index fec353953..729696459 100644 --- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/JavaApiTestHelper.cs +++ b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/JavaApiTestHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Xml; @@ -13,9 +13,8 @@ public class JavaApiTestHelper static readonly string ApiPath = Path.Combine ( TopDir, - "src", - "Xamarin.Android.Tools.ApiXmlAdjuster", - "Tests", + "tests", + "Xamarin.Android.Tools.ApiXmlAdjuster-Tests", "api-24.xml.in"); public static JavaApi GetLoadedApi () diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/OverrideMarkerTest.cs b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/OverrideMarkerTest.cs similarity index 100% rename from src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/OverrideMarkerTest.cs rename to tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/OverrideMarkerTest.cs diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/TypeResolverTest.cs b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/TypeResolverTest.cs similarity index 100% rename from src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/TypeResolverTest.cs rename to tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/TypeResolverTest.cs diff --git a/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj new file mode 100644 index 000000000..52a38172a --- /dev/null +++ b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj @@ -0,0 +1,27 @@ + + + + net472 + false + false + + + + ..\..\bin\TestDebug + + + + ..\..\bin\TestRelease + + + + + + + + + + + + + diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/api-24.xml.in b/tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/api-24.xml.in similarity index 100% rename from src/Xamarin.Android.Tools.ApiXmlAdjuster/Tests/api-24.xml.in rename to tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/api-24.xml.in diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ClassFileFixture.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/ClassFileFixture.cs similarity index 85% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ClassFileFixture.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/ClassFileFixture.cs index 14c852bc2..741f5de80 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Tests/ClassFileFixture.cs +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/ClassFileFixture.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Linq; using System.Reflection; @@ -13,19 +13,14 @@ public class ClassFileFixture { protected static ClassFile LoadClassFile (string resource) { - // Look for resources that end with our name, this allows us to - // avoid the LogicalName stuff - var assembly = Assembly.GetExecutingAssembly (); - var name = assembly.GetManifestResourceNames ().FirstOrDefault (n => n.EndsWith (resource, StringComparison.OrdinalIgnoreCase)) ?? resource; - - using (var stream = assembly.GetManifestResourceStream (name)) { + using (var stream = GetResourceStream (resource)) { return new ClassFile (stream); } } protected static string LoadString (string resource) { - using (var s = Assembly.GetExecutingAssembly ().GetManifestResourceStream (resource)) + using (var s = GetResourceStream (resource)) using (var r = new StreamReader (s)) return r.ReadToEnd (); } @@ -35,7 +30,7 @@ protected static string LoadToTempFile (string resource) var tempFilePath = Path.GetTempFileName (); using (var w = File.Create (tempFilePath)) - using (var s = Assembly.GetExecutingAssembly ().GetManifestResourceStream (resource)) + using (var s = GetResourceStream (resource)) s.CopyTo (w); return tempFilePath; @@ -79,6 +74,16 @@ protected static void AssertXmlDeclaration (string[] classResources, string xmlR Assert.AreEqual (expected, actual.ToString ()); } + + static Stream GetResourceStream (string resource) + { + // Look for resources that end with our name, this allows us to + // avoid the LogicalName stuff + var assembly = Assembly.GetExecutingAssembly (); + var name = assembly.GetManifestResourceNames ().FirstOrDefault (n => n.EndsWith ("." + resource, StringComparison.OrdinalIgnoreCase)) ?? resource; + + return assembly.GetManifestResourceStream (name); + } } } diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ClassFileTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/ClassFileTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ClassFileTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/ClassFileTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ExpectedFieldDeclaration.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/ExpectedFieldDeclaration.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ExpectedFieldDeclaration.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/ExpectedFieldDeclaration.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ExpectedInnerClassInfo.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/ExpectedInnerClassInfo.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ExpectedInnerClassInfo.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/ExpectedInnerClassInfo.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ExpectedMethodDeclaration.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/ExpectedMethodDeclaration.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ExpectedMethodDeclaration.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/ExpectedMethodDeclaration.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ExpectedTypeDeclaration.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/ExpectedTypeDeclaration.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ExpectedTypeDeclaration.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/ExpectedTypeDeclaration.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/IJavaInterfaceTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/IJavaInterfaceTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/IJavaInterfaceTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/IJavaInterfaceTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaAnnotationTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaAnnotationTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaAnnotationTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/JavaAnnotationTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaEnumTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaEnumTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaEnumTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/JavaEnumTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.1Tests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.1Tests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.1Tests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.1Tests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.ASCTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.ASCTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.ASCTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.ASCTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.PSCTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.PSCTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.PSCTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.PSCTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.RNC.RPNCTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNC.RPNCTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.RNC.RPNCTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNC.RPNCTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.RNCTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNCTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.RNCTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNCTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaTypeTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaTypeTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/KotlinFixupsTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/KotlinFixupsTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/KotlinMetadataTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinMetadataTests.cs similarity index 98% rename from src/Xamarin.Android.Tools.Bytecode/Tests/KotlinMetadataTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinMetadataTests.cs index 7126ac34f..0475dba2d 100644 --- a/src/Xamarin.Android.Tools.Bytecode/Tests/KotlinMetadataTests.cs +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinMetadataTests.cs @@ -181,9 +181,7 @@ public void Object () var klass_meta = GetClassMetadata ("Object.class"); Assert.AreEqual (KotlinClassInheritability.Final, klass_meta.Inheritability); - - // One would expect this to be "Object" but it doesn't seem to be - Assert.AreEqual (KotlinClassType.Class, klass_meta.ObjectType); + Assert.AreEqual (KotlinClassType.Object, klass_meta.ObjectType); } [Test] diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/NonGenericGlobalTypeTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/NonGenericGlobalTypeTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/NonGenericGlobalTypeTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/NonGenericGlobalTypeTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/ParameterFixupTests.cs similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupTests.cs rename to tests/Xamarin.Android.Tools.Bytecode-Tests/ParameterFixupTests.cs diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/IJavaInterface.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/IJavaInterface.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/IJavaInterface.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/IJavaInterface.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaAnnotation.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaAnnotation.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaAnnotation.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaAnnotation.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaEnum.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaEnum.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaEnum.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaEnum.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$1.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$1.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$1.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$1.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$ASC.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$ASC.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$ASC.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$ASC.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$PSC.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$PSC.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$PSC.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$PSC.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$RNC$RPNC.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$RNC$RPNC.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$RNC$RPNC.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$RNC$RPNC.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$RNC.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$RNC.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType$RNC.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType$RNC.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/JavaType.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JavaType.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/NonGenericGlobalType.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/NonGenericGlobalType.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/NonGenericGlobalType.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/NonGenericGlobalType.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ParameterDescription.txt b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterDescription.txt similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ParameterDescription.txt rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterDescription.txt diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixup.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixup.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixup.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixup.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupApiXmlDocs.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupApiXmlDocs.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupApiXmlDocs.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupApiXmlDocs.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupFromDescriptionText.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupFromDescriptionText.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupFromDescriptionText.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupFromDescriptionText.xml diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupFromDocs.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupFromDocs.xml similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/ParameterFixupFromDocs.xml rename to tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupFromDocs.xml diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj b/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj new file mode 100644 index 000000000..a08480953 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj @@ -0,0 +1,74 @@ + + + + + + net472 + false + false + + + + ..\..\bin\TestDebug + + + + ..\..\bin\TestRelease + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/NonGenericGlobalType.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/NonGenericGlobalType.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/NonGenericGlobalType.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/NonGenericGlobalType.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/IJavaInterface.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/IJavaInterface.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/IJavaInterface.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/IJavaInterface.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/IParameterInterface.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/IParameterInterface.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/IParameterInterface.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/IParameterInterface.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/JavaAnnotation.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/JavaAnnotation.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/JavaAnnotation.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/JavaAnnotation.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/JavaType.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/JavaType.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/JavaType.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/JavaType.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/NestedInterface.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/NestedInterface.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/NestedInterface.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/NestedInterface.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/ParameterAbstractClass.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/ParameterAbstractClass.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/ParameterAbstractClass.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/ParameterAbstractClass.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/ParameterClass.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/ParameterClass.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/ParameterClass.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/ParameterClass.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/ParameterClass2.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/ParameterClass2.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/com/xamarin/ParameterClass2.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/com/xamarin/ParameterClass2.java diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/java/java/util/Collection.java b/tests/Xamarin.Android.Tools.Bytecode-Tests/java/java/util/Collection.java similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/java/java/util/Collection.java rename to tests/Xamarin.Android.Tools.Bytecode-Tests/java/java/util/Collection.java diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject$Companion.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject$Companion.class new file mode 100644 index 0000000000000000000000000000000000000000..d01d39fc631c84372b23b1c1c992f0c9b7aa3a3d GIT binary patch literal 752 zcmb7BO>Yx15PkNh*>nkHn?gw_-vp`U&?UK{0ulrvMM^<}DwiIRvoYXg*NfKPoO9xb z@DDg4aX?Xz{3yhDLxWUtL9%B2-n=&&kAMF9{sTY{_Ziy#Ed3<3%Jl2;RK~Wm#y%KB zI2CgdB|?9QR&^g9L-n!J%06ZA_V!10Y@iyT0-vE`KPtnpJ6v};-}R88yEmL=Hc>j7 z&eKR~D|0Q9=!JYQip2IaZERk|Hp`DhK9l+3{wM%<-M2gO-{QNptTG(@UpI!WGsBUz zVj`@dnRq()XeG>r2ElO&;UK-2&4`+G89K{F5bzcccu2S9qIUY(Yb_T&{*XQQYy9*} zm51DEdyJZ)ac&Jhb{RI;Btvt3U+w8&W@(B2Y$C}#R9e0&(y`2s#W*3RIm}{_j6|*+ z{zKLWTFbnj2xBCzK6slIc`RQlXK24Ev{k7bDWk~oOzX@FOMh+9rIl9bb)d}M57M}| z2t|}>c5FQOhT7M%e4C;xJLw&Y^_2jd2!N20`2sP{{D?BA?9BCln|D@%mDx#g5tqp3 z;Vz+|Y;YYn(8fK&95>OS{Dk-hX~PqE18kM2iS09Vd4Ma}Ar@CpzzkYwQ^_DOxMooO E4XG=ls{jB1 literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject.class new file mode 100644 index 0000000000000000000000000000000000000000..c380cd78a903b41c2e82d3472947e67c04748ef8 GIT binary patch literal 705 zcmZ8e+lmuG5Ixo}T=x5Ri^HEQ(1F?n_Q1#vuDIOLgSp+a!7hR7gUV{@XWU555*>AAeYU0z)+U0&ji)$+jU@h9vl zb6)0ue=YDT&uV*&9z%22cJrVAZ4_~hq1)LynJpq;X)6;gLjRTgDALgOV{L4b1~yKP zMKYJk;btt?U9@n+gNO5FaNJ_3@3nb6w=}hWJe9P7q0;hA8ck&KUQ9w_>ccn?;YcJZ z!)K&7&{`(_P#7a=*6zDFO#=B^WrF5Os;!FTNEt&<4Pv)D2Oq=0Rf*{p}m3>FkR82 zIOOskqNNMEq1!}fFm(`t7|T!u-dU^LHQmUqZm#Ea!`4hgt>y9tv$gaR>GzJnp;A>V zt=(2lB19f}%i}3>BT5U@oof1aFqC_czzgT5%}?*z_nHkPo{jn(23Vo z?V;MJ*|VgTZ8l1F-JDa+HO-u2`5`04xWf_BCBxQnwoV8{O7-=Px}h2Nsn*FPC8|{4 zcqA~|i9)(9-%<7)E4u^)E~Q%D9y~Ge-%GuxODkR!6F9}}&IrhM-90r4y%*#z%{25{ zSu;cUFoJU|R&TQgQ(R*gWt^u(s~a1dQ5HDa;T#96#{->;;sP!*E|o~|#3+>!!Ces; zrgCnf-^RoVn&F^Xx;SYW*P=L!eqQ*Pj#5>v>TJDCWtfM|`Mue8`&_6H3bdj2bwjPu zwHj#UyerjxfwBL(Cv-{Fm6}EuMOIDi8bkeWF*dQI_!RS8j0*y>-8!4oY_&{XgCM2# zO&@gx)|Z!nJ?MIP(Tv>d zpvTaMetNf`#NdznU_=KJt>=m%(eX6N{io>!M0v)r$6|p-z99qI_{b|9%WUKQO!g%P zGs7>DY(E^!!_thp0nNh=c)Ak^f5iy!A$f%*a_1EA*NS?2Q#~K03rLLkzkP;aJY5(G zkP+}*%w&hRk#)DMkcS^qIMmDwZ_YSl9?k%vaJIr3;R}jwoa8`G)Ob_iV@`;hWk=vn zTC|IrYl_+$?1;3s_>40tpK>O&`coR$SQbCfzO1Jo!WX z1uBUcji%wzA7#9=MN*<}W@mEFJ#**Gz4P#W* z*Yfr=B9bdz#IuW8hVIK@6)^^RePeU$6+>5tmRNIRTd=X$1#^p*!jf3DT+MYnCtPHZ zQt2{-I$2&SZ5K=iqk3t-k~`P+r#d{DVZ-tEv&D4TKo1f+Wb{(<@U0Ut3{2W&dB?Nr z_Kx46vFCV}J2}gc{5!>e<#P46q9T(F zy`@7xq)KPj?9ke?LW_FG>qio`or$T3;BEvVphR~*Bx;W?pKTo*Iv?aZPb74%$=caF zHrP6z*OIX$pKTq_vSn4{XYUoB;0Iij=#SAa)31mW^9<0S=v1O!0}518tcMyjgXjo6 z)(|%kZ-ZwVbOU-DJf~-H@!)0-Lu&1czenZmDLJ0K-mLH1jV)`}B_>(&YnEHK8jir{ zWZZQ2Ju7TBNT8d3vr)5G9iblDYiGcu+aPf?0`0#G_c7cw$!M zhiAD1SBOjxbT)c6zmnT%9Mu}FbQ`4iTND2YR63q(vpsr$>=JB=! zSA}2tRP^Cm6j#xY0ot)bEGO@A3}T2PdBXjX0?^aGzMrRKWsdFk6Khh%px+ N5kLu`1&9aGe*?!W>l*+7 literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClass.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClass.kt new file mode 100644 index 000000000..d8026e828 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClass.kt @@ -0,0 +1,3 @@ +enum class EnumClass { + NORTH, SOUTH, WEST, EAST +} \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces$PLUS.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces$PLUS.class new file mode 100644 index 0000000000000000000000000000000000000000..16e36be4b01a61fc9183275d3a49b564eb4b38e9 GIT binary patch literal 928 zcmZ`%&rcIU6#izqZI@DQsR{)uqE>Aov9;G469tKDiZNE}fddZh07JL4WM`Jd8z=u7 zFP=<17!q&(QN}kbsEKwm``&!-$2V`@+wVWVd>--WNk@ z>Mwh5`gt&hg((qvWEisI_&9t|x)B7;fWfne$}p_-rX;1bT?S_9qj;7u?4Nx zM(;?Rh*l`{L91_Lr4PD6bHI>kIJx;hcW)foQ0dmu$)u%R^;(3jO}Q_U&~8N9*f<&5 zDBc$FSjOGvpok($1$Zda%j%LIzpKSW?nW`~k)rH+o1yY=AydO2Fw9+4u`R6_2`lJ@ zd~%YZCNn2W1ou)12dQstOr{Z~cF#^L1zzRpcXnFfWxv3E?tlBhs%NJi-e%9MWxmAQ znNF_ko$IXA&*mLPhhcGAv#AQuNZceDmZnVP{+LGLZA2ruQTAi4BP*<; zsh|x`GjNMjiCN@G)(Jf!>{{e4*WP_hy?01DFW}=Y$<<$e;z|BKWA&FQ0pE9ZA!O*!wSd6$W+K__>gtN#|NXr`Xq ySR=hf_G|Q-`5j~eETp@N#S63)U>P;C;`$Dl!3u8dAZOqktQuquZW_!O%>D#P*u%E~ literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces$TIMES.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces$TIMES.class new file mode 100644 index 0000000000000000000000000000000000000000..571111d3a329c01f496e03a67289ad76fd09c94c GIT binary patch literal 931 zcmZ`%O-~a+7=C73%Cex8s!*T^YSk7JTYIfBQ9k0DmV+hr&;yyaLpyYLmh8-uc;n=+ z@#4wEgCX(ek21cqfSPDGv+q04`|<4iu|Ix({RW_c9fpm4m4v$i*ZRFQV_z8&pYVau zvD6Hkttm-YyiEpX=%oafFyvlHCCy8Q zqV8A{47*BJ``7BV&bIm6OT6>VYokQ+`N zI^lVS#>}i(B-l?OETqA)37LkJ+Pu6dcuvtt-^&Zn$-AE8I_~$6tay3RaO&)BG4HH7 z^-Lp|&tB^ptKTeJiUz~#v}scnpxvaqWLTTBlV=m!MRqqD3Wmj&RN^oR`yxK#{eUcm zRy5#2m&elLYvWu;jubaZOaTkNQX)?OAwjG6I#Ci2#DTQQtM3wJWGK2)OUizwRAji3 zv=-Fi&=Tz9*cy=|Stj(Fu$@tMy)^!mdLNUtUSJ+iNN!#EF$d#VyNBN)~ z-y&`K4#;o$-0htb`+}vYx}ideltYd+RdA}cm}U>f(a*+Wjl)!5RQ(RiRSr!oHv8kfX^ literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces.class new file mode 100644 index 0000000000000000000000000000000000000000..da1b369c80cf6ae87af9218616e77a6ad41df9c6 GIT binary patch literal 1840 zcmb7EU2_sw7=F%SVV5mU5H$hBHY!yh8j#k0ktW6j>sl~2C>y&7kJnD~-qUD7*O%eO)|#YX7j}kzpb$ z7)H?`8EhtS21y+pDe}aBVtEXVK#Txvzz|y;+nXs&B&_ATma|tgitPl_$mob7OZm>5 zl*lbd^vtckOYe^52s>Y4NWHBa3cty)cABlmLEop~%ln7DvL$Ot+~qZMR}5@_weNVo zJLvj-w<+8M)2$WTGA45BY`**EaH|)bGA#T*Hp;`Hum>h3Cs!zjXF7rRF%>7nAE}t4 z40r9mV=|m86ekj}zP)dD{aOMA6m?ufiOLwTukSM4I3@JrJ1To?5+C$>ZNk*JPLtMU zOOoyDSddjKGn{#yil*s{9pMY=H{Lsp&@Ezen5N}+u!LMjs4os^YlrIe{qQKQ^EB6a zGC7i(oNGGQ6z$cIEImA`YAGefE5oA-tMUrJqiX!sPcfd1+)pQ!EU!eXv1Dv4RVnYy z>~l?{FD{K#8F_)rVF@_7NaS-aAS){$ydq@!K8(MuvEBVYvUxIf!kr!C*q;5x!vC?^l)mBG&fqEx(S2@Pl zv|+TK;p(q}0)>U-n50h4AlpGLUC2Gh*`I03(V#I#0Fc!tjdLRi&Pi|RQE?tK!MTcA znsNHk-v^D-uQ!zQxno?AHYX`#A(S~>98-P}P(BFs5=lnXAJU1WUMEKsl4?m(&z(+P z8bKz!{V%nQ;1VtqSsYi8ACr$F0`%W-^*QE;xb_Q~0%5M>#tDW8PU-)vj(LV&LQ8{RFpOuRb-Xwx823zSsow d@Fi-S&^^RGEPD9LL&n2&FhB2M)`R9j{|8JOmu~<7 literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces.kt new file mode 100644 index 000000000..5b2efc376 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces.kt @@ -0,0 +1,15 @@ +interface EnumClassWithInterfacesInterface { + fun apply(t: Int, u: Int) : Int + fun applyAsInt(t: Int, u: Int) : Int +} + +enum class EnumClassWithInterfaces : EnumClassWithInterfacesInterface { + PLUS { + override fun apply(t: Int, u: Int): Int = t + u + }, + TIMES { + override fun apply(t: Int, u: Int): Int = t * u + }; + + override fun applyAsInt(t: Int, u: Int) = apply(t, u) +} \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfacesInterface.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfacesInterface.class new file mode 100644 index 0000000000000000000000000000000000000000..3b63f4fa4e5d44df7fa2587acac8ffc41afbe6b6 GIT binary patch literal 496 zcmah_O;5r=5Ph?Sf)%CUS3wWPgVBp1S5L%ftihP5(F3OiiWJJ0unUPdewPQs*&k(` zHtI=ZGCObI&g`4F`~LCz2B3jG!v2Mtjn5;g^;2jDzB0kIFS~*M+2ue4cPQtw7D@G7 zyX_2vuF1h7WaVTMy)Yj6{;^NUm_eus2d)1!&j@6A@g15GoK&Zo%p{arqu4~Ds@()e z_N0;AEXH$-4O5beOgkw>LfHn5_^5YEcvvpVj_`yd+~vaI5N_TPc`M)dmWzg{)3xV{ zs;FBH+s%AoHo>byuGqg<672@@a8&I}0medtT&bqHf?YmFo1Dkw`tu{zw U8#`^}H1ZmrMmEhW8mk(GPpL#@*Z=?k literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ExtensionMethods.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ExtensionMethods.class new file mode 100644 index 0000000000000000000000000000000000000000..4065ea2b8102e6124408ebd15ee8a01a553dd03f GIT binary patch literal 1295 zcmZuxTT|0O6#h275-OHr6%-Jp3T@Gpig+oapfD4sf{Ifgc-pqHEToB(Y^#s_1b>77 zz!wD{oQ{wFD95vDl#6DPJ(oTEoo~-Mlb^r7eFsp+219!NgR~r9xXyD+?z&As0Y=_E z-sOhPotCjx-?JJrfe1s?f6w1BWap~Ec1H@^s0v?JOfz3&D4g{#_u~Q>(~(xo@+vD~ z@J!Y9TE?Cw>mC=5Z*a$PC6~m*H#S|l*|F^kgPxPS!q2I^NenPd?z_?!jlWW{9*bsmfsHPn_=8sglA7E({`r?5QelcG`8zOW+bil8D#1-LVL0E^nqVhRZre zafNJO0ng5v|Kk2P)dVJ0s;dmc#|;ZBoxn6hqN@^Zy=Ay~nr#?FbZ3y$aShigyKGZ; znMsXSRcFXl&khH*B;DtB+0$Ho%UnD(?3Cv` zG^Nect`=xFNsC~ObPWkSAvqYKpd=~kVQL6yRkW2<$76-BSU6@951cH>p6UmLIW;_` za1AS1C%Hv?Wny=G2N4sC!FvZwf2_ME?%_Up@n8qcM+M6}81PZ>@z96iBNiy6(>w3u F=5LvW9E1P> literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ExtensionMethods.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ExtensionMethods.kt new file mode 100644 index 000000000..4c6ac694e --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ExtensionMethods.kt @@ -0,0 +1,7 @@ +class ExtensionMethods { + fun MutableList.swap(index1: Int, index2: Int) { + val tmp = this[index1] // 'this' corresponds to the list + this[index1] = this[index2] + this[index2] = tmp + } +} \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InlineClass.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InlineClass.class new file mode 100644 index 0000000000000000000000000000000000000000..c3c2b48ae904aa003a1fb628028b6c023c3603bf GIT binary patch literal 2431 zcmah~T~ixn6n@@KLN+0UCH*3xm0H?DQW~0S{h+P=upeoG)>5eyt!%;y3t@x18^%k< z3x9%RZ@uYFFLXvJV`miG887@%j?c+1?FO*Ug!jDfdCz&?=X~tp?|**#9Y7fi3Y`_F zZadbMy6JgICwVj1Ag`?vQccHXo z`Bm4n9j|0MPQy2SyTScr!=G%{>$K7rEPpyc**`SA8z+MVI#SS(R*3tHwx`fF9$`m_ zj&rtS`xg`r4DI$Gp4O32IK15O8Bu9zZKY&8zU4Y*y;O08t7q33V~@h2+M-okzGJ%P zibacx7qV115d{w7AKUAx4EAAv8aW(Lhz$)-XOP9AG~(!G25Su5cbhf8;f~lVt96Cr zQP?nVd!&F#sy4m}eU9wu)1DBursJ@@-JNFQ2ADCw5x|Eahjy0ha?`HQTW%6Z(-;)C zxd`G=tIFqf9A~c0)m6)xR~Xro$A93CWiW(cfi5VhVI3zK(>A9JP9Y_CB@$gUy~Qhy zc`GEkXGJS?-nMJyxst&dyd!yjx2;oyn3H&q4Q+khH0xdn+g8so@sWCl6&`+|F!;JA zW(S+qy2TbuH=XSgWpGZy(QuwLP1m|A5C3lqy?io*k8n|1=#oMvLV9!u#BSE1Mp$dB zr*&KvS=MnqgSXKyjF_j>D9i2^D;a?A_-Z0NKEQ`!dRw7qJp6hlEZ>|reUlMuD{C=M z3nfc8kJZ)@a^zr8%T&#uR`_9SeITv%YH7{bT2J$*8QHX^Cn!59MXyt>KmYDx@78)* z8&#Kcxei0?(?(-2Hr3Yp^B+6ndfZ6d+-K-irpmgJ?u+-TQFY_R_pzHPqm$YU_lo;2 zag+Vso&bX00^b+cJB(z2_pKJ^!+GIXRtx}%hQDaJ3fV}@pIY`6`tLR!-(ImQ&YJDn zEcB&U6O6-1+Ek%?oO5!rxl*;!7GK5e?ToI~Z{POO(>rVX@f$~SAv6Xt5@ zmY!-f-I{gH7T|n{F};fo%c`;aC7PVfOUf^K5}BmTpa(i+h|cj;qLzUpQTPR&KXIeM z;$Yz^@`d8B==_ItV4b5Wu%n-G&XQa>g@&HmZmM8+p8eH$&hNN&)UJ>|-SE$DZ&;VVX{lXx};K4zt(E>$OsH!k5VVee%Wo&6eo6f7>)Vwfa@Hc1}K9TV5@H8W>6xN zH{0E+Wb*HAJsza5-FgC(q4kk4-jsX>#ZBDVZLY!MQyL!PE6Rs-{DggWcNVb@2b#x;%XDA<8Ahy literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InlineClass.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InlineClass.kt new file mode 100644 index 000000000..c137def4e --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InlineClass.kt @@ -0,0 +1 @@ +inline class InlineClass(val value: String) \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Interfaces.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Interfaces.kt new file mode 100644 index 000000000..d4a01df59 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Interfaces.kt @@ -0,0 +1,26 @@ +interface MyInterface { + fun bar() + + val prop: Int // abstract + + val propertyWithImplementation: String + get() = "foo" + + fun foo() { + print(prop) + } +} + +class MyInterfaceChild : MyInterface { + override val prop: Int = 29 + + override fun bar() { + // body + } +} + +interface MyInterface2 : MyInterface { + val value2 : Int + + override val prop: Int get() = 30 +} \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalClass.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClass.class similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalClass.class rename to tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClass.class diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalClass.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClass.kt similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalClass.kt rename to tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClass.kt diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalConstructor.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalConstructor.class new file mode 100644 index 0000000000000000000000000000000000000000..2e8406b540d514a42411f15921ee24e8b1772bb6 GIT binary patch literal 570 zcmZvYUuzRV6vfY--E7h|X1A%WY3u)|whyMwt5VQ_un-lh1R+n8WYK9hv#>iU_!j&q zeghvw=tBv8^h1efQ++E8_s;LknLBsx??0DU0D5>P*h;KR3#+q!ZcA4zCN3}P5J7yd zFLXE4_H+0B_&lAsIy^yb{*@O5k_dvA#u|4j@DGy1p};#h95zwMMhG8a6Ey@IP-xQN zzL-+5J-Fqu7lO^fEO(i)-M6XJQ|&Z0HNWuKqf{Xxj@O6^*@nz0O-}^<)iMrMM};b0 zEkiC9H<&uBWltT;>!`6>wu4yhsblZ@d!Sy8r} zYt!ULYNV{9Oitz=g9ukDgo6cygWOPzNsV>|KId6IlnoimYMzC%BPh-o`w`9aorK?T!V>TH?)8A?klc{%; zp^AHIsvUkH!(Yj4I*bmrQ*4~fjMbB#%Jj# zXp=T=`p^&``=Of7fwkV6Y|dPE&Tr<-%ZvEAs z0gK^L$Cs|~>~_Cvi|FAtvFQ<^XoN}R8Ri=2PNQ?o1KxG0HI*DQw1x1gU<9gfaD}uH&Hockc~jE zNop#3EuZ^=x$@dKq`r(8SG+{Tn;pkRJjJ(0`D}_#s%lh~Of3eTs>YXeL6ws#f5&1u z|L_*s9MP!b5q(^3Dxz!Hq>CEL)D+-|FpsDukIxXR;K}HFilr-Sxq=luBQKtxfrVH_ X@eC6oCPS1$EQE-U6eCp5Oo;4X065@F literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalProperty.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalProperty.kt new file mode 100644 index 000000000..45b4922b0 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalProperty.kt @@ -0,0 +1,3 @@ +class InternalProperty { + internal var city: String = "London" +} \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/META-INF/main.kotlin_module b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/META-INF/main.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..2983af70661ad375cc499ebc4da5a68ca46c532e GIT binary patch literal 16 RcmZQzU|?ooU|@t|egFVe02KfL literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MethodImplementation.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MethodImplementation.class new file mode 100644 index 0000000000000000000000000000000000000000..a046801a3206d45202df3e7f96f2fb5ba4bc10d5 GIT binary patch literal 2377 zcmaJ>-BTM?6#w1LCTx~KmeBH9TUyZ4&^8pcR{0S6C19XP5ZmI{Cah#3*~Q%r`iMUG zCv>K7jxWCSL1(mObVeh6^UZ(9aU9RNyOHprne5(s&pqdNe&=`Y-rxWJ=@$TF_*mf7 zf)$kA^||VH#j09PUEw|k2w&|J0iZ#*XS17w) zFg`UdU>pr@flAp9tOo!sNC;?wTL?Vc*&wIkOU;ndN{EAb*W1W#T0zk>ZO6}O&@>18$z!VUL6k3r=LP48ATLb)xO?3*K9xj}aB84;zogz8}k|kN6wc-*a zdCzfB6RSuNwl`I}SgRH-uLWHKy3bOqnw6R*5F5Tke0tEUqZ@rGbmA1}IU~^iZ=Q%+ ze7Hc_QaFoq>@q<3T+vWdwGwZY2<5ljpkh0@rCPCK`(Q7#Pz&Pt=XZ5luf^U%U!pk$X4sqnpyFqRo8Ig1gRei4E^5`p#Jl5q%!oH z(;$_?8?3qlGN+o7j8ciLG=VDH*Z4I?r8HPcg{cYG!#>?2O~cs#I0X+=cnvo=&07K; zjkb^yCijj~E7hGCeQ|VBjVg_; z^wf80!4B;_YWrVJ_tbaCw2YcjMwL-D)&(+ow`5jUP0!}gD88)_n5C@+b30lO9mQLs z8?0&tmUjp^S+F-8GpKn)K`*#9uVme|nNM#Nzj}-fu2JvfR3+V<$ned>ji$Kd?Wa&2wu-V!*I6$ zN3?U4a;TDrWa*NebzDML;^|Tqx>@;_r9Do3g)mu@SmrXz(F~%1K~mv1IkKP)N-R*4 zZ^($!bsAY9CB}6&qr@djNJWWI*yE~1P9lfV2;(x1OhxHCiXobqC}C@jUTXLl;cyWb zNkxuK{tV?o-!r@tcJ_dN60e>>pYE0@b^D>zTpC>_5%?sHd`k?B{08MQ`lzMKQ%p?u zo%tFq>bFp1j}cd&$ifBI$g>r(ztAJ5#h*~|KJ#K}1YW0iFD5Y+WzEtkMH9cu{ezw< zcvJFap{7|Vql0hJC~lBOE;r7nF+5iXrN*On3(VkV6maC=-wtD%PA~c0!QIIF&|x3h z!|ZYQ7(Sr0?l=o7#keS`CBh|S?``Ojmav09wNJuHzG@2o-iSVmzDr+s97 ltjK?>kDQND9~XQK`skF#t3J;9IOpR|!)?ZgCg*7%#y>JVx~u>I literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MethodImplementation.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MethodImplementation.kt new file mode 100644 index 000000000..5e216da38 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MethodImplementation.kt @@ -0,0 +1,7 @@ +public inline class MethodImplementation constructor(@PublishedApi internal val data: Short) : Comparable { + public override fun toString(): String = "woof" + + override operator fun compareTo(other: Short): Int { + return 0; + } +} \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface$DefaultImpls.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface$DefaultImpls.class new file mode 100644 index 0000000000000000000000000000000000000000..e8c60b1dcd59a9c35f9d5eb68037f70bbd35a0ca GIT binary patch literal 949 zcmZWoTTc@~6#j+++ir`cTogpK2ufR!wLJJB8bi1w8x|zi)CZrYWm=}}&XC<%BL7N# zFwqBpfIrH3c3Y&?WOL4Z=bZV@ZT8piA3p(Xqt38!eC;YD!VYhXwSCdyv2Wbq(vK`K zhUp%^;*QT%*LmCOiMFwjVOZ`8a~kSP5t{1{(wrypA`r@OBeh~!sdz)IJ5}$NrC~y; zx;qT3o({WCPncH7rHUM`li7{)7ZwOPOt9@w~#WrmV>p^Yz^wq!K4_&=TQ$-tx&Z>^W9vGM2#mdM) zxavwqlI**;gQrxkQX<^*c@znnw%yQi*cOK}p_}W2ebI`$2cL{kQM&BK0b%n$I@B?S zaq0u4bC|#+=_;XTpvFjNW^$iXXN}}!YO=6F=R)5N8+k&T1FuCohivLiXx9!qPW9{6fYtB&0U!L{1aYEpcf;JWiD)UYa_+hjlDsE4^8PLz*{^cTeq+ zVcSRP`s`Yxd~-UqH_G+$Xw=XH9Qmc}nrGKn>zmszUe@i}fsN;sW}VVMqCUzWk#Vt- Qevh$wgVtO;!BY}{0L?PpQ~&?~ literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface.class new file mode 100644 index 0000000000000000000000000000000000000000..cecdbcd327c2a2f293041678b7d017078cae0109 GIT binary patch literal 744 zcmZ`$O>fgc5PfSqj^ljPEukbSg+dEzFSz7{#0h~AMrlE*R4V1PNjIqzXC1toNWJA( z@B=vTBRHTaM}8DyY*HEtA+2WKyq%fddGqtv_a6Y7c*0OTxelZjNuT#b9*n^o@)`Fd zE(iXH?ojk}9wvj?+$*YFl|myY2%uHl&E zD=Tjh?euGldDA#%?;X!=7{|qTPYIPWwB6qF3_|9`@|(5%YTFIVvAkTn>e;NhVVxb^lYRwkGbu8`0;}NT&*_Ja!pM>kO^p?+Vqkk!ILwPo)mW zB9OCCh22QJx)qU%11UxFI^s$R+M|0GPm`W_8%BbmzN$R`r_QGT!y**{%VNmECcsdD zoB1M2G}$A%waJ$=u9D`E@{h^7#6F-74^hWH#Rm3pK)yr#26gi~FavC6XA5_3qH2J< j*d`YDC{v+^dIx0%N1>sxli7lTt8hQVMTL?=F2j}Is3)eT literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface2$DefaultImpls.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface2$DefaultImpls.class new file mode 100644 index 0000000000000000000000000000000000000000..66bbbb170e8fd9244cbff7b91cffb8ef1ac95db3 GIT binary patch literal 866 zcmZ`$T~8B16g{^KZYhNp@Pmq=Kn04?jeYHt!I*5aR3oN7_%vIlW!miw*_~~|fAT@! zj1R_Vf0XfVsj?KzZtl!Ech3F%_51q|08Kn2)Q&HFZDrgOUD>R^mOYV1)*qcmi3=iB z2VyL|Na()zHXO*Vb>R@)zO?URb52+}2=W114WBSyw`VFLEMIpKHm5Qf+l!CNo@Hs| zNNOvrGMcb68!WiWeqv*#`z^w5VB)?vkT#5k(upUuHkSbsuWf8QjUs-vn5)V~nXsNC zX4+gPY+uXVYTQg*#saD(RIoyDddA$+dWXj~6Q@(g8t!GX`z#2C#zsne$I^;ZVFlM& z7>ylX1!bnfFq}YSkmpQ8LOEA>)5Q~J@>?P-{o7yiVrU6-N9I%#DuL3nosL2oe-L5B z%xYk|BI<}(Wq3+%yic`NBkAk0N)+?2uI9<9e63}C6p18}ywTE$N#m}3qq1~y145nAb3Q3!t6QJ>DBvmE%n8)6$F_XwhKnMj1^!C>DwFO_rNzUa zSo((5FU(O+Q=Dq{na?6FPV{TI%lBLK55E3K@8EzvB~}%%jUBG5!MK239P+u({5m&P V`vk|w!^yvaM}N_#k1afA^9L?y!chPK literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface2.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface2.class new file mode 100644 index 0000000000000000000000000000000000000000..3f77774fc9c5fe7e586ef0fadb163861dc404652 GIT binary patch literal 554 zcmYjN%WB&|6g_t&ONyL_;-;zXKGK#f(oLOe73iuY6a+RcE|`EfVaP9Zh5cb<8Y5bAkv-0aapAin*liX&h zZgrHEBWWd1#dPVg87j&F!@(A!fcz~@m>PW`bk?g{DC%N+*Q-!OK_~(@7}wXUSe#S$ zC=yL^?p*Y)H$UCYFVAbbfg4r2wa6>@>&@>+){oe}7_slYvQ_rt&bBr|@Rkp&HOkAJ zUa7HMWHy=3GUMYp$5&?f!T(vB_Y=$GL~Av_%%m}jqY1y|i}_G}PBTSlbQjvDQ`JjN zI>^)~t#d1Fnrq{+J-CGn4neq_AOe7Uwdfqp3D=P4FIe{y4ZJRNc!f9I+syBxg1tVR o1pC`_fann&CaB>FvpDL544&e+kH8=_cxF&HXc$yY!88s0f9Z;IV*mgE literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterfaceChild.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterfaceChild.class new file mode 100644 index 0000000000000000000000000000000000000000..34521a36421a3b59ceff197a97419e00cbc31e20 GIT binary patch literal 1136 zcmZuvT~8B16g{*3*k#+owtQH?st9UZl?D7r48}wu#+m{KOf}(Y+74x5yGwSaB)st} z`~g1upovD}gK2p5M;Y(7g%%{)ojdo=Ip^NFbN~GP^&7wvo-$Z#Mn+zMRCb`AxmB^lTdoQd zNF7;*nfzeA%U9${VjNQ@CNa&Bx&Wpd?f5>m@{&d+i5s{XQf@J%%lp1^9nW49ir2Z~ zRFc*_4BN@VWrW;n$3^JU8?b!})fXAo+Q(T_%WB=W<p05dDW#zrtH_aTj7Bd`n}-vX3JAfQ-UL*?$HGbIWf9 zHSyXB`I9|pW79Q#At6KLF)oVY_fC>#ERdM`qF_c(i#$} zn>6x3vJ1d4`Qe2vq-hPw_d7ntzR^abtY^g00U|pm(unqm&j=kRNECl!tZ3zaAk~*J z=@3MUUdW#~ml?+dAubkwg6m%|)i69zLyX8dI)6lec(rR}8I9FhJ^e16V5VP5w+mMZ zX?Wa8H;*S|H%RO@HFkCzkrL)Q-yPgN^X`?9M}eX!Zi7i`+k9(*R(=*jWj-0fmI%Du0 z99BZ`!EeHg0E1UONteMWP0S|*i{-ofe7SHzFjsF+>tdyrqll!hEhQR433BpI-$N@f z9U??)V+u`aBx{k>$S~}U2Bygq+~iS0qk-}L%oC$QmLIe8fWg0B{5;CFH_HGM9Dxw# zUAM!K}+ zp@{*(ak)W!R=iKGv@iSt{xC%HD)ojn-Gt$P6OL`tIM%U4_bFw=w84B8o+2XS6Gd#s Y;zcZAkyI>I!CWk3g;Fj|7YP^sKkq492LJ#7 literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Object.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Object.kt new file mode 100644 index 000000000..fe0184116 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Object.kt @@ -0,0 +1 @@ +object Object { } \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ParameterName.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ParameterName.class new file mode 100644 index 0000000000000000000000000000000000000000..0927cd7dffe6a55cbec8db6b27aec4cca2710f96 GIT binary patch literal 391 zcmY*UO;5r=5Ph>P1*^!SsK5^}dJ$~m$&(ji4SqxuE}Rxvb!}-AcHzwL@?bdoqm0uU z4zFc50@a;=Y)#Jibi@G+0hbi9+%bO1Lz; zBwTIQtx&W@DCA}xatJB@s8)MzZ`P6M)18!}EBam(NT0cKds+-f#M>dad|f2$D16D6 zi>V%%l;7w)vr9AABV)}Z)i+s|JLOEC*?^b8XFI&c=YJ4zCeSYN1Rdr9AK2y2-WXnt hdKvp@{3{uwi36_Ua163&;b@G&qGoYyQ7LhU@fX9BOiTa( literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ParameterName.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ParameterName.kt new file mode 100644 index 000000000..43fbf79dc --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ParameterName.kt @@ -0,0 +1,3 @@ +interface ParameterName { + fun take(count: Int) +} \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PrivateClass.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PrivateClass.class similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PrivateClass.class rename to tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PrivateClass.class diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PrivateClass.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PrivateClass.kt similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PrivateClass.kt rename to tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PrivateClass.kt diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PublicClass$ProtectedClass.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PublicClass$ProtectedClass.class similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PublicClass$ProtectedClass.class rename to tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PublicClass$ProtectedClass.class diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PublicClass.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PublicClass.class similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PublicClass.class rename to tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PublicClass.class diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PublicClass.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PublicClass.kt similarity index 100% rename from src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/PublicClass.kt rename to tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/PublicClass.kt diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/RenameExtensionParameter.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/RenameExtensionParameter.kt new file mode 100644 index 000000000..70f80bd1d --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/RenameExtensionParameter.kt @@ -0,0 +1 @@ +internal fun ByteArray.toUtf8String(): String = String(this, Charsets.UTF_8) \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/RenameExtensionParameterKt.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/RenameExtensionParameterKt.class new file mode 100644 index 0000000000000000000000000000000000000000..00542d8f5710949c2a27543cb8e8410237b41c8b GIT binary patch literal 1073 zcmaJ=T~8B16g{&A3S)&*`H-Ser3w^fDZUU96Fy_Zf`kHz>4TXrW0`h4o9s>-9(>>@ z8DBJ-7@qx6#=C9#(m*nIXU@HM?mcs6_V=G3zW^-a6+?PoYEhS)r$*{f`Fc+T1dR-~ zO&p9NSrtuTdqP+2_vNZ|$s1!x82`|GS}K}A=?cThOlfV_xyo$&ml>uUKd9JMY0806 zI<$q>z7dA{g!Zm)b{n2YS*ff!QDOFa&0h2}Ow@eiDQ#Dqbz5oTq=jb}bksCdZWsq= z7pNrf04(YI9${=IL;pJxU;f`yBVs&oI>KXymD}*H1(cN<)2;4BdwZ zTOXH5uXYKoeA{iuFY=ZXNZ~;r1~GI)wsxa9Mi_eDD6Py}hDj3a_CgV-hZy4+MVi4X ztuYKb9cDYyh+|;{$!67?F}g+;eFg}YTM!YXD`K^1VUhnhPg0(raZY9>`^i%2MDqMB zZ7r~zwP3wFKZ~*!8P&r0ZSP^eW*EBG{bR{6;3zG38}+gb4n)}_Ps;IK;T?%UMY!V} z-*0H6>aw7lDpcfOy}Eve?7z{=OT3ZBi+&?;<(7)t47I_AEH^5bPnKb?Pp@ z&9n=>ctrC&Srm=aY?H-F_ZEm@fuMyP5dc0HcUJfK9m?|U)=THPV&-DC#pg2l%w2nK zi)|a8b9jC#|2ofeo1Ff0V1;-+rsGeP5G!D^H8OZ|fu0sHg=_)O@Vo>TVj43P3eg>6 Gmd0NPuNII1 literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SealedClass.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SealedClass.class new file mode 100644 index 0000000000000000000000000000000000000000..0a0ff0789666144f9c7899128ae5d6505c40c2d7 GIT binary patch literal 455 zcmYjMIZpyX6#iy_U0gs8FYqX|QVUlpY&;SrF(Fws5ko^YuoE3vb`xfx=C}9{tV}En zvGhk7-=HQ;ChxuP$UDBi-#-A+d&LacILmDna+B_@GPzVBSR+Zp(^%JVegGZVRUQBU literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SealedClass.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SealedClass.kt new file mode 100644 index 000000000..5fdb470d1 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SealedClass.kt @@ -0,0 +1 @@ +sealed class SealedClass \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SetterParameterName.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SetterParameterName.class new file mode 100644 index 0000000000000000000000000000000000000000..43822c9671efabc6c40b8686c1070a8c014f1c77 GIT binary patch literal 641 zcmZuuO>5gg5Ph?jB}FNY;>4-r^ozEK7hTOhhlQfj|v@$q#x6s{E_WWuSl zX1lW_VU=TlXhUek4@~D{&)iID?5_?vIAg^zOWu5VPpGd72%GUFvx!cl&&tYkX(cxm z(|LtmQ?YF@9F!0RWMed8>iiwyc)6$tqA3CqE*AkW5!M3XJO20Pa?uutblMC>OB`0d zUHq^2N^s@vk%{3&0yD{Rqj;-*B~%h{|6Jt Bn4bUu literal 0 HcmV?d00001 diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SetterParameterName.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SetterParameterName.kt new file mode 100644 index 000000000..7b261cd7b --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SetterParameterName.kt @@ -0,0 +1,3 @@ +interface SetterParameterName { + var city: String +} \ No newline at end of file diff --git a/tools/generator/Tests/Integration-Tests/AccessModifiers.cs b/tests/generator-Tests/Integration-Tests/AccessModifiers.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/AccessModifiers.cs rename to tests/generator-Tests/Integration-Tests/AccessModifiers.cs diff --git a/tools/generator/Tests/Integration-Tests/Adapters.cs b/tests/generator-Tests/Integration-Tests/Adapters.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Adapters.cs rename to tests/generator-Tests/Integration-Tests/Adapters.cs diff --git a/tools/generator/Tests/Integration-Tests/Android_Graphics_Color.cs b/tests/generator-Tests/Integration-Tests/Android_Graphics_Color.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Android_Graphics_Color.cs rename to tests/generator-Tests/Integration-Tests/Android_Graphics_Color.cs diff --git a/tools/generator/Tests/Integration-Tests/Arrays.cs b/tests/generator-Tests/Integration-Tests/Arrays.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Arrays.cs rename to tests/generator-Tests/Integration-Tests/Arrays.cs diff --git a/tools/generator/Tests/Integration-Tests/BaseGeneratorTest.cs b/tests/generator-Tests/Integration-Tests/BaseGeneratorTest.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/BaseGeneratorTest.cs rename to tests/generator-Tests/Integration-Tests/BaseGeneratorTest.cs diff --git a/tools/generator/Tests/Integration-Tests/CSharpKeywords.cs b/tests/generator-Tests/Integration-Tests/CSharpKeywords.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/CSharpKeywords.cs rename to tests/generator-Tests/Integration-Tests/CSharpKeywords.cs diff --git a/tools/generator/Tests/Integration-Tests/Compiler.cs b/tests/generator-Tests/Integration-Tests/Compiler.cs similarity index 96% rename from tools/generator/Tests/Integration-Tests/Compiler.cs rename to tests/generator-Tests/Integration-Tests/Compiler.cs index 6485c9430..2ce29d920 100644 --- a/tools/generator/Tests/Integration-Tests/Compiler.cs +++ b/tests/generator-Tests/Integration-Tests/Compiler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Reflection; using System.CodeDom.Compiler; using System.IO; @@ -21,7 +21,7 @@ static CodeDomProvider GetCodeDomProvider () // Comments on this here: https://stackoverflow.com/a/40311406/132442 // They added an environment variable as a workaround: https://github.com/aspnet/RoslynCodeDomProvider/pull/12 if (string.IsNullOrEmpty (Environment.GetEnvironmentVariable (RoslynEnvironmentVariable, EnvironmentVariableTarget.Process))) { - string roslynPath = Path.GetFullPath (Path.Combine (unitTestFrameworkAssemblyPath, "..", "..", "..", "packages", "Microsoft.Net.Compilers.2.1.0", "tools")); + string roslynPath = Path.GetFullPath (Path.Combine (unitTestFrameworkAssemblyPath, "..", "..", "..", "packages", "microsoft.codedom.providers.dotnetcompilerplatform", "2.0.1", "tools", "RoslynLatest")); Environment.SetEnvironmentVariable (RoslynEnvironmentVariable, roslynPath, EnvironmentVariableTarget.Process); } diff --git a/tools/generator/Tests/Integration-Tests/Constructors.cs b/tests/generator-Tests/Integration-Tests/Constructors.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Constructors.cs rename to tests/generator-Tests/Integration-Tests/Constructors.cs diff --git a/tools/generator/Tests/Integration-Tests/Enumerations.cs b/tests/generator-Tests/Integration-Tests/Enumerations.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Enumerations.cs rename to tests/generator-Tests/Integration-Tests/Enumerations.cs diff --git a/tools/generator/Tests/Integration-Tests/GenericArguments.cs b/tests/generator-Tests/Integration-Tests/GenericArguments.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/GenericArguments.cs rename to tests/generator-Tests/Integration-Tests/GenericArguments.cs diff --git a/tools/generator/Tests/Integration-Tests/InterfaceMethodsConflict.cs b/tests/generator-Tests/Integration-Tests/InterfaceMethodsConflict.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/InterfaceMethodsConflict.cs rename to tests/generator-Tests/Integration-Tests/InterfaceMethodsConflict.cs diff --git a/tools/generator/Tests/Integration-Tests/Interfaces.cs b/tests/generator-Tests/Integration-Tests/Interfaces.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Interfaces.cs rename to tests/generator-Tests/Integration-Tests/Interfaces.cs diff --git a/tools/generator/Tests/Integration-Tests/Java_Lang_Enum.cs b/tests/generator-Tests/Integration-Tests/Java_Lang_Enum.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Java_Lang_Enum.cs rename to tests/generator-Tests/Integration-Tests/Java_Lang_Enum.cs diff --git a/tools/generator/Tests/Integration-Tests/Java_Lang_Object.cs b/tests/generator-Tests/Integration-Tests/Java_Lang_Object.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Java_Lang_Object.cs rename to tests/generator-Tests/Integration-Tests/Java_Lang_Object.cs diff --git a/tools/generator/Tests/Integration-Tests/Java_Util_List.cs b/tests/generator-Tests/Integration-Tests/Java_Util_List.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Java_Util_List.cs rename to tests/generator-Tests/Integration-Tests/Java_Util_List.cs diff --git a/tools/generator/Tests/Integration-Tests/NestedTypes.cs b/tests/generator-Tests/Integration-Tests/NestedTypes.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/NestedTypes.cs rename to tests/generator-Tests/Integration-Tests/NestedTypes.cs diff --git a/tools/generator/Tests/Integration-Tests/NonStaticFields.cs b/tests/generator-Tests/Integration-Tests/NonStaticFields.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/NonStaticFields.cs rename to tests/generator-Tests/Integration-Tests/NonStaticFields.cs diff --git a/tools/generator/Tests/Integration-Tests/NormalMethods.cs b/tests/generator-Tests/Integration-Tests/NormalMethods.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/NormalMethods.cs rename to tests/generator-Tests/Integration-Tests/NormalMethods.cs diff --git a/tools/generator/Tests/Integration-Tests/NormalProperties.cs b/tests/generator-Tests/Integration-Tests/NormalProperties.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/NormalProperties.cs rename to tests/generator-Tests/Integration-Tests/NormalProperties.cs diff --git a/tools/generator/Tests/Integration-Tests/PamareterXPath.cs b/tests/generator-Tests/Integration-Tests/PamareterXPath.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/PamareterXPath.cs rename to tests/generator-Tests/Integration-Tests/PamareterXPath.cs diff --git a/tools/generator/Tests/Integration-Tests/StaticFields.cs b/tests/generator-Tests/Integration-Tests/StaticFields.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/StaticFields.cs rename to tests/generator-Tests/Integration-Tests/StaticFields.cs diff --git a/tools/generator/Tests/Integration-Tests/StaticMethods.cs b/tests/generator-Tests/Integration-Tests/StaticMethods.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/StaticMethods.cs rename to tests/generator-Tests/Integration-Tests/StaticMethods.cs diff --git a/tools/generator/Tests/Integration-Tests/StaticProperties.cs b/tests/generator-Tests/Integration-Tests/StaticProperties.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/StaticProperties.cs rename to tests/generator-Tests/Integration-Tests/StaticProperties.cs diff --git a/tools/generator/Tests/Integration-Tests/Streams.cs b/tests/generator-Tests/Integration-Tests/Streams.cs similarity index 100% rename from tools/generator/Tests/Integration-Tests/Streams.cs rename to tests/generator-Tests/Integration-Tests/Streams.cs diff --git a/tools/generator/Tests/README.md b/tests/generator-Tests/README.md similarity index 100% rename from tools/generator/Tests/README.md rename to tests/generator-Tests/README.md diff --git a/tools/generator/Tests/SupportFiles/Android_Runtime_CharSequence.cs b/tests/generator-Tests/SupportFiles/Android_Runtime_CharSequence.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/Android_Runtime_CharSequence.cs rename to tests/generator-Tests/SupportFiles/Android_Runtime_CharSequence.cs diff --git a/tools/generator/Tests/SupportFiles/GeneratedEnumAttribute.cs b/tests/generator-Tests/SupportFiles/GeneratedEnumAttribute.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/GeneratedEnumAttribute.cs rename to tests/generator-Tests/SupportFiles/GeneratedEnumAttribute.cs diff --git a/tools/generator/Tests/SupportFiles/IJavaObject.cs b/tests/generator-Tests/SupportFiles/IJavaObject.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/IJavaObject.cs rename to tests/generator-Tests/SupportFiles/IJavaObject.cs diff --git a/tools/generator/Tests/SupportFiles/IntDefinitionAttribute.cs b/tests/generator-Tests/SupportFiles/IntDefinitionAttribute.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/IntDefinitionAttribute.cs rename to tests/generator-Tests/SupportFiles/IntDefinitionAttribute.cs diff --git a/tools/generator/Tests/SupportFiles/JNIEnv.cs b/tests/generator-Tests/SupportFiles/JNIEnv.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JNIEnv.cs rename to tests/generator-Tests/SupportFiles/JNIEnv.cs diff --git a/tools/generator/Tests/SupportFiles/JNIEnv.g.cs b/tests/generator-Tests/SupportFiles/JNIEnv.g.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JNIEnv.g.cs rename to tests/generator-Tests/SupportFiles/JNIEnv.g.cs diff --git a/tools/generator/Tests/SupportFiles/JObjectRefType.cs b/tests/generator-Tests/SupportFiles/JObjectRefType.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JObjectRefType.cs rename to tests/generator-Tests/SupportFiles/JObjectRefType.cs diff --git a/tools/generator/Tests/SupportFiles/JValue.cs b/tests/generator-Tests/SupportFiles/JValue.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JValue.cs rename to tests/generator-Tests/SupportFiles/JValue.cs diff --git a/tools/generator/Tests/SupportFiles/JavaArray.cs b/tests/generator-Tests/SupportFiles/JavaArray.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JavaArray.cs rename to tests/generator-Tests/SupportFiles/JavaArray.cs diff --git a/tools/generator/Tests/SupportFiles/JavaCollection.cs b/tests/generator-Tests/SupportFiles/JavaCollection.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JavaCollection.cs rename to tests/generator-Tests/SupportFiles/JavaCollection.cs diff --git a/tools/generator/Tests/SupportFiles/JavaConvert.cs b/tests/generator-Tests/SupportFiles/JavaConvert.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JavaConvert.cs rename to tests/generator-Tests/SupportFiles/JavaConvert.cs diff --git a/tools/generator/Tests/SupportFiles/JavaDictionary.cs b/tests/generator-Tests/SupportFiles/JavaDictionary.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JavaDictionary.cs rename to tests/generator-Tests/SupportFiles/JavaDictionary.cs diff --git a/tools/generator/Tests/SupportFiles/JavaInterfaceDefaultMethodAttribute.cs b/tests/generator-Tests/SupportFiles/JavaInterfaceDefaultMethodAttribute.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JavaInterfaceDefaultMethodAttribute.cs rename to tests/generator-Tests/SupportFiles/JavaInterfaceDefaultMethodAttribute.cs diff --git a/tools/generator/Tests/SupportFiles/JavaObject.cs b/tests/generator-Tests/SupportFiles/JavaObject.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JavaObject.cs rename to tests/generator-Tests/SupportFiles/JavaObject.cs diff --git a/tools/generator/Tests/SupportFiles/JavaObjectExtensions.cs b/tests/generator-Tests/SupportFiles/JavaObjectExtensions.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JavaObjectExtensions.cs rename to tests/generator-Tests/SupportFiles/JavaObjectExtensions.cs diff --git a/tools/generator/Tests/SupportFiles/JavaTypeParametersAttribute.cs b/tests/generator-Tests/SupportFiles/JavaTypeParametersAttribute.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JavaTypeParametersAttribute.cs rename to tests/generator-Tests/SupportFiles/JavaTypeParametersAttribute.cs diff --git a/tools/generator/Tests/SupportFiles/Java_Lang_ICharSequence.cs b/tests/generator-Tests/SupportFiles/Java_Lang_ICharSequence.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/Java_Lang_ICharSequence.cs rename to tests/generator-Tests/SupportFiles/Java_Lang_ICharSequence.cs diff --git a/tools/generator/Tests/SupportFiles/Java_Lang_Object.cs b/tests/generator-Tests/SupportFiles/Java_Lang_Object.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/Java_Lang_Object.cs rename to tests/generator-Tests/SupportFiles/Java_Lang_Object.cs diff --git a/tools/generator/Tests/SupportFiles/Java_Lang_String.cs b/tests/generator-Tests/SupportFiles/Java_Lang_String.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/Java_Lang_String.cs rename to tests/generator-Tests/SupportFiles/Java_Lang_String.cs diff --git a/tools/generator/Tests/SupportFiles/Java_Lang_Throwable.cs b/tests/generator-Tests/SupportFiles/Java_Lang_Throwable.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/Java_Lang_Throwable.cs rename to tests/generator-Tests/SupportFiles/Java_Lang_Throwable.cs diff --git a/tools/generator/Tests/SupportFiles/JniHandleOwnership.cs b/tests/generator-Tests/SupportFiles/JniHandleOwnership.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/JniHandleOwnership.cs rename to tests/generator-Tests/SupportFiles/JniHandleOwnership.cs diff --git a/tools/generator/Tests/SupportFiles/NamespaceMappingAttribute.cs b/tests/generator-Tests/SupportFiles/NamespaceMappingAttribute.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/NamespaceMappingAttribute.cs rename to tests/generator-Tests/SupportFiles/NamespaceMappingAttribute.cs diff --git a/tools/generator/Tests/SupportFiles/PreserveAttribute.cs b/tests/generator-Tests/SupportFiles/PreserveAttribute.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/PreserveAttribute.cs rename to tests/generator-Tests/SupportFiles/PreserveAttribute.cs diff --git a/tools/generator/Tests/SupportFiles/RegisterAttribute.cs b/tests/generator-Tests/SupportFiles/RegisterAttribute.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/RegisterAttribute.cs rename to tests/generator-Tests/SupportFiles/RegisterAttribute.cs diff --git a/tools/generator/Tests/SupportFiles/TypeManager.cs b/tests/generator-Tests/SupportFiles/TypeManager.cs similarity index 100% rename from tools/generator/Tests/SupportFiles/TypeManager.cs rename to tests/generator-Tests/SupportFiles/TypeManager.cs diff --git a/tools/generator/Tests-Core/.gitignore b/tests/generator-Tests/Tests-Core/.gitignore similarity index 100% rename from tools/generator/Tests-Core/.gitignore rename to tests/generator-Tests/Tests-Core/.gitignore diff --git a/tools/generator/Tests-Core/api-cp.xml b/tests/generator-Tests/Tests-Core/api-cp.xml similarity index 100% rename from tools/generator/Tests-Core/api-cp.xml rename to tests/generator-Tests/Tests-Core/api-cp.xml diff --git a/tools/generator/Tests-Core/api.xml b/tests/generator-Tests/Tests-Core/api.xml similarity index 100% rename from tools/generator/Tests-Core/api.xml rename to tests/generator-Tests/Tests-Core/api.xml diff --git a/tools/generator/Tests-Core/expected.cp/GeneratedFiles.projitems b/tests/generator-Tests/Tests-Core/expected.cp/GeneratedFiles.projitems similarity index 100% rename from tools/generator/Tests-Core/expected.cp/GeneratedFiles.projitems rename to tests/generator-Tests/Tests-Core/expected.cp/GeneratedFiles.projitems diff --git a/tools/generator/Tests-Core/expected.cp/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/Tests-Core/expected.cp/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests-Core/expected.cp/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/Tests-Core/expected.cp/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests-Core/expected.cp/Java.Lang.Object.cs b/tests/generator-Tests/Tests-Core/expected.cp/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests-Core/expected.cp/Java.Lang.Object.cs rename to tests/generator-Tests/Tests-Core/expected.cp/Java.Lang.Object.cs diff --git a/tools/generator/Tests-Core/expected.cp/Java.Lang.String.cs b/tests/generator-Tests/Tests-Core/expected.cp/Java.Lang.String.cs similarity index 100% rename from tools/generator/Tests-Core/expected.cp/Java.Lang.String.cs rename to tests/generator-Tests/Tests-Core/expected.cp/Java.Lang.String.cs diff --git a/tools/generator/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.In.cs b/tests/generator-Tests/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.In.cs similarity index 100% rename from tools/generator/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.In.cs rename to tests/generator-Tests/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.In.cs diff --git a/tools/generator/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.InvalidNameMembers.cs b/tests/generator-Tests/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.InvalidNameMembers.cs similarity index 100% rename from tools/generator/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.InvalidNameMembers.cs rename to tests/generator-Tests/Tests-Core/expected.cp/Xamarin.Test.Invalidnames.InvalidNameMembers.cs diff --git a/tools/generator/Tests-Core/expected.cp/__NamespaceMapping__.cs b/tests/generator-Tests/Tests-Core/expected.cp/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests-Core/expected.cp/__NamespaceMapping__.cs rename to tests/generator-Tests/Tests-Core/expected.cp/__NamespaceMapping__.cs diff --git a/tools/generator/Tests-Core/expected.cp/enumlist b/tests/generator-Tests/Tests-Core/expected.cp/enumlist similarity index 100% rename from tools/generator/Tests-Core/expected.cp/enumlist rename to tests/generator-Tests/Tests-Core/expected.cp/enumlist diff --git a/tools/generator/Tests-Core/expected.ji/Android.Text.ISpannable.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/Android.Text.ISpannable.cs rename to tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs diff --git a/tools/generator/Tests-Core/expected.ji/Android.Text.ISpanned.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/Android.Text.ISpanned.cs rename to tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs diff --git a/tools/generator/Tests-Core/expected.ji/Android.Text.SpanTypes.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpanTypes.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/Android.Text.SpanTypes.cs rename to tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpanTypes.cs diff --git a/tools/generator/Tests-Core/expected.ji/Android.Text.SpannableString.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/Android.Text.SpannableString.cs rename to tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs diff --git a/tools/generator/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs rename to tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs diff --git a/tools/generator/Tests-Core/expected.ji/Android.Views.View.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/Android.Views.View.cs rename to tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs diff --git a/tools/generator/Tests-Core/expected.ji/GeneratedFiles.projitems b/tests/generator-Tests/Tests-Core/expected.ji/GeneratedFiles.projitems similarity index 100% rename from tools/generator/Tests-Core/expected.ji/GeneratedFiles.projitems rename to tests/generator-Tests/Tests-Core/expected.ji/GeneratedFiles.projitems diff --git a/tools/generator/Tests-Core/expected.ji/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/Tests-Core/expected.ji/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/Tests-Core/expected.ji/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests-Core/expected.ji/Java.Lang.Object.cs b/tests/generator-Tests/Tests-Core/expected.ji/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/Java.Lang.Object.cs rename to tests/generator-Tests/Tests-Core/expected.ji/Java.Lang.Object.cs diff --git a/tools/generator/Tests-Core/expected.ji/__NamespaceMapping__.cs b/tests/generator-Tests/Tests-Core/expected.ji/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests-Core/expected.ji/__NamespaceMapping__.cs rename to tests/generator-Tests/Tests-Core/expected.ji/__NamespaceMapping__.cs diff --git a/tools/generator/Tests-Core/expected.ji/enumlist b/tests/generator-Tests/Tests-Core/expected.ji/enumlist similarity index 100% rename from tools/generator/Tests-Core/expected.ji/enumlist rename to tests/generator-Tests/Tests-Core/expected.ji/enumlist diff --git a/tools/generator/Tests-Core/expected/Android.Text.ISpannable.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpannable.cs similarity index 100% rename from tools/generator/Tests-Core/expected/Android.Text.ISpannable.cs rename to tests/generator-Tests/Tests-Core/expected/Android.Text.ISpannable.cs diff --git a/tools/generator/Tests-Core/expected/Android.Text.ISpanned.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.ISpanned.cs similarity index 100% rename from tools/generator/Tests-Core/expected/Android.Text.ISpanned.cs rename to tests/generator-Tests/Tests-Core/expected/Android.Text.ISpanned.cs diff --git a/tools/generator/Tests-Core/expected/Android.Text.SpanTypes.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.SpanTypes.cs similarity index 100% rename from tools/generator/Tests-Core/expected/Android.Text.SpanTypes.cs rename to tests/generator-Tests/Tests-Core/expected/Android.Text.SpanTypes.cs diff --git a/tools/generator/Tests-Core/expected/Android.Text.SpannableString.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableString.cs similarity index 100% rename from tools/generator/Tests-Core/expected/Android.Text.SpannableString.cs rename to tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableString.cs diff --git a/tools/generator/Tests-Core/expected/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableStringInternal.cs similarity index 100% rename from tools/generator/Tests-Core/expected/Android.Text.SpannableStringInternal.cs rename to tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableStringInternal.cs diff --git a/tools/generator/Tests-Core/expected/Android.Views.View.cs b/tests/generator-Tests/Tests-Core/expected/Android.Views.View.cs similarity index 100% rename from tools/generator/Tests-Core/expected/Android.Views.View.cs rename to tests/generator-Tests/Tests-Core/expected/Android.Views.View.cs diff --git a/tools/generator/Tests-Core/expected/GeneratedFiles.projitems b/tests/generator-Tests/Tests-Core/expected/GeneratedFiles.projitems similarity index 100% rename from tools/generator/Tests-Core/expected/GeneratedFiles.projitems rename to tests/generator-Tests/Tests-Core/expected/GeneratedFiles.projitems diff --git a/tools/generator/Tests-Core/expected/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/Tests-Core/expected/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests-Core/expected/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/Tests-Core/expected/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests-Core/expected/Java.Lang.Object.cs b/tests/generator-Tests/Tests-Core/expected/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests-Core/expected/Java.Lang.Object.cs rename to tests/generator-Tests/Tests-Core/expected/Java.Lang.Object.cs diff --git a/tools/generator/Tests-Core/expected/__NamespaceMapping__.cs b/tests/generator-Tests/Tests-Core/expected/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests-Core/expected/__NamespaceMapping__.cs rename to tests/generator-Tests/Tests-Core/expected/__NamespaceMapping__.cs diff --git a/tools/generator/Tests-Core/expected/enumlist b/tests/generator-Tests/Tests-Core/expected/enumlist similarity index 100% rename from tools/generator/Tests-Core/expected/enumlist rename to tests/generator-Tests/Tests-Core/expected/enumlist diff --git a/tools/generator/Tests-Core/fields-cp.xml b/tests/generator-Tests/Tests-Core/fields-cp.xml similarity index 100% rename from tools/generator/Tests-Core/fields-cp.xml rename to tests/generator-Tests/Tests-Core/fields-cp.xml diff --git a/tools/generator/Tests-Core/fields.xml b/tests/generator-Tests/Tests-Core/fields.xml similarity index 100% rename from tools/generator/Tests-Core/fields.xml rename to tests/generator-Tests/Tests-Core/fields.xml diff --git a/tools/generator/Tests-Core/methods-cp.xml b/tests/generator-Tests/Tests-Core/methods-cp.xml similarity index 100% rename from tools/generator/Tests-Core/methods-cp.xml rename to tests/generator-Tests/Tests-Core/methods-cp.xml diff --git a/tools/generator/Tests-Core/methods.xml b/tests/generator-Tests/Tests-Core/methods.xml similarity index 100% rename from tools/generator/Tests-Core/methods.xml rename to tests/generator-Tests/Tests-Core/methods.xml diff --git a/tools/generator/Tests/Unit-Tests/AdjusterTests.cs b/tests/generator-Tests/Unit-Tests/AdjusterTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/AdjusterTests.cs rename to tests/generator-Tests/Unit-Tests/AdjusterTests.cs diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteCharSequenceEnumerator.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteCharSequenceEnumerator.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteCharSequenceEnumerator.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteCharSequenceEnumerator.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteClassAbstractMembers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteClassAbstractMembers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteClassAbstractMembers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteClassAbstractMembers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventArgs.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventArgs.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventArgs.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandler.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandler.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandler.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandler.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImpl.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImpl.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImpl.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImpl.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImplContent.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImplContent.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImplContent.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceEventHandlerImplContent.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionMethods.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionMethods.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionMethods.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionsDeclaration.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionsDeclaration.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionsDeclaration.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceExtensionsDeclaration.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEvent.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEvent.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEvent.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEvent.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEventWithHandlerArgument.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEventWithHandlerArgument.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEventWithHandlerArgument.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerEventWithHandlerArgument.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerProperty.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerProperty.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceListenerProperty.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethods.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethods.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethods.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceProperties.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceProperties.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceProperties.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceProperties.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyDeclaration.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyDeclaration.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyDeclaration.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyDeclaration.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyStringVariant.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyStringVariant.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyStringVariant.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyStringVariant.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassConstructors.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassConstructors.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassConstructors.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassConstructors.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerMembers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerMembers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerMembers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerMembers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokersWithSkips.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokersWithSkips.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethodInvokersWithSkips.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassMethods.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassProperties.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokersWithSkips.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokersWithSkips.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassPropertyInvokersWithSkips.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteConstSugarInterfaceFields.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteConstSugarInterfaceFields.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteConstSugarInterfaceFields.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteConstSugarInterfaceFields.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtor.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtor.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtor.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtor.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorDeprecated.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorDeprecated.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorDeprecated.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorDeprecated.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorWithStringOverload.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorWithStringOverload.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorWithStringOverload.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteCtorWithStringOverload.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstant.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstant.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstant.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstant.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithIntValue.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithIntValue.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithIntValue.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithIntValue.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithStringValue.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithStringValue.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithStringValue.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldConstantWithStringValue.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldGetBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldGetBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldGetBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldGetBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldIdField.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldIdField.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldIdField.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldIdField.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldInt.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldInt.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldInt.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldInt.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldSetBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldSetBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldSetBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldSetBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldString.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldString.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldString.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteFieldString.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDeclaration.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDeclaration.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDeclaration.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDeclaration.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceFields.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceFields.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceFields.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceFields.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAbstractWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodFinalWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodFinalWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodFinalWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodFinalWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodIdField.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodIdField.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodIdField.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodIdField.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodProtected.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodStaticWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodStaticWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodStaticWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodStaticWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithIntReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithStringReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgs.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgs.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgs.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgsForInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgsForInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgsForInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteParameterListCallArgsForInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteProperty.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassConstructors.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassConstructors.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassConstructors.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassConstructors.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerMembers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerMembers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerMembers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerMembers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokersWithSkips.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokersWithSkips.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethodInvokersWithSkips.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassMethods.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassProperties.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokersWithSkips.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokersWithSkips.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassPropertyInvokersWithSkips.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtor.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtor.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtor.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtor.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorDeprecated.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorDeprecated.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorDeprecated.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorDeprecated.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorWithStringOverload.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorWithStringOverload.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorWithStringOverload.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteCtorWithStringOverload.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstant.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstant.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstant.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstant.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithIntValue.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithIntValue.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithIntValue.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithIntValue.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithStringValue.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithStringValue.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithStringValue.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldConstantWithStringValue.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldGetBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldGetBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldGetBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldGetBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldIdField.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldIdField.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldIdField.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldIdField.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldInt.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldInt.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldInt.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldInt.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldSetBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldSetBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldSetBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldSetBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldString.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldString.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldString.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteFieldString.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDeclaration.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDeclaration.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDeclaration.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDeclaration.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAbstractWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithIntReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodAsyncifiedWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodFinalWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodFinalWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodFinalWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodFinalWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodIdField.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodIdField.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodIdField.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodIdField.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodProtected.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodStaticWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodStaticWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodStaticWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodStaticWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithIntReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithStringReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgs.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgs.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgs.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgsForInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgsForInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgsForInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteParameterListCallArgsForInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteProperty.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClass.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassConstructors.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassConstructors.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassConstructors.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassConstructors.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassHandle.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassHandle.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassHandle.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerHandle.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerHandle.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerHandle.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerMembers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerMembers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerMembers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassInvokerMembers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokersWithSkips.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokersWithSkips.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethodInvokersWithSkips.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassMethods.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassProperties.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokers.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokers.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokers.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokers.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokersWithSkips.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokersWithSkips.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokersWithSkips.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteClassPropertyInvokersWithSkips.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteConstSugarInterfaceFields.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteConstSugarInterfaceFields.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteConstSugarInterfaceFields.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteConstSugarInterfaceFields.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtor.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtor.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtor.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtor.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorDeprecated.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorDeprecated.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorDeprecated.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorDeprecated.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorWithStringOverload.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorWithStringOverload.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorWithStringOverload.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteCtorWithStringOverload.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstant.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstant.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstant.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstant.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithIntValue.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithIntValue.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithIntValue.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithIntValue.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithStringValue.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithStringValue.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithStringValue.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldConstantWithStringValue.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldGetBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldGetBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldGetBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldGetBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldIdField.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldIdField.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldIdField.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldIdField.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldInt.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldInt.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldInt.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldInt.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldSetBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldSetBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldSetBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldSetBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldString.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldString.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldString.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteFieldString.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceDeclaration.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceDeclaration.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceDeclaration.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceDeclaration.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceFields.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceFields.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceFields.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceFields.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAbstractWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithIntReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodAsyncifiedWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodBody.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodBody.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodBody.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodBody.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodFinalWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodFinalWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodFinalWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodFinalWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodIdField.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodIdField.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodIdField.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodIdField.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodProtected.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodStaticWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodStaticWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodStaticWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodStaticWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithIntReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithStringReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteMethodWithVoidReturn.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgs.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgs.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgs.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgsForInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgsForInvoker.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgsForInvoker.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteParameterListCallArgsForInvoker.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt rename to tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteProperty.txt diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorTestBase.cs b/tests/generator-Tests/Unit-Tests/CodeGeneratorTestBase.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorTestBase.cs rename to tests/generator-Tests/Unit-Tests/CodeGeneratorTestBase.cs diff --git a/tools/generator/Tests/Unit-Tests/CodeGeneratorTests.cs b/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/CodeGeneratorTests.cs rename to tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs diff --git a/tools/generator/Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs b/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs rename to tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs diff --git a/tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteBasicEnum.txt b/tests/generator-Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteBasicEnum.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteBasicEnum.txt rename to tests/generator-Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteBasicEnum.txt diff --git a/tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteEnumWithGens.txt b/tests/generator-Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteEnumWithGens.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteEnumWithGens.txt rename to tests/generator-Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteEnumWithGens.txt diff --git a/tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteFlagsEnum.txt b/tests/generator-Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteFlagsEnum.txt similarity index 100% rename from tools/generator/Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteFlagsEnum.txt rename to tests/generator-Tests/Unit-Tests/EnumGeneratorExpectedResults/WriteFlagsEnum.txt diff --git a/tools/generator/Tests/Unit-Tests/EnumGeneratorTests.cs b/tests/generator-Tests/Unit-Tests/EnumGeneratorTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/EnumGeneratorTests.cs rename to tests/generator-Tests/Unit-Tests/EnumGeneratorTests.cs diff --git a/tools/generator/Tests/Unit-Tests/InterfaceConstantsTests.cs b/tests/generator-Tests/Unit-Tests/InterfaceConstantsTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/InterfaceConstantsTests.cs rename to tests/generator-Tests/Unit-Tests/InterfaceConstantsTests.cs diff --git a/tools/generator/Tests/Unit-Tests/InterfaceTests.cs b/tests/generator-Tests/Unit-Tests/InterfaceTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/InterfaceTests.cs rename to tests/generator-Tests/Unit-Tests/InterfaceTests.cs diff --git a/tools/generator/Tests/Unit-Tests/ManagedExtensionsTests.cs b/tests/generator-Tests/Unit-Tests/ManagedExtensionsTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/ManagedExtensionsTests.cs rename to tests/generator-Tests/Unit-Tests/ManagedExtensionsTests.cs diff --git a/tools/generator/Tests/Unit-Tests/ManagedTests.cs b/tests/generator-Tests/Unit-Tests/ManagedTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/ManagedTests.cs rename to tests/generator-Tests/Unit-Tests/ManagedTests.cs diff --git a/tools/generator/Tests/Unit-Tests/SupportTypes.cs b/tests/generator-Tests/Unit-Tests/SupportTypes.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/SupportTypes.cs rename to tests/generator-Tests/Unit-Tests/SupportTypes.cs diff --git a/tools/generator/Tests/Unit-Tests/TestExtensions.cs b/tests/generator-Tests/Unit-Tests/TestExtensions.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/TestExtensions.cs rename to tests/generator-Tests/Unit-Tests/TestExtensions.cs diff --git a/tools/generator/Tests/Unit-Tests/TypeNameUtilitiesTests.cs b/tests/generator-Tests/Unit-Tests/TypeNameUtilitiesTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/TypeNameUtilitiesTests.cs rename to tests/generator-Tests/Unit-Tests/TypeNameUtilitiesTests.cs diff --git a/tools/generator/Tests/Unit-Tests/XmlApiImporterTests.cs b/tests/generator-Tests/Unit-Tests/XmlApiImporterTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/XmlApiImporterTests.cs rename to tests/generator-Tests/Unit-Tests/XmlApiImporterTests.cs diff --git a/tools/generator/Tests/Unit-Tests/XmlTests.cs b/tests/generator-Tests/Unit-Tests/XmlTests.cs similarity index 100% rename from tools/generator/Tests/Unit-Tests/XmlTests.cs rename to tests/generator-Tests/Unit-Tests/XmlTests.cs diff --git a/tools/generator/Tests/expected.ji/AccessModifiers/Mono.Android.projitems b/tests/generator-Tests/expected.ji/AccessModifiers/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/AccessModifiers/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/AccessModifiers/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs similarity index 100% rename from tools/generator/Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs rename to tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs diff --git a/tools/generator/Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs similarity index 100% rename from tools/generator/Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs rename to tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs diff --git a/tools/generator/Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs similarity index 100% rename from tools/generator/Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs rename to tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs diff --git a/tools/generator/Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs similarity index 100% rename from tools/generator/Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs rename to tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/Adapters/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/Adapters/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Adapters/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/Adapters/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/Mono.Android.projitems b/tests/generator-Tests/expected.ji/Adapters/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/Adapters/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs rename to tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs rename to tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs rename to tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs rename to tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs rename to tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Adapters/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/Adapters/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/Adapters/enumlist b/tests/generator-Tests/expected.ji/Adapters/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/Adapters/enumlist rename to tests/generator-Tests/expected.ji/Adapters/enumlist diff --git a/tools/generator/Tests/expected.ji/Android.Graphics.Color/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Android.Graphics.Color/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/Android.Graphics.Color/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/Android.Graphics.Color/Mono.Android.projitems b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/Android.Graphics.Color/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/Android.Graphics.Color/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/Android.Graphics.Color/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/Android.Graphics.Color/enumlist b/tests/generator-Tests/expected.ji/Android.Graphics.Color/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/Android.Graphics.Color/enumlist rename to tests/generator-Tests/expected.ji/Android.Graphics.Color/enumlist diff --git a/tools/generator/Tests/expected.ji/Arrays/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/Arrays/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Arrays/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/Arrays/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/Arrays/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Arrays/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Arrays/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/Arrays/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/Arrays/Mono.Android.projitems b/tests/generator-Tests/expected.ji/Arrays/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/Arrays/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/Arrays/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/Arrays/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Arrays/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Arrays/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/Arrays/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/Arrays/enumlist b/tests/generator-Tests/expected.ji/Arrays/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/Arrays/enumlist rename to tests/generator-Tests/expected.ji/Arrays/enumlist diff --git a/tools/generator/Tests/expected.ji/CSharpKeywords/CSharpKeywords.xml b/tests/generator-Tests/expected.ji/CSharpKeywords/CSharpKeywords.xml similarity index 100% rename from tools/generator/Tests/expected.ji/CSharpKeywords/CSharpKeywords.xml rename to tests/generator-Tests/expected.ji/CSharpKeywords/CSharpKeywords.xml diff --git a/tools/generator/Tests/expected.ji/CSharpKeywords/Mono.Android.projitems b/tests/generator-Tests/expected.ji/CSharpKeywords/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/CSharpKeywords/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/CSharpKeywords/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs similarity index 100% rename from tools/generator/Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs rename to tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs diff --git a/tools/generator/Tests/expected.ji/Constructors/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/Constructors/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Constructors/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/Constructors/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/Constructors/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Constructors/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Constructors/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/Constructors/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/Constructors/Mono.Android.projitems b/tests/generator-Tests/expected.ji/Constructors/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/Constructors/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/Constructors/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/Constructors/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Constructors/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Constructors/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/Constructors/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/Constructors/enumlist b/tests/generator-Tests/expected.ji/Constructors/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/Constructors/enumlist rename to tests/generator-Tests/expected.ji/Constructors/enumlist diff --git a/tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs b/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs similarity index 100% rename from tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs rename to tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs diff --git a/tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs similarity index 100% rename from tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs rename to tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs diff --git a/tools/generator/Tests/expected.ji/GenericArguments/GenericArguments.xml b/tests/generator-Tests/expected.ji/GenericArguments/GenericArguments.xml similarity index 100% rename from tools/generator/Tests/expected.ji/GenericArguments/GenericArguments.xml rename to tests/generator-Tests/expected.ji/GenericArguments/GenericArguments.xml diff --git a/tools/generator/Tests/expected.ji/GenericArguments/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/GenericArguments/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/GenericArguments/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/GenericArguments/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/InterfaceMethodsConflict.xml b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/InterfaceMethodsConflict.xml similarity index 100% rename from tools/generator/Tests/expected.ji/InterfaceMethodsConflict/InterfaceMethodsConflict.xml rename to tests/generator-Tests/expected.ji/InterfaceMethodsConflict/InterfaceMethodsConflict.xml diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs similarity index 100% rename from tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs rename to tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs similarity index 100% rename from tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs rename to tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs similarity index 100% rename from tools/generator/Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs rename to tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs diff --git a/tools/generator/Tests/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/InterfaceMethodsConflict/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/NestedTypes/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/NestedTypes/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NestedTypes/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/NestedTypes/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/NestedTypes/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/NestedTypes/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NestedTypes/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/NestedTypes/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/NestedTypes/Mono.Android.projitems b/tests/generator-Tests/expected.ji/NestedTypes/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/NestedTypes/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/NestedTypes/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs rename to tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs diff --git a/tools/generator/Tests/expected.ji/NestedTypes/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/NestedTypes/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NestedTypes/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/NestedTypes/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/NestedTypes/enumlist b/tests/generator-Tests/expected.ji/NestedTypes/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/NestedTypes/enumlist rename to tests/generator-Tests/expected.ji/NestedTypes/enumlist diff --git a/tools/generator/Tests/expected.ji/NonStaticFields/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/NonStaticFields/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NonStaticFields/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/NonStaticFields/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/NonStaticFields/Mono.Android.projitems b/tests/generator-Tests/expected.ji/NonStaticFields/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/NonStaticFields/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/NonStaticFields/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/NonStaticFields/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/NonStaticFields/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NonStaticFields/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/NonStaticFields/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/NonStaticFields/enumlist b/tests/generator-Tests/expected.ji/NonStaticFields/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/NonStaticFields/enumlist rename to tests/generator-Tests/expected.ji/NonStaticFields/enumlist diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/NormalMethods/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Class.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Class.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Class.cs rename to tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Class.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs rename to tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs rename to tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Mono.Android.projitems b/tests/generator-Tests/expected.ji/NormalMethods/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/NormalMethods/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs rename to tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs rename to tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/NormalMethods/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/NormalMethods/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/NormalMethods/enumlist b/tests/generator-Tests/expected.ji/NormalMethods/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/NormalMethods/enumlist rename to tests/generator-Tests/expected.ji/NormalMethods/enumlist diff --git a/tools/generator/Tests/expected.ji/NormalProperties/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/NormalProperties/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalProperties/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/NormalProperties/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/NormalProperties/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/NormalProperties/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalProperties/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/NormalProperties/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/NormalProperties/Mono.Android.projitems b/tests/generator-Tests/expected.ji/NormalProperties/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/NormalProperties/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/NormalProperties/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/NormalProperties/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/NormalProperties/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/NormalProperties/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/NormalProperties/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/NormalProperties/enumlist b/tests/generator-Tests/expected.ji/NormalProperties/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/NormalProperties/enumlist rename to tests/generator-Tests/expected.ji/NormalProperties/enumlist diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/ParameterXPath/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/ParameterXPath/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/ParameterXPath/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs b/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs similarity index 100% rename from tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs rename to tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/Mono.Android.projitems b/tests/generator-Tests/expected.ji/ParameterXPath/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/ParameterXPath/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/ParameterXPath/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs similarity index 100% rename from tools/generator/Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs rename to tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/ParameterXPath/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/ParameterXPath/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/ParameterXPath/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/enumlist b/tests/generator-Tests/expected.ji/ParameterXPath/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/ParameterXPath/enumlist rename to tests/generator-Tests/expected.ji/ParameterXPath/enumlist diff --git a/tools/generator/Tests/expected.ji/StaticFields/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/StaticFields/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticFields/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/StaticFields/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/StaticFields/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/StaticFields/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticFields/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/StaticFields/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/StaticFields/Mono.Android.projitems b/tests/generator-Tests/expected.ji/StaticFields/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/StaticFields/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/StaticFields/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/StaticFields/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/StaticFields/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticFields/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/StaticFields/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/StaticFields/enumlist b/tests/generator-Tests/expected.ji/StaticFields/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/StaticFields/enumlist rename to tests/generator-Tests/expected.ji/StaticFields/enumlist diff --git a/tools/generator/Tests/expected.ji/StaticMethods/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/StaticMethods/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticMethods/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/StaticMethods/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/StaticMethods/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/StaticMethods/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticMethods/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/StaticMethods/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/StaticMethods/Mono.Android.projitems b/tests/generator-Tests/expected.ji/StaticMethods/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/StaticMethods/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/StaticMethods/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/StaticMethods/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/StaticMethods/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticMethods/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/StaticMethods/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/StaticMethods/enumlist b/tests/generator-Tests/expected.ji/StaticMethods/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/StaticMethods/enumlist rename to tests/generator-Tests/expected.ji/StaticMethods/enumlist diff --git a/tools/generator/Tests/expected.ji/StaticProperties/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/StaticProperties/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticProperties/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/StaticProperties/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/StaticProperties/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/StaticProperties/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticProperties/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/StaticProperties/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/StaticProperties/Mono.Android.projitems b/tests/generator-Tests/expected.ji/StaticProperties/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/StaticProperties/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/StaticProperties/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/StaticProperties/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/StaticProperties/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/StaticProperties/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/StaticProperties/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/StaticProperties/enumlist b/tests/generator-Tests/expected.ji/StaticProperties/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/StaticProperties/enumlist rename to tests/generator-Tests/expected.ji/StaticProperties/enumlist diff --git a/tools/generator/Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs rename to tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs diff --git a/tools/generator/Tests/expected.ji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/Java.IO.IOException.cs rename to tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs diff --git a/tools/generator/Tests/expected.ji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/Java.IO.InputStream.cs rename to tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs diff --git a/tools/generator/Tests/expected.ji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/Java.IO.OutputStream.cs rename to tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs diff --git a/tools/generator/Tests/expected.ji/Streams/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/Streams/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/Streams/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/Streams/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Streams/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/Streams/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/Java.Lang.Throwable.cs rename to tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs diff --git a/tools/generator/Tests/expected.ji/Streams/Mono.Android.projitems b/tests/generator-Tests/expected.ji/Streams/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/Streams/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/Streams/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/Streams/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/Streams/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/Streams/enumlist b/tests/generator-Tests/expected.ji/Streams/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/Streams/enumlist rename to tests/generator-Tests/expected.ji/Streams/enumlist diff --git a/tools/generator/Tests/expected.ji/TestInterface/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/TestInterface/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/TestInterface/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/TestInterface/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.String.cs b/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.String.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Java.Lang.String.cs rename to tests/generator-Tests/expected.ji/TestInterface/Java.Lang.String.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Mono.Android.projitems b/tests/generator-Tests/expected.ji/TestInterface/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/TestInterface/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs rename to tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs rename to tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs rename to tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs rename to tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs rename to tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs rename to tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs rename to tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs rename to tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/TestInterface/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/TestInterface/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/TestInterface/enumlist b/tests/generator-Tests/expected.ji/TestInterface/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/TestInterface/enumlist rename to tests/generator-Tests/expected.ji/TestInterface/enumlist diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Enum/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/java.lang.Enum/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs rename to tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs rename to tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.State.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.State.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.State.cs rename to tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.State.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Mono.Android.projitems b/tests/generator-Tests/expected.ji/java.lang.Enum/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Enum/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/java.lang.Enum/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Enum/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/java.lang.Enum/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/enumlist b/tests/generator-Tests/expected.ji/java.lang.Enum/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Enum/enumlist rename to tests/generator-Tests/expected.ji/java.lang.Enum/enumlist diff --git a/tools/generator/Tests/expected.ji/java.lang.Object/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/java.lang.Object/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Object/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/java.lang.Object/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Object/Mono.Android.projitems b/tests/generator-Tests/expected.ji/java.lang.Object/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Object/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/java.lang.Object/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/java.lang.Object/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/java.lang.Object/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Object/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/java.lang.Object/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/java.lang.Object/enumlist b/tests/generator-Tests/expected.ji/java.lang.Object/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/java.lang.Object/enumlist rename to tests/generator-Tests/expected.ji/java.lang.Object/enumlist diff --git a/tools/generator/Tests/expected.ji/java.util.List/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected.ji/java.util.List/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.util.List/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected.ji/java.util.List/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected.ji/java.util.List/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/java.util.List/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.util.List/Java.Lang.Object.cs rename to tests/generator-Tests/expected.ji/java.util.List/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected.ji/java.util.List/Mono.Android.projitems b/tests/generator-Tests/expected.ji/java.util.List/Mono.Android.projitems similarity index 100% rename from tools/generator/Tests/expected.ji/java.util.List/Mono.Android.projitems rename to tests/generator-Tests/expected.ji/java.util.List/Mono.Android.projitems diff --git a/tools/generator/Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected.ji/java.util.List/__NamespaceMapping__.cs b/tests/generator-Tests/expected.ji/java.util.List/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected.ji/java.util.List/__NamespaceMapping__.cs rename to tests/generator-Tests/expected.ji/java.util.List/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected.ji/java.util.List/enumlist b/tests/generator-Tests/expected.ji/java.util.List/enumlist similarity index 100% rename from tools/generator/Tests/expected.ji/java.util.List/enumlist rename to tests/generator-Tests/expected.ji/java.util.List/enumlist diff --git a/tools/generator/Tests/expected/AccessModifiers/AccessModifiers.xml b/tests/generator-Tests/expected/AccessModifiers/AccessModifiers.xml similarity index 100% rename from tools/generator/Tests/expected/AccessModifiers/AccessModifiers.xml rename to tests/generator-Tests/expected/AccessModifiers/AccessModifiers.xml diff --git a/tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs similarity index 100% rename from tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs rename to tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.BasePublicClass.cs diff --git a/tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs similarity index 100% rename from tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs rename to tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs diff --git a/tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs similarity index 100% rename from tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs rename to tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.IExtendedInterface.cs diff --git a/tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.PublicClass.cs similarity index 100% rename from tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.PublicClass.cs rename to tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.PublicClass.cs diff --git a/tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.PublicFinalClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.PublicFinalClass.cs similarity index 100% rename from tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.PublicFinalClass.cs rename to tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.PublicFinalClass.cs diff --git a/tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.TestClass.cs b/tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.TestClass.cs similarity index 100% rename from tools/generator/Tests/expected/AccessModifiers/Xamarin.Test.TestClass.cs rename to tests/generator-Tests/expected/AccessModifiers/Xamarin.Test.TestClass.cs diff --git a/tools/generator/Tests/expected/Adapters/Adapters.xml b/tests/generator-Tests/expected/Adapters/Adapters.xml similarity index 100% rename from tools/generator/Tests/expected/Adapters/Adapters.xml rename to tests/generator-Tests/expected/Adapters/Adapters.xml diff --git a/tools/generator/Tests/expected/Adapters/SupportFiles/AdapterView.cs b/tests/generator-Tests/expected/Adapters/SupportFiles/AdapterView.cs similarity index 100% rename from tools/generator/Tests/expected/Adapters/SupportFiles/AdapterView.cs rename to tests/generator-Tests/expected/Adapters/SupportFiles/AdapterView.cs diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected/Adapters/Xamarin.Test.AbsSpinner.cs similarity index 100% rename from tools/generator/Tests/expected/Adapters/Xamarin.Test.AbsSpinner.cs rename to tests/generator-Tests/expected/Adapters/Xamarin.Test.AbsSpinner.cs diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected/Adapters/Xamarin.Test.AdapterView.cs similarity index 100% rename from tools/generator/Tests/expected/Adapters/Xamarin.Test.AdapterView.cs rename to tests/generator-Tests/expected/Adapters/Xamarin.Test.AdapterView.cs diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs similarity index 100% rename from tools/generator/Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs rename to tests/generator-Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.IAdapter.cs b/tests/generator-Tests/expected/Adapters/Xamarin.Test.IAdapter.cs similarity index 100% rename from tools/generator/Tests/expected/Adapters/Xamarin.Test.IAdapter.cs rename to tests/generator-Tests/expected/Adapters/Xamarin.Test.IAdapter.cs diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.ISpinnerAdapter.cs b/tests/generator-Tests/expected/Adapters/Xamarin.Test.ISpinnerAdapter.cs similarity index 100% rename from tools/generator/Tests/expected/Adapters/Xamarin.Test.ISpinnerAdapter.cs rename to tests/generator-Tests/expected/Adapters/Xamarin.Test.ISpinnerAdapter.cs diff --git a/tools/generator/Tests/expected/Android.Graphics.Color/Android.Graphics.Color.xml b/tests/generator-Tests/expected/Android.Graphics.Color/Android.Graphics.Color.xml similarity index 100% rename from tools/generator/Tests/expected/Android.Graphics.Color/Android.Graphics.Color.xml rename to tests/generator-Tests/expected/Android.Graphics.Color/Android.Graphics.Color.xml diff --git a/tools/generator/Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/Arrays/Arrays.xml b/tests/generator-Tests/expected/Arrays/Arrays.xml similarity index 100% rename from tools/generator/Tests/expected/Arrays/Arrays.xml rename to tests/generator-Tests/expected/Arrays/Arrays.xml diff --git a/tools/generator/Tests/expected/Arrays/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/Arrays/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/Arrays/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/Arrays/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/CSharpKeywords/CSharpKeywords.xml b/tests/generator-Tests/expected/CSharpKeywords/CSharpKeywords.xml similarity index 100% rename from tools/generator/Tests/expected/CSharpKeywords/CSharpKeywords.xml rename to tests/generator-Tests/expected/CSharpKeywords/CSharpKeywords.xml diff --git a/tools/generator/Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs similarity index 100% rename from tools/generator/Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs rename to tests/generator-Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs diff --git a/tools/generator/Tests/expected/Constructors/Constructors.xml b/tests/generator-Tests/expected/Constructors/Constructors.xml similarity index 100% rename from tools/generator/Tests/expected/Constructors/Constructors.xml rename to tests/generator-Tests/expected/Constructors/Constructors.xml diff --git a/tools/generator/Tests/expected/Constructors/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/Constructors/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/Constructors/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/Constructors/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/Constructors/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected/Constructors/Xamarin.Test.SomeObject2.cs similarity index 100% rename from tools/generator/Tests/expected/Constructors/Xamarin.Test.SomeObject2.cs rename to tests/generator-Tests/expected/Constructors/Xamarin.Test.SomeObject2.cs diff --git a/tools/generator/Tests/expected/EnumerationFixup/EnumerationFixup.xml b/tests/generator-Tests/expected/EnumerationFixup/EnumerationFixup.xml similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/EnumerationFixup.xml rename to tests/generator-Tests/expected/EnumerationFixup/EnumerationFixup.xml diff --git a/tools/generator/Tests/expected/EnumerationFixup/EnumerationFixupMap.xml b/tests/generator-Tests/expected/EnumerationFixup/EnumerationFixupMap.xml similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/EnumerationFixupMap.xml rename to tests/generator-Tests/expected/EnumerationFixup/EnumerationFixupMap.xml diff --git a/tools/generator/Tests/expected/EnumerationFixup/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected/EnumerationFixup/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected/EnumerationFixup/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected/EnumerationFixup/Java.Lang.Object.cs b/tests/generator-Tests/expected/EnumerationFixup/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/Java.Lang.Object.cs rename to tests/generator-Tests/expected/EnumerationFixup/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs rename to tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject2.cs diff --git a/tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeValues.cs b/tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeValues.cs similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeValues.cs rename to tests/generator-Tests/expected/EnumerationFixup/Xamarin.Test.SomeValues.cs diff --git a/tools/generator/Tests/expected/EnumerationFixup/__NamespaceMapping__.cs b/tests/generator-Tests/expected/EnumerationFixup/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/__NamespaceMapping__.cs rename to tests/generator-Tests/expected/EnumerationFixup/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected/EnumerationFixup/enumlist b/tests/generator-Tests/expected/EnumerationFixup/enumlist similarity index 100% rename from tools/generator/Tests/expected/EnumerationFixup/enumlist rename to tests/generator-Tests/expected/EnumerationFixup/enumlist diff --git a/tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs b/tests/generator-Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs similarity index 100% rename from tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs rename to tests/generator-Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs diff --git a/tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs similarity index 100% rename from tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs rename to tests/generator-Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs diff --git a/tools/generator/Tests/expected/GenericArguments/GenericArguments.xml b/tests/generator-Tests/expected/GenericArguments/GenericArguments.xml similarity index 100% rename from tools/generator/Tests/expected/GenericArguments/GenericArguments.xml rename to tests/generator-Tests/expected/GenericArguments/GenericArguments.xml diff --git a/tools/generator/Tests/expected/GenericArguments/Java.Lang.Object.cs b/tests/generator-Tests/expected/GenericArguments/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected/GenericArguments/Java.Lang.Object.cs rename to tests/generator-Tests/expected/GenericArguments/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/InterfaceMethodsConflict.xml b/tests/generator-Tests/expected/InterfaceMethodsConflict/InterfaceMethodsConflict.xml similarity index 100% rename from tools/generator/Tests/expected/InterfaceMethodsConflict/InterfaceMethodsConflict.xml rename to tests/generator-Tests/expected/InterfaceMethodsConflict/InterfaceMethodsConflict.xml diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected/InterfaceMethodsConflict/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs similarity index 100% rename from tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs rename to tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II1.cs diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs similarity index 100% rename from tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs rename to tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.II2.cs diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs similarity index 100% rename from tools/generator/Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs rename to tests/generator-Tests/expected/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs diff --git a/tools/generator/Tests/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs b/tests/generator-Tests/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs rename to tests/generator-Tests/expected/InterfaceMethodsConflict/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected/NestedTypes/NestedTypes.xml b/tests/generator-Tests/expected/NestedTypes/NestedTypes.xml similarity index 100% rename from tools/generator/Tests/expected/NestedTypes/NestedTypes.xml rename to tests/generator-Tests/expected/NestedTypes/NestedTypes.xml diff --git a/tools/generator/Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs similarity index 100% rename from tools/generator/Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs rename to tests/generator-Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs diff --git a/tools/generator/Tests/expected/NonStaticFields/NonStaticField.xml b/tests/generator-Tests/expected/NonStaticFields/NonStaticField.xml similarity index 100% rename from tools/generator/Tests/expected/NonStaticFields/NonStaticField.xml rename to tests/generator-Tests/expected/NonStaticFields/NonStaticField.xml diff --git a/tools/generator/Tests/expected/NonStaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/NonStaticFields/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/NonStaticFields/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/NonStaticFields/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/NormalMethods/Java.Lang.Throwable.cs b/tests/generator-Tests/expected/NormalMethods/Java.Lang.Throwable.cs similarity index 100% rename from tools/generator/Tests/expected/NormalMethods/Java.Lang.Throwable.cs rename to tests/generator-Tests/expected/NormalMethods/Java.Lang.Throwable.cs diff --git a/tools/generator/Tests/expected/NormalMethods/NormalMethods.xml b/tests/generator-Tests/expected/NormalMethods/NormalMethods.xml similarity index 100% rename from tools/generator/Tests/expected/NormalMethods/NormalMethods.xml rename to tests/generator-Tests/expected/NormalMethods/NormalMethods.xml diff --git a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.A.cs similarity index 100% rename from tools/generator/Tests/expected/NormalMethods/Xamarin.Test.A.cs rename to tests/generator-Tests/expected/NormalMethods/Xamarin.Test.A.cs diff --git a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.C.cs similarity index 100% rename from tools/generator/Tests/expected/NormalMethods/Xamarin.Test.C.cs rename to tests/generator-Tests/expected/NormalMethods/Xamarin.Test.C.cs diff --git a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/NormalProperties/NormalProperties.xml b/tests/generator-Tests/expected/NormalProperties/NormalProperties.xml similarity index 100% rename from tools/generator/Tests/expected/NormalProperties/NormalProperties.xml rename to tests/generator-Tests/expected/NormalProperties/NormalProperties.xml diff --git a/tools/generator/Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/ParameterXPath/ParameterXPath.xml b/tests/generator-Tests/expected/ParameterXPath/ParameterXPath.xml similarity index 100% rename from tools/generator/Tests/expected/ParameterXPath/ParameterXPath.xml rename to tests/generator-Tests/expected/ParameterXPath/ParameterXPath.xml diff --git a/tools/generator/Tests/expected/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected/ParameterXPath/Xamarin.Test.A.cs similarity index 100% rename from tools/generator/Tests/expected/ParameterXPath/Xamarin.Test.A.cs rename to tests/generator-Tests/expected/ParameterXPath/Xamarin.Test.A.cs diff --git a/tools/generator/Tests/expected/StaticFields/StaticField.xml b/tests/generator-Tests/expected/StaticFields/StaticField.xml similarity index 100% rename from tools/generator/Tests/expected/StaticFields/StaticField.xml rename to tests/generator-Tests/expected/StaticFields/StaticField.xml diff --git a/tools/generator/Tests/expected/StaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/StaticFields/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/StaticFields/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/StaticFields/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/StaticMethods/StaticMethod.xml b/tests/generator-Tests/expected/StaticMethods/StaticMethod.xml similarity index 100% rename from tools/generator/Tests/expected/StaticMethods/StaticMethod.xml rename to tests/generator-Tests/expected/StaticMethods/StaticMethod.xml diff --git a/tools/generator/Tests/expected/StaticMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/StaticMethods/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/StaticMethods/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/StaticMethods/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/StaticProperties/StaticProperties.xml b/tests/generator-Tests/expected/StaticProperties/StaticProperties.xml similarity index 100% rename from tools/generator/Tests/expected/StaticProperties/StaticProperties.xml rename to tests/generator-Tests/expected/StaticProperties/StaticProperties.xml diff --git a/tools/generator/Tests/expected/StaticProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/StaticProperties/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/StaticProperties/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/StaticProperties/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected/Streams/Java.IO.FilterOutputStream.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/Java.IO.FilterOutputStream.cs rename to tests/generator-Tests/expected/Streams/Java.IO.FilterOutputStream.cs diff --git a/tools/generator/Tests/expected/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected/Streams/Java.IO.IOException.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/Java.IO.IOException.cs rename to tests/generator-Tests/expected/Streams/Java.IO.IOException.cs diff --git a/tools/generator/Tests/expected/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected/Streams/Java.IO.InputStream.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/Java.IO.InputStream.cs rename to tests/generator-Tests/expected/Streams/Java.IO.InputStream.cs diff --git a/tools/generator/Tests/expected/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected/Streams/Java.IO.OutputStream.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/Java.IO.OutputStream.cs rename to tests/generator-Tests/expected/Streams/Java.IO.OutputStream.cs diff --git a/tools/generator/Tests/expected/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected/Streams/Java.Lang.Throwable.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/Java.Lang.Throwable.cs rename to tests/generator-Tests/expected/Streams/Java.Lang.Throwable.cs diff --git a/tools/generator/Tests/expected/Streams/Streams.xml b/tests/generator-Tests/expected/Streams/Streams.xml similarity index 100% rename from tools/generator/Tests/expected/Streams/Streams.xml rename to tests/generator-Tests/expected/Streams/Streams.xml diff --git a/tools/generator/Tests/expected/Streams/SupportFiles/InputStreamAdapter.cs b/tests/generator-Tests/expected/Streams/SupportFiles/InputStreamAdapter.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/SupportFiles/InputStreamAdapter.cs rename to tests/generator-Tests/expected/Streams/SupportFiles/InputStreamAdapter.cs diff --git a/tools/generator/Tests/expected/Streams/SupportFiles/InputStreamInvoker.cs b/tests/generator-Tests/expected/Streams/SupportFiles/InputStreamInvoker.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/SupportFiles/InputStreamInvoker.cs rename to tests/generator-Tests/expected/Streams/SupportFiles/InputStreamInvoker.cs diff --git a/tools/generator/Tests/expected/Streams/SupportFiles/OutputStreamAdapter.cs b/tests/generator-Tests/expected/Streams/SupportFiles/OutputStreamAdapter.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/SupportFiles/OutputStreamAdapter.cs rename to tests/generator-Tests/expected/Streams/SupportFiles/OutputStreamAdapter.cs diff --git a/tools/generator/Tests/expected/Streams/SupportFiles/OutputStreamInvoker.cs b/tests/generator-Tests/expected/Streams/SupportFiles/OutputStreamInvoker.cs similarity index 100% rename from tools/generator/Tests/expected/Streams/SupportFiles/OutputStreamInvoker.cs rename to tests/generator-Tests/expected/Streams/SupportFiles/OutputStreamInvoker.cs diff --git a/tools/generator/Tests/expected/TestInterface/ClassWithoutNamespace.cs b/tests/generator-Tests/expected/TestInterface/ClassWithoutNamespace.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/ClassWithoutNamespace.cs rename to tests/generator-Tests/expected/TestInterface/ClassWithoutNamespace.cs diff --git a/tools/generator/Tests/expected/TestInterface/IInterfaceWithoutNamespace.cs b/tests/generator-Tests/expected/TestInterface/IInterfaceWithoutNamespace.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/IInterfaceWithoutNamespace.cs rename to tests/generator-Tests/expected/TestInterface/IInterfaceWithoutNamespace.cs diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericImplementation.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/Test.ME.GenericImplementation.cs rename to tests/generator-Tests/expected/TestInterface/Test.ME.GenericImplementation.cs diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs rename to tests/generator-Tests/expected/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs rename to tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs rename to tests/generator-Tests/expected/TestInterface/Test.ME.GenericStringPropertyImplementation.cs diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericInterface.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/Test.ME.IGenericInterface.cs rename to tests/generator-Tests/expected/TestInterface/Test.ME.IGenericInterface.cs diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs rename to tests/generator-Tests/expected/TestInterface/Test.ME.IGenericPropertyInterface.cs diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.ITestInterface.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/Test.ME.ITestInterface.cs rename to tests/generator-Tests/expected/TestInterface/Test.ME.ITestInterface.cs diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs similarity index 100% rename from tools/generator/Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs rename to tests/generator-Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs diff --git a/tools/generator/Tests/expected/TestInterface/TestInterface.xml b/tests/generator-Tests/expected/TestInterface/TestInterface.xml similarity index 100% rename from tools/generator/Tests/expected/TestInterface/TestInterface.xml rename to tests/generator-Tests/expected/TestInterface/TestInterface.xml diff --git a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Enum.cs b/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.Enum.cs similarity index 100% rename from tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Enum.cs rename to tests/generator-Tests/expected/java.lang.Enum/Java.Lang.Enum.cs diff --git a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Enum.xml b/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.Enum.xml similarity index 100% rename from tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Enum.xml rename to tests/generator-Tests/expected/java.lang.Enum/Java.Lang.Enum.xml diff --git a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs similarity index 100% rename from tools/generator/Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs rename to tests/generator-Tests/expected/java.lang.Enum/Java.Lang.IComparable.cs diff --git a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Object.cs b/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Object.cs rename to tests/generator-Tests/expected/java.lang.Enum/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.State.cs b/tests/generator-Tests/expected/java.lang.Enum/Java.Lang.State.cs similarity index 100% rename from tools/generator/Tests/expected/java.lang.Enum/Java.Lang.State.cs rename to tests/generator-Tests/expected/java.lang.Enum/Java.Lang.State.cs diff --git a/tools/generator/Tests/expected/java.lang.Object/Java.Interop.__TypeRegistrations.cs b/tests/generator-Tests/expected/java.lang.Object/Java.Interop.__TypeRegistrations.cs similarity index 100% rename from tools/generator/Tests/expected/java.lang.Object/Java.Interop.__TypeRegistrations.cs rename to tests/generator-Tests/expected/java.lang.Object/Java.Interop.__TypeRegistrations.cs diff --git a/tools/generator/Tests/expected/java.lang.Object/Java.Lang.Object.cs b/tests/generator-Tests/expected/java.lang.Object/Java.Lang.Object.cs similarity index 100% rename from tools/generator/Tests/expected/java.lang.Object/Java.Lang.Object.cs rename to tests/generator-Tests/expected/java.lang.Object/Java.Lang.Object.cs diff --git a/tools/generator/Tests/expected/java.lang.Object/__NamespaceMapping__.cs b/tests/generator-Tests/expected/java.lang.Object/__NamespaceMapping__.cs similarity index 100% rename from tools/generator/Tests/expected/java.lang.Object/__NamespaceMapping__.cs rename to tests/generator-Tests/expected/java.lang.Object/__NamespaceMapping__.cs diff --git a/tools/generator/Tests/expected/java.lang.Object/enumlist b/tests/generator-Tests/expected/java.lang.Object/enumlist similarity index 100% rename from tools/generator/Tests/expected/java.lang.Object/enumlist rename to tests/generator-Tests/expected/java.lang.Object/enumlist diff --git a/tools/generator/Tests/expected/java.lang.Object/java.lang.Object.xml b/tests/generator-Tests/expected/java.lang.Object/java.lang.Object.xml similarity index 100% rename from tools/generator/Tests/expected/java.lang.Object/java.lang.Object.xml rename to tests/generator-Tests/expected/java.lang.Object/java.lang.Object.xml diff --git a/tools/generator/Tests/expected/java.util.List/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected/java.util.List/Xamarin.Test.SomeObject.cs similarity index 100% rename from tools/generator/Tests/expected/java.util.List/Xamarin.Test.SomeObject.cs rename to tests/generator-Tests/expected/java.util.List/Xamarin.Test.SomeObject.cs diff --git a/tools/generator/Tests/expected/java.util.List/java.util.List.xml b/tests/generator-Tests/expected/java.util.List/java.util.List.xml similarity index 100% rename from tools/generator/Tests/expected/java.util.List/java.util.List.xml rename to tests/generator-Tests/expected/java.util.List/java.util.List.xml diff --git a/tests/generator-Tests/generator-Tests.csproj b/tests/generator-Tests/generator-Tests.csproj new file mode 100644 index 000000000..ecd6b9906 --- /dev/null +++ b/tests/generator-Tests/generator-Tests.csproj @@ -0,0 +1,58 @@ + + + + net472 + false + false + true + + + + ..\..\bin\TestDebug + + + + ..\..\bin\TestRelease + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + diff --git a/tools/logcat-parse/Tests/GrefsTest.cs b/tests/logcat-parse-Tests/GrefsTest.cs similarity index 94% rename from tools/logcat-parse/Tests/GrefsTest.cs rename to tests/logcat-parse-Tests/GrefsTest.cs index ee088acb4..9dd065baf 100644 --- a/tools/logcat-parse/Tests/GrefsTest.cs +++ b/tests/logcat-parse-Tests/GrefsTest.cs @@ -15,7 +15,7 @@ public class GrefsTest { [Test] public void Instances_GrefToWgrefToCollected () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("logcat-gwd"))) { + using (var source = GetResourceStream ("logcat-gwd.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (0, info.AlivePeers.Count ()); @@ -49,7 +49,7 @@ public void Instances_GrefToWgrefToCollected () [Test] public void Instances_GrefToDisposed () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("logcat-disposed"))) { + using (var source = GetResourceStream ("logcat-disposed.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (0, info.AlivePeers.Count ()); @@ -85,7 +85,7 @@ public void Instances_GrefToDisposed () [Test] public void Instances_Resurrection () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("logcat-resurrection"))) { + using (var source = GetResourceStream ("logcat-resurrection.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (1, info.AlivePeers.Count ()); @@ -122,7 +122,7 @@ public void Instances_Resurrection () void Instances_CreateAndDestroy (string resource) { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream (resource))) { + using (var source = GetResourceStream (resource)) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (0, info.AlivePeers.Count ()); @@ -154,31 +154,31 @@ void Instances_CreateAndDestroy (string resource) [Test] public void Instances_CreateAndDestroy () { - Instances_CreateAndDestroy ("logcat-ag-rg"); + Instances_CreateAndDestroy ("logcat-ag-rg.txt"); } [Test] public void Instances_CreateAndDestroy_Stdout () { - Instances_CreateAndDestroy ("stdout-ag-rg"); + Instances_CreateAndDestroy ("stdout-ag-rg.txt"); } [Test] public void Instances_CreateAndDestroy_Timestamp () { - Instances_CreateAndDestroy ("timestamp-ag-rg"); + Instances_CreateAndDestroy ("timestamp-ag-rg.txt"); } [Test] public void Instances_CreateAndDestroy_Stdio () { - Instances_CreateAndDestroy ("stdio-ag-rg"); + Instances_CreateAndDestroy ("stdio-ag-rg.txt"); } [Test] public void Instances_Alias () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("logcat-alias"))) { + using (var source = GetResourceStream ("logcat-alias.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (1, info.AlivePeers.Count ()); @@ -214,7 +214,7 @@ public void Instances_Alias () [Test] public void GetClassRef () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("logcat-get_class_ref"))) { + using (var source = GetResourceStream ("logcat-get_class_ref.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (1, info.AlivePeers.Count ()); @@ -245,7 +245,7 @@ public void GetClassRef () [Test] public void InvokerJavaClassRef () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("logcat-Invoker-java_class_ref"))) { + using (var source = GetResourceStream ("logcat-Invoker-java_class_ref.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (1, info.AlivePeers.Count ()); @@ -284,7 +284,7 @@ public void InvokerJavaClassRef () [Test] public void JavaListClassRef () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("stdio-JavaList"))) { + using (var source = GetResourceStream ("stdio-JavaList.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (1, info.AlivePeers.Count ()); @@ -346,7 +346,7 @@ public void JavaListClassRef () [Test] public void TrackThreadInformation () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("stdio-Finalized-threads"))) { + using (var source = GetResourceStream ("stdio-Finalized-threads.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (1, info.AllocatedPeers.Count); Assert.AreEqual (0, info.AlivePeers.Count ()); @@ -411,7 +411,7 @@ public void TrackThreadInformation () [Test] public void RepeatedThreadHandles () { - using (var source = new StreamReader (Assembly.GetExecutingAssembly ().GetManifestResourceStream ("stdio-repeated-handles"))) { + using (var source = GetResourceStream ("stdio-repeated-handles.txt")) { var info = Grefs.Parse (source, options: GrefParseOptions.ThrowOnCountMismatch); Assert.AreEqual (2, info.AllocatedPeers.Count); Assert.AreEqual (1, info.AlivePeers.Count ()); @@ -459,6 +459,16 @@ public void RepeatedThreadHandles () peer.GetStackTraceForHandle ("0x19004aa/G")); } } + + StreamReader GetResourceStream (string resource) + { + // Look for resources that end with our name, this allows us to + // avoid the LogicalName stuff + var assembly = Assembly.GetExecutingAssembly (); + var name = assembly.GetManifestResourceNames ().FirstOrDefault (n => n.EndsWith ("." + resource, StringComparison.OrdinalIgnoreCase)) ?? resource; + + return new StreamReader (assembly.GetManifestResourceStream (name)); + } } } diff --git a/tools/logcat-parse/Tests/JniHandleInfoTests.cs b/tests/logcat-parse-Tests/JniHandleInfoTests.cs similarity index 100% rename from tools/logcat-parse/Tests/JniHandleInfoTests.cs rename to tests/logcat-parse-Tests/JniHandleInfoTests.cs diff --git a/tests/logcat-parse-Tests/LogcatParse-Tests.csproj b/tests/logcat-parse-Tests/LogcatParse-Tests.csproj new file mode 100644 index 000000000..de7ff34c1 --- /dev/null +++ b/tests/logcat-parse-Tests/LogcatParse-Tests.csproj @@ -0,0 +1,31 @@ + + + + net472 + false + false + + + + ..\..\bin\TestDebug + + + + ..\..\bin\TestRelease + + + + + + + + + + + + + + + + + diff --git a/tools/logcat-parse/Tests/Resources/logcat-Invoker-java_class_ref.txt b/tests/logcat-parse-Tests/Resources/logcat-Invoker-java_class_ref.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/logcat-Invoker-java_class_ref.txt rename to tests/logcat-parse-Tests/Resources/logcat-Invoker-java_class_ref.txt diff --git a/tools/logcat-parse/Tests/Resources/logcat-ag-rg.txt b/tests/logcat-parse-Tests/Resources/logcat-ag-rg.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/logcat-ag-rg.txt rename to tests/logcat-parse-Tests/Resources/logcat-ag-rg.txt diff --git a/tools/logcat-parse/Tests/Resources/logcat-alias.txt b/tests/logcat-parse-Tests/Resources/logcat-alias.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/logcat-alias.txt rename to tests/logcat-parse-Tests/Resources/logcat-alias.txt diff --git a/tools/logcat-parse/Tests/Resources/logcat-disposed.txt b/tests/logcat-parse-Tests/Resources/logcat-disposed.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/logcat-disposed.txt rename to tests/logcat-parse-Tests/Resources/logcat-disposed.txt diff --git a/tools/logcat-parse/Tests/Resources/logcat-get_class_ref.txt b/tests/logcat-parse-Tests/Resources/logcat-get_class_ref.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/logcat-get_class_ref.txt rename to tests/logcat-parse-Tests/Resources/logcat-get_class_ref.txt diff --git a/tools/logcat-parse/Tests/Resources/logcat-gwd.txt b/tests/logcat-parse-Tests/Resources/logcat-gwd.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/logcat-gwd.txt rename to tests/logcat-parse-Tests/Resources/logcat-gwd.txt diff --git a/tools/logcat-parse/Tests/Resources/logcat-resurrection.txt b/tests/logcat-parse-Tests/Resources/logcat-resurrection.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/logcat-resurrection.txt rename to tests/logcat-parse-Tests/Resources/logcat-resurrection.txt diff --git a/tools/logcat-parse/Tests/Resources/stdio-Finalized-threads.txt b/tests/logcat-parse-Tests/Resources/stdio-Finalized-threads.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/stdio-Finalized-threads.txt rename to tests/logcat-parse-Tests/Resources/stdio-Finalized-threads.txt diff --git a/tools/logcat-parse/Tests/Resources/stdio-JavaList.txt b/tests/logcat-parse-Tests/Resources/stdio-JavaList.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/stdio-JavaList.txt rename to tests/logcat-parse-Tests/Resources/stdio-JavaList.txt diff --git a/tools/logcat-parse/Tests/Resources/stdio-ag-rg.txt b/tests/logcat-parse-Tests/Resources/stdio-ag-rg.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/stdio-ag-rg.txt rename to tests/logcat-parse-Tests/Resources/stdio-ag-rg.txt diff --git a/tools/logcat-parse/Tests/Resources/stdio-repeated-handles.txt b/tests/logcat-parse-Tests/Resources/stdio-repeated-handles.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/stdio-repeated-handles.txt rename to tests/logcat-parse-Tests/Resources/stdio-repeated-handles.txt diff --git a/tools/logcat-parse/Tests/Resources/stdout-ag-rg.txt b/tests/logcat-parse-Tests/Resources/stdout-ag-rg.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/stdout-ag-rg.txt rename to tests/logcat-parse-Tests/Resources/stdout-ag-rg.txt diff --git a/tools/logcat-parse/Tests/Resources/timestamp-ag-rg.txt b/tests/logcat-parse-Tests/Resources/timestamp-ag-rg.txt similarity index 100% rename from tools/logcat-parse/Tests/Resources/timestamp-ag-rg.txt rename to tests/logcat-parse-Tests/Resources/timestamp-ag-rg.txt diff --git a/tools/generator/Tests/generator-Tests.csproj b/tools/generator/Tests/generator-Tests.csproj deleted file mode 100644 index 58d073b8e..000000000 --- a/tools/generator/Tests/generator-Tests.csproj +++ /dev/null @@ -1,707 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {4EEAB1A7-99C1-4302-9C18-01A7B481409B} - Library - generatortests - generator-Tests - v4.6.1 - - - true - full - false - ..\..\..\bin\TestDebug - DEBUG; - prompt - 4 - false - true - - - full - true - ..\..\..\bin\TestRelease - prompt - 4 - false - true - - - - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - - - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {D18FCF91-8876-48A0-A693-2DC1E7D3D80A} - Java.Interop.Tools.JavaCallableWrappers - - - {D14A1B5C-2060-4930-92BE-F7190256C735} - generator - - - {1268EADF-8344-431C-81F6-FCB7CBC99F49} - Xamarin.Android.Tools.ApiXmlAdjuster - - - {15945D4B-FF56-4BCC-B598-2718D199DD08} - Xamarin.Android.Cecil - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - PreserveNewest - - - Tests-Core\api-cp.xml - - - Tests-Core\api.xml - - - Tests-Core\fields-cp.xml - - - Tests-Core\fields.xml - - - Tests-Core\methods-cp.xml - - - Tests-Core\methods.xml - - - - - - - - - \ No newline at end of file diff --git a/tools/generator/Tests/packages.config b/tools/generator/Tests/packages.config deleted file mode 100644 index e78802726..000000000 --- a/tools/generator/Tests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tools/logcat-parse/Tests/LogcatParse-Tests.csproj b/tools/logcat-parse/Tests/LogcatParse-Tests.csproj deleted file mode 100644 index db012d0ab..000000000 --- a/tools/logcat-parse/Tests/LogcatParse-Tests.csproj +++ /dev/null @@ -1,97 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {DB05D566-0BA0-4935-868D-689E2F03688E} - Library - Xamarin.Android.Tools.LogcatParse.Tests - LogcatParse-Tests - v4.6.1 - - - true - full - false - ..\..\..\bin\TestDebug - DEBUG; - prompt - 4 - false - - - full - true - ..\..\..\bin\TestRelease - prompt - 4 - false - - - - - ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll - - - - - - - - - - {7387E151-48E3-4885-B2CA-A74434A34045} - logcat-parse - - - - - - - - logcat-gwd - - - logcat-disposed - - - logcat-resurrection - - - logcat-ag-rg - - - stdout-ag-rg - - - timestamp-ag-rg - - - logcat-alias - - - logcat-get_class_ref - - - logcat-Invoker-java_class_ref - - - stdio-ag-rg - - - stdio-JavaList - - - stdio-Finalized-threads - - - stdio-repeated-handles - - - - - - \ No newline at end of file diff --git a/tools/logcat-parse/Tests/packages.config b/tools/logcat-parse/Tests/packages.config deleted file mode 100644 index b5529657b..000000000 --- a/tools/logcat-parse/Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From 222317a8a08f61103750c929a73817347e5c6c01 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Mon, 25 Nov 2019 15:28:35 -0600 Subject: [PATCH 2/2] [logcat-parse-Tests] Rename to match containing directory. --- Java.Interop.sln | 2 +- Makefile | 2 +- build-tools/automation/azure-pipelines.yaml | 2 +- .../{LogcatParse-Tests.csproj => logcat-parse-Tests.csproj} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename tests/logcat-parse-Tests/{LogcatParse-Tests.csproj => logcat-parse-Tests.csproj} (100%) diff --git a/Java.Interop.sln b/Java.Interop.sln index 3196c59c3..734f5790b 100644 --- a/Java.Interop.sln +++ b/Java.Interop.sln @@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Dynamic-Tests" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Export-Tests", "tests\Java.Interop.Export-Tests\Java.Interop.Export-Tests.csproj", "{82F24161-F0CA-44CC-AEC3-885D613605E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogcatParse-Tests", "tests\logcat-parse-Tests\LogcatParse-Tests.csproj", "{DB05D566-0BA0-4935-868D-689E2F03688E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "logcat-parse-Tests", "tests\logcat-parse-Tests\logcat-parse-Tests.csproj", "{DB05D566-0BA0-4935-868D-689E2F03688E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Bytecode-Tests", "tests\Xamarin.Android.Tools.Bytecode-Tests\Xamarin.Android.Tools.Bytecode-Tests.csproj", "{C9FA4492-DEB0-4932-A6B8-E2C4E0581692}" EndProject diff --git a/Makefile b/Makefile index a460a070b..1bab8d8a5 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ TESTS = \ bin/Test$(CONFIGURATION)/Java.Interop.Dynamic-Tests.dll \ bin/Test$(CONFIGURATION)/Java.Interop.Export-Tests.dll \ bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll \ - bin/Test$(CONFIGURATION)/LogcatParse-Tests.dll \ + bin/Test$(CONFIGURATION)/logcat-parse-Tests.dll \ bin/Test$(CONFIGURATION)/generator-Tests.dll \ bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll \ bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.Bytecode-Tests.dll diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index c5b8aadfd..6524f5cd6 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -45,7 +45,7 @@ jobs: inputs: solution: build-tools/scripts/RunNUnitTests.targets configuration: $(Build.Configuration) - msbuildArguments: /p:TestAssembly="bin\Test$(Build.Configuration)\generator-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(Build.Configuration)\LogcatParse-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.Bytecode-Tests.dll" + msbuildArguments: /p:TestAssembly="bin\Test$(Build.Configuration)\generator-Tests.dll;bin\Test$(Build.Configuration)\Java.Interop.Tools.JavaCallableWrappers-Tests.dll;bin\Test$(Build.Configuration)\logcat-parse-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll;bin\Test$(Build.Configuration)\Xamarin.Android.Tools.Bytecode-Tests.dll" condition: succeededOrFailed() - task: PublishTestResults@2 diff --git a/tests/logcat-parse-Tests/LogcatParse-Tests.csproj b/tests/logcat-parse-Tests/logcat-parse-Tests.csproj similarity index 100% rename from tests/logcat-parse-Tests/LogcatParse-Tests.csproj rename to tests/logcat-parse-Tests/logcat-parse-Tests.csproj