Refactored Android Resolver integration test.

* Migrated common test framework code from the Android Resolver's
  integration test to the shared IntegrationTester.
* Moved the Android Resolver integration test into a DLL so that
  it's possible to compile the project ahead of time and remove
  all of the brittle usage of reflection.

Bug: 150471207
Change-Id: Ib698c3bbf312e2b197a3c30b042fb3250d556af0

Author: Stewart Miles

build.gradle

@@ -692,6 +692,7 @@ Task createXbuildTask(String taskName, String taskDescription,
            sprintf("/property:OutputPath=%s%s",
                    binaryOutputDir.absolutePath,
                    File.separator),
+           "/verbosity:quiet",
            projectToBuild.absolutePath])
   }
   task.ext.buildDir = outputDir
@@ -1017,13 +1018,16 @@ Task createSetupUnityProjectTask(String taskName, Iterable<Task> dependsOn,
  * @param additionalArguments Additional arguments to pass to Unity when
  *   executing the test.
  * @param batchMode Whether to execute Unity in batch mode.
+ * @param editorAssets Files to copy into the Assets/Editor folder in the
+ *   project.
  * @param createTaskClosure Optional task used to start Unity, this must
  *   conform to tasks.create(name, description, type, dependsOn).
  *
  * @returns Test task.
  */
 Task createUnityTestTask(String taskName, String description,
                          Iterable<Task> dependsOn, File testScriptsDir,
+                         Iterable<File> editorAssets,
                          Iterable<String> additionalArguments,
                          Boolean batchMode, createTaskClosure) {
   List<File> inputFiles = fileTree(testScriptsDir).collect {
@@ -1043,8 +1047,22 @@ Task createUnityTestTask(String taskName, String description,
     inputFiles, testScriptsDir, setupTestProject.ext.projectDir,
     [setupTestProject], null)
 
+  // Task which copies editor scripts into the project.
+  Task copyEditorAssets = tasks.create(
+    name: sprintf("copyEditorAssetsFor%s", taskName),
+    description: sprintf("Copy the editor assets into the %s Unity project.",
+                         taskName),
+    type: Copy,
+    dependsOn: [setupTestProject])
+  copyEditorAssets.with {
+    from editorAssets
+    into new File(new File(setupTestProject.ext.projectDir, "Assets"),
+                  "Editor")
+  }
+
   // Create the test task.
-  Task testTask = createUnityTask(taskName, "test", [copyTestScripts],
+  Task testTask = createUnityTask(taskName, "test",
+                                  [copyTestScripts, copyEditorAssets],
                                   setupTestProject.ext.projectDir.name,
                                   setupTestProject.ext.containerDir,
                                   additionalArguments, batchMode,
@@ -1070,6 +1088,8 @@ Task createUnityTestTask(String taskName, String description,
  * @param dependsOn Dependencies of the new task.
  * @param testScriptsDir Directory containing scripts to copy into the test
  *   project and execute for testing.
+ * @param editorAssets Files to copy into the Assets/Editor folder in the
+ *   project.
  * @param additionalArguments Additional arguments to pass to Unity.
  * @param createTaskClosure Optional task used to start Unity, this must
  *   conform to tasks.create(name, description, type, dependsOn).
@@ -1079,6 +1099,7 @@ Task createUnityTestTask(String taskName, String description,
 Task createUnityTestBatchAndNonBatch(String taskName, String description,
                                      Iterable<Task> dependsOn,
                                      File testScriptsDir,
+                                     Iterable<File> editorAssets,
                                      Iterable<String> additionalArguments,
                                      createTaskClosure) {
   return tasks.create(name: taskName,
@@ -1087,13 +1108,13 @@ Task createUnityTestBatchAndNonBatch(String taskName, String description,
                         createUnityTestTask(
                           sprintf("%sBatchMode", taskName),
                           sprintf("%s (Batch Mode)", description),
-                          dependsOn, testScriptsDir, additionalArguments, true,
-                          createTaskClosure),
+                          dependsOn, testScriptsDir, editorAssets,
+                          additionalArguments, true, createTaskClosure),
                         createUnityTestTask(
                           sprintf("%sInteractiveMode", taskName),
                           sprintf("%s (Interactive Mode)", description),
-                          dependsOn, testScriptsDir, additionalArguments, false,
-                          createTaskClosure)])
+                          dependsOn, testScriptsDir, editorAssets,
+                          additionalArguments, false, createTaskClosure)])
 }
 
 Task compileResolverLibTests = createXbuildTask(
@@ -1649,15 +1670,19 @@ createUnityTestBatchAndNonBatch(
   ("Imports the plugin into a Unity project and verifies all " +
    "components can be activated by the Version Handler."),
   [buildPlugin],
-  new File(project.ext.scriptDirectory,"source/VersionHandlerImpl/test/activation"), [], null)
+  new File(project.ext.scriptDirectory,
+           "source/VersionHandlerImpl/test/activation"),
+  [], [], null)
 
 // Launch the test via a script that runs a local web server.
 createUnityTestBatchAndNonBatch(
   "testVersionHandlerWebRequest",
   ("Imports the plugin into a Unity project tests the PortableWebRequest " +
    "class."),
   [buildPlugin],
-  new File(project.ext.scriptDirectory, "source/VersionHandlerImpl/test/webrequest"), [],
+  new File(project.ext.scriptDirectory,
+           "source/VersionHandlerImpl/test/webrequest"),
+  [], [],
   { String name, String description, Iterable<Task> depends,
     File executable, Iterable<String> args ->
       Iterable<String> runnerArgs = [executable.absolutePath] + args
@@ -1678,7 +1703,11 @@ createUnityTestBatchAndNonBatch(
   ("Imports the plugin into a Unity project and tests reflection " +
    "methods."),
   [buildPlugin],
-  new File(project.ext.scriptDirectory, "source/VersionHandler/test/reflection"), [], null)
+  new File(project.ext.scriptDirectory,
+           "source/VersionHandler/test/reflection"),
+  [],
+  [],
+  null)
 
 Task compileIntegrationTester = createXbuildTask(
   "compileIntegrationTester",
@@ -1692,14 +1721,66 @@ Task compileIntegrationTester = createXbuildTask(
    new File("Google.IntegrationTester.dll.mdb")],
   [compileVersionHandler])
 
-createUnityTestBatchAndNonBatch(
-  "testAndroidResolverAsyncResolve",
+/*
+ * Creates a task which compiles and run a Unity integration test.
+ *
+ * @param taskName Name of the test.
+ * @param description Description of the task.
+ * @param dependsOn Dependencies of the new task.
+ * @param integrationTestProject Project within
+ *   project.ext.pluginSolutionFile that contains the integration test.
+ * @param integrationTestProjectSources Source files integrationTestProject
+ *  requires.
+ * @param integrationTestProjectOutputs Assemblies generated by the
+ *   integrationTestProject.
+ * @param unityProjectDir Directory containing a assets to copy into the
+ *   integration test project.
+ * @param arguments Additional arguments for Unity when running the integration
+ *   test.
+ */
+Task createUnityIntegrationTest(String taskName,
+                                String description,
+                                Iterable<Task> dependsOn,
+                                String integrationTestProject,
+                                Iterable<File> integrationTestProjectSources,
+                                Iterable<File> integrationTestProjectOutputs,
+                                File unityProjectDir,
+                                Iterable<String> arguments) {
+  Task compileIntegrationTest = createXbuildTask(
+    sprintf("compile%s", integrationTestProject),
+    sprintf("Compile %s for %s", integrationTestProject, taskName),
+    project.ext.pluginSolutionFile,
+    integrationTestProject,
+    integrationTestProjectSources,
+    new File(project.ext.buildDir, integrationTestProject),
+    integrationTestProjectOutputs,
+    [compileIntegrationTester] + dependsOn)
+
+  createUnityTestBatchAndNonBatch(
+    taskName,
+    description,
+    [buildPlugin],
+    unityProjectDir,
+    compileIntegrationTest.outputs.files +
+    compileIntegrationTester.outputs.files,
+    arguments, null)
+}
+
+createUnityIntegrationTest(
+  "testAndroidResolverIntegrationTests",
   ("Imports the plugin into a Unity project, runs Android resolution with " +
    "a combination of dependencies added via the programmatic API and via " +
    "XML files, verifying all dependencies resolve successfully."),
-  [buildPlugin],
-  new File(project.ext.scriptDirectory, "source/AndroidResolver/test/resolve_async"),
-  ["-buildTarget", "android"], null)  // TODO: Move this into the test!?
+  [compileAndroidResolver],
+  "AndroidResolverIntegrationTests",
+  fileTree(new File(new File(project.ext.pluginSourceDir, "AndroidResolver"),
+                    "test")),
+  [new File("Google.AndroidResolverIntegrationTests.dll"),
+   new File("Google.AndroidResolverIntegrationTests.dll.mdb")],
+  new File(
+    project.ext.scriptDirectory,
+    "source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject"),
+  ["-buildTarget", "android"])
 
 task cleanTests(type: Delete) {
   description "Clean test directories."

source/AndroidResolver/Properties/AssemblyInfo.cs

@@ -55,4 +55,5 @@
 
 // Uses XmlDependencies class.
 [assembly: InternalsVisibleTo("Google.IOSResolver")]
-
+// Uses all classes for testing.
+[assembly: InternalsVisibleTo("Google.AndroidResolverIntegrationTests")]

source/AndroidResolver/test/AndroidResolverIntegrationTests.csproj

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6CB19B5A-371A-5E50-A3F7-E24F1696D501}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Google</RootNamespace>
+    <AssemblyName>Google.AndroidResolverIntegrationTests</AssemblyName>
+    <ReleaseVersion>1.2</ReleaseVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;UNITY_EDITOR</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>DEBUG;UNITY_EDITOR</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+  </PropertyGroup>
+    <PropertyGroup>
+        <UnityHintPath>..\..\unity_dlls</UnityHintPath>
+   </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="UnityEditor">
+        <HintPath>$(UnityHintPath)/UnityEditor.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine">
+        <HintPath>$(UnityHintPath)/UnityEngine.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Folder Include="src\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="src\AndroidResolverIntegrationTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\VersionHandler\VersionHandler.csproj">
+      <Project>{5378B37A-887E-49ED-A8AE-42FA843AA9DC}</Project>
+      <Name>VersionHandler</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\VersionHandlerImpl\VersionHandlerImpl.csproj">
+      <Project>{1E162334-8EA2-440A-9B3A-13FD8FE5C22E}</Project>
+      <Name>VersionHandlerImpl</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\IntegrationTester\IntegrationTester.csproj">
+      <Project>{DBD8D4D9-61AC-4E75-8CDC-CABE7033A040}</Project>
+      <Name>IntegrationTester</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\AndroidResolver.csproj">
+      <Project>{82EEDFBE-AFE4-4DEF-99D9-BC929747DD9A}</Project>
+      <Name>AndroidResolver</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>