Restored interactive mode testing.

At some point I disabled interactive mode testing likely due to
dialogs popping up and prompting the user. This change re-enables
interactive mode testing and moves all dialog pop ups to a class
that can be disabled via a command line flag.  In addition, dialog
behavior can be mocked in unit tests removing duplicate code from
the measurement unit test.

Interactive tests can be disabled from the command line by using
the INTERACTIVE_MODE_TESTS_ENABLED property...

./gradlew -PINTERACTIVE_MODE_TESTS_ENABLED=0 test

Change-Id: I9446359cd38d0b833aa8a020f017c864e4d70e60

Author: Stewart Miles

build.gradle

@@ -172,6 +172,10 @@ project.ext {
   // Whether debug symbols should be included.
   debugEnabled = findProperty("NDEBUG") == null
 
+  // Whether interactive mode tests are enabled.
+  interactiveModeTestsEnabled =
+    findProperty("INTERACTIVE_MODE_TESTS_ENABLED", "1") == "1"
+
   // Directory for intermediate and final build outputs.
   buildDir = new File(scriptDirectory, "build")
   // Directory for testing.
@@ -223,6 +227,8 @@ project.ext {
 
   // Common arguments used to execute Unity in batch mode.
   unityBatchModeArguments = ["-batchmode", "-nographics"]
+  // Common arguments used to execute Unity in interactive mode.
+  unityInteractiveModeArguments = ["-gvh_noninteractive"]
   // Extension for Unity asset metadata files.
   unityMetadataExtension = ".meta"
   // Extension for debug files.
@@ -848,6 +854,28 @@ Task createExecTask(String name, String description,
   return execTask
 }
 
+/*
+ * Create a task that does nothing.
+ *
+ * @param taskName Name of the task to create.
+ * @param summary Description of the task.
+ * @param dependsOn Dependencies of the new task.
+ *
+ * @returns Task that does nothing.
+ */
+Task createEmptyTask(String taskName, String summary,
+                     Iterable<Task> dependsOn) {
+  Task emptyTask = tasks.create(name: taskName,
+                                description: sprintf("(disabled) %s", summary),
+                                dependsOn: dependsOn)
+  emptyTask.with {
+    doLast {
+      logger.info(sprintf("%s disabled", taskName))
+    }
+  }
+  return emptyTask
+}
+
 /*
  * Create a task to execute Unity.
  *
@@ -881,7 +909,11 @@ Task createUnityTask(String taskName, String summary,
   File projectDir = new File(projectContainerDir, projectName)
   List<String> executeArguments = []
 
-  if (batchMode) executeArguments += unityBatchModeArguments
+  if (batchMode) {
+    executeArguments += project.ext.unityBatchModeArguments
+  } else {
+    executeArguments += project.ext.unityInteractiveModeArguments
+  }
   executeArguments += [
     "-logFile", logFile.absolutePath,
     createProject ? "-createProject" : "-projectPath", projectDir.absolutePath]
@@ -896,13 +928,18 @@ Task createUnityTask(String taskName, String summary,
     }
   }
 
-  Task unityTask = createTaskClosure(taskName,
-                                     sprintf(
-                                       "Run Unity to %s (project: %s)",
-                                       summary, projectName),
-                                     dependsOn,
-                                     project.ext.unityExe,
-                                     executeArguments)
+  Task unityTask
+  if (!batchMode && !project.ext.interactiveModeTestsEnabled) {
+    unityTask = createEmptyTask(taskName, summary, dependsOn)
+  } else {
+    unityTask = createTaskClosure(taskName,
+                                  sprintf(
+                                    "Run Unity to %s (project: %s)",
+                                    summary, projectName),
+                                  dependsOn,
+                                  project.ext.unityExe,
+                                  executeArguments)
+  }
   unityTask.with {
     inputs.files fileTree(projectDir)
     outputs.files files(logFile)
@@ -1055,8 +1092,8 @@ Task createUnityTestBatchAndNonBatch(String taskName, String description,
                         createUnityTestTask(
                           sprintf("%sInteractiveMode", taskName),
                           sprintf("%s (Interactive Mode)", description),
-                          dependsOn, testScriptsDir, additionalArguments,
-                          true, createTaskClosure)])
+                          dependsOn, testScriptsDir, additionalArguments, false,
+                          createTaskClosure)])
 }
 
 Task compileResolverLibTests = createXbuildTask(

source/AndroidResolver/AndroidResolver.csproj

@@ -53,7 +53,6 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="src\AlertModal.cs" />
     <Compile Include="src\AndroidAbis.cs" />
     <Compile Include="src\AndroidSdkManager.cs" />
     <Compile Include="src\AndroidXmlDependencies.cs" />

source/AndroidResolver/src/AlertModal.cs

@@ -937,7 +937,7 @@ public void InstallPackages(HashSet<AndroidSdkPackageNameVersion> packages,
             var packagesString = AndroidSdkPackageNameVersion.ListToString(packages);
             // TODO: Remove this dialog when the package manager provides feedback while
             // downloading.
-            bool installPackage = UnityEditor.EditorUtility.DisplayDialog(
+            var installPackage = Dialog.Display(
                 "Missing Android SDK packages",
                 String.Format(
                     "Android SDK packages need to be installed:\n" +
@@ -947,8 +947,8 @@ public void InstallPackages(HashSet<AndroidSdkPackageNameVersion> packages,
                     "which may lead you to think Unity has hung / crashed.  Would you like " +
                     "to wait for these package to be installed?",
                     packagesString),
-                "Yes", cancel: "No");
-            if (!installPackage) {
+                Dialog.Option.Selected0, "Yes", "No");
+            if (installPackage == Dialog.Option.Selected0) {
                 PlayServicesResolver.Log(
                     "User cancelled installation of Android SDK tools package.",
                     level: LogLevel.Warning);

source/AndroidResolver/src/AndroidSdkManager.cs

@@ -702,14 +702,14 @@ private void FindAndResolveConflicts() {
                 // possibly clean up the old versions automatically.
                 if (Dependency.versionComparer.Compare(conflictingVersions[0],
                                                        currentVersion) >= 0) {
-                    if (EditorUtility.DisplayDialog(
+                    if (Dialog.Display(
                             "Resolve Conflict?",
                             warningMessage +
                             "\n" +
                             "The conflicting libraries are older than the library managed by " +
                             "the Android Resolver.  Would you like to remove the old libraries " +
                             "to resolve the conflict?",
-                            "Yes", "No")) {
+                            Dialog.Option.Selected0, "Yes", "No") == Dialog.Option.Selected0) {
                         var deleteFailures = new List<string>();
                         foreach (var filename in conflict.Value) {
                             deleteFailures.AddRange(

source/AndroidResolver/src/GradleResolver.cs

@@ -142,12 +142,12 @@ private static string FindJavaTool(string javaTool)
             if (!String.IsNullOrEmpty(javaHome)) {
                 toolPath = JavaHomeBinaryPath(javaTool);
                 if (String.IsNullOrEmpty(toolPath)) {
-                    EditorUtility.DisplayDialog(
+                    Dialog.Display(
                         "Android Resolver",
                         String.Format("{0} environment references a directory ({1}) that does " +
                                       "not contain {2} which is required to process Android " +
                                       "libraries.", JAVA_HOME, javaHome, javaTool),
-                        "OK");
+                        Dialog.Option.Selected0, "OK");
                     throw new ToolNotFoundException(
                         String.Format("{0} not found, {1} references incomplete Java distribution.",
                                       javaTool, javaHome));
@@ -156,14 +156,14 @@ private static string FindJavaTool(string javaTool)
             } else {
                 toolPath = CommandLine.FindExecutable(javaTool);
                 if (!File.Exists(toolPath)) {
-                    EditorUtility.DisplayDialog(
+                    Dialog.Display(
                         "Android Resolver",
                         String.Format("Unable to find {0} in the system path.  This tool is " +
                                       "required to process Android libraries.  Please configure " +
                                       "your JDK location under the " +
                                       "'Unity Preferences > External Tools' menu.",
                                       javaTool),
-                        "OK");
+                        Dialog.Option.Selected0, "OK");
                     throw new ToolNotFoundException(javaTool + " not found.");
                 }
             }