[generator-Tests] Move lone Tests-Core test to NUnit (#679)

The `make run-test-generator-core` target ran a set of `generator`
unit tests, but only on macOS, *not* Windows.

Move these tests into the `Integration-Tests` NUnit suite for
`generator` so that it runs everywhere.

Author: jpobst

Makefile

@@ -44,7 +44,6 @@ run-all-tests:
 	r=0; \
 	$(MAKE) run-tests                 || r=1 ; \
 	$(MAKE) run-test-jnimarshal       || r=1 ; \
-	$(MAKE) run-test-generator-core   || r=1 ; \
 	$(MAKE) run-ptests                || r=1 ; \
 	exit $$r;
 
@@ -165,31 +164,9 @@ run-test-jnimarshal: bin/Test$(CONFIGURATION)/Java.Interop.Export-Tests.dll bin/
 	$(call run-jnimarshalmethod-gen,"$<")
 	$(call RUN_TEST,$<)
 
-# $(call GEN_CORE_OUTPUT, outdir, suffix, extra)
-define GEN_CORE_OUTPUT
-	-$(RM) -Rf $(1)
-	mkdir -p $(1)
-	$(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 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 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 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,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 tests/generator-Tests/expected -name \*.cs` ; do \

tests/generator-Tests/Integration-Tests/BaseGeneratorTest.cs

@@ -119,10 +119,10 @@ private byte[] ReadAllBytesIgnoringLineEndings (string path)
 			}
 		}
 
-		protected void RunAllTargets (string outputRelativePath, string apiDescriptionFile, string expectedRelativePath, string[] additionalSupportPaths = null)
+		protected void RunAllTargets (string outputRelativePath, string apiDescriptionFile, string expectedRelativePath, string[] additionalSupportPaths = null, string enumFieldsMapFile = null, string enumMethodMapFile = null)
 		{
-			Run (CodeGenerationTarget.XamarinAndroid,   Path.Combine ("out", outputRelativePath),       apiDescriptionFile,     Path.Combine ("expected", expectedRelativePath),        additionalSupportPaths);
-			Run (CodeGenerationTarget.JavaInterop1,     Path.Combine ("out.ji", outputRelativePath),    apiDescriptionFile,     Path.Combine ("expected.ji", expectedRelativePath),     additionalSupportPaths);
+			Run (CodeGenerationTarget.XamarinAndroid,   Path.Combine ("out", outputRelativePath),       apiDescriptionFile,     Path.Combine ("expected", expectedRelativePath),        additionalSupportPaths, enumFieldsMapFile, enumMethodMapFile);
+			Run (CodeGenerationTarget.JavaInterop1,     Path.Combine ("out.ji", outputRelativePath),    apiDescriptionFile,     Path.Combine ("expected.ji", expectedRelativePath),     additionalSupportPaths, enumFieldsMapFile, enumMethodMapFile);
 		}
 
 		protected string FullPath (string path)
@@ -131,20 +131,37 @@ protected string FullPath (string path)
 			return Path.Combine (dir, path.Replace ('/', Path.DirectorySeparatorChar));
 		}
 
-		protected void Run (CodeGenerationTarget target, string outputPath, string apiDescriptionFile, string expectedPath, string[] additionalSupportPaths = null)
+		protected void Run (CodeGenerationTarget target, string outputPath, string apiDescriptionFile, string expectedPath, string[] additionalSupportPaths = null, string enumFieldsMapFile = null, string enumMethodMapFile = null)
 		{
 			Cleanup (outputPath);
 
 			Options.CodeGenerationTarget                        = target;
 			Options.ApiDescriptionFile                          = FullPath (apiDescriptionFile);
 			Options.ManagedCallableWrapperSourceOutputDirectory = FullPath (outputPath);
 
+			if (!string.IsNullOrWhiteSpace (enumFieldsMapFile))
+				Options.EnumFieldsMapFile = FullPath (enumFieldsMapFile);
+
+			if (!string.IsNullOrWhiteSpace (enumMethodMapFile))
+				Options.EnumMethodsMapFile = FullPath (enumMethodMapFile);
+
+			var adjuster_output = Path.Combine (Path.GetTempPath (), "generator-tests");
+			Directory.CreateDirectory (adjuster_output);
+
+			// Put this in a temp folder so it doesn't end up in "expected", which breaks the compare.
+			Options.ApiXmlAdjusterOutput			    = Path.Combine (adjuster_output, Path.GetFileName (apiDescriptionFile) + ".adjusted");
+
 			if (additionalSupportPaths != null) {
 				AdditionalSourceDirectories.AddRange (additionalSupportPaths.Select (p => FullPath (p)));
 			}
 
 			Execute ();
 
+			// Try to clean up after ourselves.
+			try {
+				Directory.Delete (adjuster_output, true);
+			} catch { }
+
 			CompareOutputs (expectedPath, outputPath);
 		}
 	}

tests/generator-Tests/Integration-Tests/Core_ClassParse.cs

@@ -0,0 +1,21 @@
+using System;
+using NUnit.Framework;
+
+namespace generatortests
+{
+	[TestFixture]
+	public class Core_ClassParse : BaseGeneratorTest
+	{
+		[Test]
+		public void GeneratedOK ()
+		{
+			AllowWarnings = true;
+
+			RunAllTargets (
+					outputRelativePath: "Core_ClassParse",
+					apiDescriptionFile: "expected/Core_ClassParse/api.xml",
+					expectedRelativePath: "Core_ClassParse");
+		}
+	}
+}
+

tests/generator-Tests/Integration-Tests/Core_Jar2Xml.cs

@@ -0,0 +1,24 @@
+using System;
+using NUnit.Framework;
+
+namespace generatortests
+{
+	[TestFixture]
+	public class Core_Jar2Xml : BaseGeneratorTest
+	{
+		[Test]
+		public void GeneratedOK ()
+		{
+			AllowWarnings = true;
+
+			RunAllTargets (
+					outputRelativePath: "Core_Jar2Xml",
+					apiDescriptionFile: "expected/Core_Jar2Xml/api.xml",
+					expectedRelativePath: "Core_Jar2Xml",
+					enumFieldsMapFile: "expected/Core_Jar2Xml/fields.xml",
+					enumMethodMapFile: "expected/Core_Jar2Xml/methods.xml"
+					);
+		}
+	}
+}
+

tests/generator-Tests/SupportFiles/Android.Text.SpanTypes.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Android.Text {
+
+	public enum SpanTypes {
+		None = 0
+	}
+}

tests/generator-Tests/SupportFiles/EventHelper.cs

@@ -0,0 +1,43 @@
+using System;
+
+namespace Java.Interop {
+
+	public static class EventHelper {
+		
+		public static void AddEventHandler<TInterface, TImplementor> (
+				ref WeakReference implementor,
+				Func<TImplementor> creator,
+				Action<TInterface> setListener,
+				Action<TImplementor> add)
+			where TImplementor : Java.Lang.Object, TInterface
+		{
+			TImplementor impl = null;
+			if (implementor == null || (impl = (TImplementor) implementor.Target) == null) {
+				impl = creator ();
+				implementor = new WeakReference (impl, true);
+				setListener (impl);
+			}
+			add (impl);
+		}
+
+		public static void RemoveEventHandler<TInterface, TImplementor> (
+				ref WeakReference implementor,
+				Func<TImplementor, bool> empty,
+				Action<TInterface> unsetListener,
+				Action<TImplementor> remove)
+			where TImplementor : Java.Lang.Object, TInterface
+		{
+			TImplementor impl = null;
+			if (implementor == null || (impl = (TImplementor) implementor.Target) == null)
+				return;
+			remove (impl);
+			if (empty (impl)) {
+				unsetListener (impl);
+				impl = null;
+				implementor.Target = null;
+				implementor = null;
+			}
+		}
+	}
+}
+