NaCl settings and completed install scripts.

visual_studio/NativeClientVSAddIn/UnitTests/PluginDebuggerHelperTest.cs

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 namespace UnitTests
 {
   using System;
   using System.Diagnostics;
   using System.IO;
   using System.Reflection;
   using System.Threading;
 
+  using EnvDTE;
   using EnvDTE80;
   using Microsoft.VisualStudio.TestTools.UnitTesting;
 
   using NativeClientVSAddIn;
 
   /// <summary>
   /// This is a test class for PluginDebuggerHelperTest and is intended
   /// to contain all PluginDebuggerHelperTest Unit Tests.
   /// </summary>
   [TestClass]
   public class PluginDebuggerHelperTest
   {
     /// <summary>
-    /// The dummy loop solution is a valid nacl/pepper plug-in VS solution.
+    /// This holds the path to the NaCl solution used in these tests.
+    /// The NaCl solution is a valid nacl/pepper plug-in VS solution.
     /// It is copied into the testing deployment directory and opened in some tests.
     /// Because unit-tests run in any order, the solution should not be written to
     /// in any tests.
     /// </summary>
-    private const string DummyLoopSolution = @"\DummyLoop\DummyLoop.sln";
+    private static string naclSolution;
 
     /// <summary>
     /// The main visual studio object.
     /// </summary>
     private DTE2 dte_ = null;
 
     /// <summary>
     /// Gets or sets the test context which provides information about,
     /// and functionality for the current test run.
     /// </summary>
     public TestContext TestContext { get; set; }
 
     /// <summary>
+    /// This is run one time before any test methods are called. Here we set-up a test-copy of a
+    /// new NaCl solution for use in the tests.
+    /// </summary>
+    /// <param name="testContext">Holds information about the current test run</param>
+    [ClassInitialize]
+    public static void ClassSetup(TestContext testContext)
+    {
+      naclSolution = TestUtilities.CreateBlankValidNaClSolution(
+          "PluginDebuggerHelperTest",
+          testContext);
+    }
+
+    /// <summary>
     /// This is run before each test to create test resources.
     /// </summary>
     [TestInitialize]
     public void TestSetup()
     {
       dte_ = TestUtilities.StartVisualStudioInstance();
     }
 
     /// <summary>
     /// This is run after each test to clean up things created in TestSetup().
@@ skipping 49 matching lines @@
         target.pluginAssembly_ = "fakeAssemblyString";
         target.irtPath_ = "fakeIrtPath";
         target.gdbPath_ = "python.exe";
         target.gdbProcess_ = TestUtilities.StartProcessForKilling(existingGDB, 20);
         string existingInitFileName = Path.GetTempFileName();
         target.gdbInitFileName_ = existingInitFileName;
         target.isProperlyInitialized_ = true;
 
         // Visual studio won't allow adding a breakpoint unless it is associated with
         // an existing file and valid line number, so use DummyLoopSolution.
-        dte_.Solution.Open(TestContext.DeploymentDirectory + DummyLoopSolution);
+        dte_.Solution.Open(naclSolution);
         string fileName = "main.cpp";
         string functionName = "DummyInstance::HandleMessage";
         int lineNumber = 35;
         dte_.Debugger.Breakpoints.Add(Function: functionName);
         dte_.Debugger.Breakpoints.Add(Line: lineNumber, File: fileName);
 
         target.AttachNaClGDB(null, new PluginDebuggerHelper.PluginFoundEventArgs(0));
 
         Assert.IsTrue(File.Exists(target.gdbInitFileName_), "Init file not written");
 
@@ skipping 177 matching lines @@
       try
       {
         target.LoadProjectSettings();
         Assert.Fail("Initializing with no loaded solution shouldn't succeed");
       }
       catch (ArgumentOutOfRangeException)
       {
         // This is expected for a correct implementation.
       }
 
-      dte_.Solution.Open(TestContext.DeploymentDirectory + DummyLoopSolution);
+      dte_.Solution.Open(naclSolution);
 
       // Setting the start-up project to a non-cpp project should make loading fail.
-      string badProjectUniqueName = @"NotNaCl\NotNaCl.csproj";
-      object[] badStartupProj = { badProjectUniqueName };
+      object[] badStartupProj = { TestUtilities.NotNaClProjectUniqueName };
       dte_.Solution.SolutionBuild.StartupProjects = badStartupProj;
       Assert.IsFalse(target.LoadProjectSettings());
       Assert.IsFalse(target.isProperlyInitialized_);
 
       // Setting the start-up project to correct C++ project, but also setting the platform
       // to non-nacl/pepper should make loading fail.
-      string projectUniqueName = @"DummyLoop\DummyLoop.vcxproj";
-      object[] startupProj = { projectUniqueName };
+      object[] startupProj = { TestUtilities.BlankNaClProjectUniqueName };
       dte_.Solution.SolutionBuild.StartupProjects = startupProj;
-      TestUtilities.SetSolutionConfiguration(dte_, projectUniqueName, "Debug", "Win32");
+      TestUtilities.SetSolutionConfiguration(
+          dte_, TestUtilities.BlankNaClProjectUniqueName, "Debug", "Win32");
       Assert.IsFalse(target.LoadProjectSettings());
       Assert.IsFalse(target.isProperlyInitialized_);
-
+      
       // Setting the platform to NaCl should make loading succeed.
       TestUtilities.SetSolutionConfiguration(
-          dte_, projectUniqueName, "Debug", Strings.NaClPlatformName);
+          dte_, TestUtilities.BlankNaClProjectUniqueName, "Debug", Strings.NaClPlatformName);
       Assert.IsTrue(target.LoadProjectSettings());
       Assert.IsTrue(target.isProperlyInitialized_);
       Assert.AreEqual(
-          target.projectPlatformType_,
-          PluginDebuggerHelper_Accessor.ProjectPlatformType.NaCl);
-      Assert.AreEqual(
-          target.pluginProjectDirectory_,
-          TestContext.DeploymentDirectory + @"\DummyLoop\DummyLoop\");
-      Assert.AreEqual(
-          target.pluginAssembly_,
-          TestContext.DeploymentDirectory + @"\DummyLoop\DummyLoop\NaCl\Debug\DummyLoop.nexe");
-      Assert.AreEqual(
-          target.pluginOutputDirectory_,
-          TestContext.DeploymentDirectory + @"\DummyLoop\DummyLoop\NaCl\Debug\");
-      Assert.AreEqual(target.sdkRootDirectory_, expectedSDKRootDir);
-      Assert.AreEqual(target.webServerExecutable_, "python.exe");
-      ////Assert.AreEqual(target._webServerArguments, "");
-      ////Assert.AreEqual(target._gdbPath, "");
+          PluginDebuggerHelper_Accessor.ProjectPlatformType.NaCl,
+          target.projectPlatformType_);
+
+      string projectDir = Path.Combine(
+          Path.GetDirectoryName(naclSolution),
+          Path.GetDirectoryName(TestUtilities.BlankNaClProjectUniqueName)) + @"\";
+      string outputDir = Path.Combine(projectDir, "newlib") + @"\";
+      string assembly = Path.Combine(outputDir, TestUtilities.BlankNaClProjectName + ".nexe");
+
+      Assert.AreEqual(projectDir, target.pluginProjectDirectory_);
+      Assert.AreEqual(outputDir, target.pluginOutputDirectory_);
+      Assert.AreEqual(assembly, target.pluginAssembly_);
+
+      Assert.AreEqual(expectedSDKRootDir, target.sdkRootDirectory_);
+      Assert.AreEqual("python.exe", target.webServerExecutable_);
 
       // Setting platform to Pepper should make succeed.
       TestUtilities.SetSolutionConfiguration(
-          dte_, projectUniqueName, "Debug", Strings.PepperPlatformName);
+          dte_, TestUtilities.BlankNaClProjectUniqueName, "Debug", Strings.PepperPlatformName);
       Assert.IsTrue(target.LoadProjectSettings());
       Assert.IsTrue(target.isProperlyInitialized_);
       Assert.AreEqual(
-          target.projectPlatformType_,
-          PluginDebuggerHelper_Accessor.ProjectPlatformType.Pepper);
-      Assert.AreEqual(
-          target.pluginProjectDirectory_,
-          TestContext.DeploymentDirectory + @"\DummyLoop\DummyLoop\");
-      Assert.AreEqual(
-          target.pluginAssembly_,
-          TestContext.DeploymentDirectory + @"\DummyLoop\Debug\PPAPI\DummyLoop.dll");
-      Assert.AreEqual(
-          target.pluginOutputDirectory_,
-          TestContext.DeploymentDirectory + @"\DummyLoop\Debug\PPAPI\");
-      Assert.AreEqual(target.sdkRootDirectory_, expectedSDKRootDir);
-      Assert.AreEqual(target.webServerExecutable_, "python.exe");
-      ////Assert.AreEqual(target._webServerArguments, "");
-      ////Assert.AreEqual(target._gdbPath, "");
+          PluginDebuggerHelper_Accessor.ProjectPlatformType.Pepper,
+          target.projectPlatformType_);
+
+      outputDir = Path.Combine(projectDir, "win") + @"\";
+      assembly = Path.Combine(outputDir, TestUtilities.BlankNaClProjectName + ".dll");
+      Assert.AreEqual(projectDir, target.pluginProjectDirectory_);
+      Assert.AreEqual(outputDir, target.pluginOutputDirectory_);
+      Assert.AreEqual(assembly, target.pluginAssembly_);
+
+      Assert.AreEqual(expectedSDKRootDir, target.sdkRootDirectory_);
+      Assert.AreEqual("python.exe", target.webServerExecutable_);
     }
 
     /// <summary>
     /// Checks that VS properly attaches debugger.
     /// </summary>
     [TestMethod]
     [DeploymentItem("NativeClientVSAddIn.dll")]
     public void AttachVSDebuggerTest()
     {
-      using (Process dummyProc = TestUtilities.StartProcessForKilling("DummyProc", 20))
+      using (System.Diagnostics.Process dummyProc = TestUtilities.StartProcessForKilling(
+          "DummyProc", 20))
       {
         try
         {
           PluginDebuggerHelper_Accessor target = new PluginDebuggerHelper_Accessor(dte_);
           target.projectPlatformType_ = PluginDebuggerHelper_Accessor.ProjectPlatformType.Pepper;
           target.isProperlyInitialized_ = true;
 
-          target.AttachVSDebugger(
-              null,
-              new NativeClientVSAddIn.PluginDebuggerHelper.PluginFoundEventArgs((uint)dummyProc.Id));
+          var pluginFoundArgs = new NativeClientVSAddIn.PluginDebuggerHelper.PluginFoundEventArgs(
+              (uint)dummyProc.Id);
+          target.AttachVSDebugger(null, pluginFoundArgs);
 
           bool isBeingDebugged = false;
           foreach (EnvDTE.Process proc in dte_.Debugger.DebuggedProcesses)
           {
             if (proc.ProcessID == dummyProc.Id)
             {
               isBeingDebugged = true;
             }
           }
 
@@ skipping 101 matching lines @@
         for (int repeat = 0; repeat < 20; repeat++)
         {
           if (result != null &&
               result.Contains(successMessage) &&
               result.Contains(stderrMessage) &&
               result.Contains(TestContext.DeploymentDirectory))
           {
             break;
           }
 
-          Thread.Sleep(500);
+          System.Threading.Thread.Sleep(500);
           result = TestUtilities.GetPaneText(target.webServerOutputPane_);
         }
 
         Assert.IsFalse(string.IsNullOrEmpty(result), "Nothing printed to output pane");
         StringAssert.Contains(
             result,
             successMessage,
             "Executable did not successfully run given arguments");
         StringAssert.Contains(
             result,
@@ skipping 65 matching lines @@
 
       // Wait for results to arrive for up to 10 seconds, checking every 0.5 seconds.
       for (int repeat = 0; repeat < 20; repeat++)
       {
         if (result != null &&
             result.Contains(successMessage))
         {
           break;
         }
 
-        Thread.Sleep(500);
+        System.Threading.Thread.Sleep(500);
         result = TestUtilities.GetPaneText(target.webServerOutputPane_);
       }
 
       StringAssert.Contains(result, successMessage, "Message failed to print");
     }
   }
 }