diff --git a/Java.Interop.sln b/Java.Interop.sln index 716c91b73..734f5790b 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("{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", "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..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 @@ -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..6524f5cd6 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -38,13 +38,14 @@ jobs: inputs: solution: Java.Interop.sln configuration: $(Build.Configuration) - + msbuildArguments: '/t:Restore,Build' + - task: MSBuild@1 displayName: MSBuild RunNUnitTests.targets 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/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 000000000..d01d39fc6 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject$Companion.class differ 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 000000000..c380cd78a Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject.class differ diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject.kt new file mode 100644 index 000000000..69f889861 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/CompanionObject.kt @@ -0,0 +1,3 @@ +class CompanionObject { + companion object { } +} \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/DataClass.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/DataClass.class new file mode 100644 index 000000000..84aafabbb Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/DataClass.class differ diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/DataClass.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/DataClass.kt new file mode 100644 index 000000000..c75507a7f --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/DataClass.kt @@ -0,0 +1,3 @@ +data class DataClass(val name: String = "", val age: Int = 0) { + var weight: Int = 0 +} \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClass.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClass.class new file mode 100644 index 000000000..2a2f4701f Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClass.class differ 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 000000000..16e36be4b Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces$PLUS.class differ 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 000000000..571111d3a Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces$TIMES.class differ 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 000000000..da1b369c8 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfaces.class differ 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 000000000..3b63f4fa4 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/EnumClassWithInterfacesInterface.class differ 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 000000000..4065ea2b8 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ExtensionMethods.class differ 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 000000000..c3c2b48ae Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InlineClass.class differ 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 000000000..2e8406b54 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalConstructor.class differ diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalConstructor.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalConstructor.kt new file mode 100644 index 000000000..a1a474467 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalConstructor.kt @@ -0,0 +1 @@ +class InternalConstructor internal constructor (private var myInt : Int) \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalMethod.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalMethod.class new file mode 100644 index 000000000..a4edaafc8 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalMethod.class differ diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalMethod.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalMethod.kt new file mode 100644 index 000000000..8ad206d17 --- /dev/null +++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalMethod.kt @@ -0,0 +1,5 @@ +class InternalMethod { + internal fun take() + { + } +} \ No newline at end of file diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalProperty.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalProperty.class new file mode 100644 index 000000000..4b8dccef2 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalProperty.class differ 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 000000000..2983af706 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/META-INF/main.kotlin_module differ 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 000000000..a046801a3 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MethodImplementation.class differ 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 000000000..e8c60b1dc Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface$DefaultImpls.class differ 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 000000000..cecdbcd32 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface.class differ 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 000000000..66bbbb170 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface2$DefaultImpls.class differ 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 000000000..3f77774fc Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterface2.class differ 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 000000000..34521a364 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/MyInterfaceChild.class differ diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Object.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Object.class new file mode 100644 index 000000000..0fd447986 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/Object.class differ 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 000000000..0927cd7df Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/ParameterName.class differ 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 000000000..00542d8f5 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/RenameExtensionParameterKt.class differ 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 000000000..0a0ff0789 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SealedClass.class differ 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 000000000..43822c967 Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/SetterParameterName.class differ 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/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/tests/logcat-parse-Tests/logcat-parse-Tests.csproj b/tests/logcat-parse-Tests/logcat-parse-Tests.csproj new file mode 100644 index 000000000..de7ff34c1 --- /dev/null +++ b/tests/logcat-parse-Tests/logcat-parse-Tests.csproj @@ -0,0 +1,31 @@ + + + + net472 + false + false + + + + ..\..\bin\TestDebug + + + + ..\..\bin\TestRelease + + + + + + + + + + + + + + + + + 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