Changes Requested in Review

microsoft · Jan 30, 2016 · 7ceeb40 · 7ceeb40
1 parent 29111cc
commit 7ceeb40
Show file tree

Hide file tree

Showing 8 changed files with 150 additions and 66 deletions.
diff --git a/src/R.sln b/src/R.sln
@@ -82,7 +82,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CodeCoverage.runsettings = CodeCoverage.runsettings
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.UI.Test", "UnitTests\UI\Microsoft.UI.Test\Microsoft.UI.Test.csproj", "{2BBB937B-EFD3-48AA-BEF8-05E203589D24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VSIntegrationTests", "UnitTests\Microsoft.VSIntegrationTests\Microsoft.VSIntegrationTests.csproj", "{2BBB937B-EFD3-48AA-BEF8-05E203589D24}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...icrosoft.UI.Test/Microsoft.UI.Test.csproj → ...Tests/Microsoft.VSIntegrationTests.csproj b/...icrosoft.UI.Test/Microsoft.UI.Test.csproj → ...Tests/Microsoft.VSIntegrationTests.csproj
@@ -1,86 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\NugetPackages\xunit.runner.visualstudio.2.2.0-beta1-build1144\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\NugetPackages\xunit.runner.visualstudio.2.2.0-beta1-build1144\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{2BBB937B-EFD3-48AA-BEF8-05E203589D24}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.UI.Test</RootNamespace>
-    <AssemblyName>Microsoft.UI.Test</AssemblyName>
+    <RootNamespace>Microsoft.VSIntegrationTests</RootNamespace>
+    <AssemblyName>Microsoft.VSIntegrationTests</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  <Import Project="..\..\R.Settings.targets" />
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>$(RootDirectory)\obj\</BaseIntermediateOutputPath>
+    <BaseOutputPath>$(RootDirectory)\bin\</BaseOutputPath>
+    <IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)\$(AssemblyName)\</IntermediateOutputPath>
+    <OutputPath>$(BaseOutputPath)\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FluentAssertions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\NugetPackages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\NugetPackages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudioTools.MockVsTests.14.0, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\..\..\..\NugetPackages\Microsoft.VisualStudioTools.TestUtilities.14.0.0.0.0\lib\net45\Microsoft.VisualStudioTools.MockVsTests.14.0.dll</HintPath>
+      <HintPath>..\..\..\NugetPackages\Microsoft.VisualStudioTools.TestUtilities.14.0.0.0.0\lib\net45\Microsoft.VisualStudioTools.MockVsTests.14.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudioTools.TestUtilities.14.0, Version=1.0.0.2015, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\..\..\..\NugetPackages\Microsoft.VisualStudioTools.TestUtilities.14.0.0.0.0\lib\net45\Microsoft.VisualStudioTools.TestUtilities.14.0.dll</HintPath>
+      <HintPath>..\..\..\NugetPackages\Microsoft.VisualStudioTools.TestUtilities.14.0.0.0.0\lib\net45\Microsoft.VisualStudioTools.TestUtilities.14.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudioTools.TestUtilities.UI.14.0, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\..\..\..\NugetPackages\Microsoft.VisualStudioTools.TestUtilities.14.0.0.0.0\lib\net45\Microsoft.VisualStudioTools.TestUtilities.UI.14.0.dll</HintPath>
+      <HintPath>..\..\..\NugetPackages\Microsoft.VisualStudioTools.TestUtilities.14.0.0.0.0\lib\net45\Microsoft.VisualStudioTools.TestUtilities.UI.14.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="UIAutomationClient" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="RConstants.cs" />
     <Compile Include="UITests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\PTVS\Common\Tests\Utilities.UI\TestUtilities.UI.csproj">
-      <Project>{e8150ebc-6b62-40bf-bf91-1dc60149b530}</Project>
-      <Name>TestUtilities.UI</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

diff --git a/src/UnitTests/Microsoft.VSIntegrationTests/Properties/AssemblyInfo.cs b/src/UnitTests/Microsoft.VSIntegrationTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Microsoft.UI.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Microsoft.UI.Test")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2bbb937b-efd3-48aa-bef8-05e203589d24")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/...tTests/UI/Microsoft.UI.Test/RConstants.cs → ...icrosoft.VSIntegrationTests/RConstants.cs b/...tTests/UI/Microsoft.UI.Test/RConstants.cs → ...icrosoft.VSIntegrationTests/RConstants.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Microsoft.UI.Test {
+namespace Microsoft.VSIntegrationTests {
 	public class RConstants {
 		public const string TemplateLanguageName = "R";
 		public const string ProjectTemplate_EmptyProject = "EmptyProject.zip";

diff --git a/...UnitTests/UI/Microsoft.UI.Test/UITests.cs → ...s/Microsoft.VSIntegrationTests/UITests.cs b/...UnitTests/UI/Microsoft.UI.Test/UITests.cs → ...s/Microsoft.VSIntegrationTests/UITests.cs
@@ -4,16 +4,18 @@
 using EnvDTE80;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudioTools.TestUtilities.UI;
+using FluentAssertions;
+using System.Diagnostics;
 
-namespace Microsoft.UI.Test {
+namespace Microsoft.VSIntegrationTests {
 	[TestClass]
-	public class UITests {
+	public class Tests {
 		[TestMethod, Priority(1)]
 		[HostType("VSTestHost"), TestCategory("Installed")]
 		public void CreateNewScript() {
 			using (var app = new VisualStudioApp()) {
 				var project = app.CreateProject(
-					RConstants.TemplateLanguageName, RConstants.ProjectTemplate_EmptyProject, 
+					RConstants.TemplateLanguageName, RConstants.ProjectTemplate_EmptyProject,
 					System.IO.Path.GetTempPath(), "RTestProject");
 				app.OpenSolutionExplorer().SelectProject(project);
 				using (var newItem = NewItemDialog.FromDte(app)) {
@@ -25,7 +27,7 @@ public void CreateNewScript() {
 				var document = app.GetDocument("my-script.r");
 				document.SetFocus();
 				document.Type("2 -> a");
-				Assert.AreEqual("2 -> a# R Script", document.Text);
+				document.Text.Should().Be("2 -> a# R Script");
 			}
 		}
 
@@ -35,17 +37,10 @@ public void VerifyTemplateDirectories() {
 			var languageName = RConstants.TemplateLanguageName;
 			using (var app = new VisualStudioApp()) {
 				var sln = (Solution2)app.Dte.Solution;
-
-				foreach (var templateName in new[] {
-					RConstants.ProjectTemplate_EmptyProject,
-				}) {
-					var templatePath = sln.GetProjectTemplate(templateName, languageName);
-					Assert.IsTrue(
-						File.Exists(templatePath) || Directory.Exists(templatePath),
-						string.Format("Cannot find template '{0}' for language '{1}'", templateName, languageName)
-					);
-					Console.WriteLine("Found {0} at {1}", templateName, templatePath);
-				}
+				var paths = (new[] { RConstants.ProjectTemplate_EmptyProject })
+					.Select(n => sln.GetProjectTemplate(n, languageName));
+				var existingPaths = paths.Where(templatePath => File.Exists(templatePath) || Directory.Exists(templatePath));
+				existingPaths.Should().BeEquivalentTo(paths);
 			}
 		}
 	}

diff --git a/...ests/UI/Microsoft.UI.Test/packages.config → ...rosoft.VSIntegrationTests/packages.config b/...ests/UI/Microsoft.UI.Test/packages.config → ...rosoft.VSIntegrationTests/packages.config
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.VisualStudioTools.TestUtilities.14.0" version="0.0.0" targetFramework="net46" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.VisualStudioTools.TestUtilities.14.0" version="0.0.0" targetFramework="net46" />
+  <package id="FluentAssertions" version="4.1.1" targetFramework="net46" />
 </packages>
diff --git a/src/UnitTests/default.14.0.testsettings b/src/UnitTests/default.14.0.testsettings
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="default" id="FBA3FF0E-57FA-403D-BD46-7A1DC123D369" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>Local test runs with the VS 2015 Experimental Hive</Description>
+  <Execution>
+    <Timeouts runTimeout="7200000" testTimeout="300000" />
+    <TestTypeSpecific>
+      <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
+        <AssemblyResolution>
+          <TestDirectory useLoadContext="true" />
+          <RuntimeResolution>
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies" includeSubDirectories="false" />
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\PrivateAssemblies" includeSubDirectories="false" />
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow" includeSubDirectories="false" />
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\Extensions\Microsoft\Web Tools\Editors" includeSubDirectories="false" />
+          </RuntimeResolution>
+          <DiscoveryResolution>
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies" includeSubDirectories="false" />
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\PrivateAssemblies" includeSubDirectories="false" />
+          </DiscoveryResolution>
+        </AssemblyResolution>
+      </UnitTestRunConfig>
+    </TestTypeSpecific>
+    <AgentRule name="LocalMachineDefaultRole">
+    </AgentRule>
+  </Execution>
+  <Properties>
+    <Property name="VSApplication" value="VisualStudio"/>
+    <Property name="VSExecutable" value="devenv"/>
+    <Property name="VSVersion" value="14.0"/>
+    <Property name="VSHive" value=""/>
+    <Property name="VSDebugMixedMode" value="false"/>
+    <Property name="VSLaunchTimeoutInSeconds" value="120"/>
+  </Properties>
+</TestSettings>
diff --git a/src/UnitTests/default.14.0Exp.testsettings b/src/UnitTests/default.14.0Exp.testsettings
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="default" id="FBA3FF0E-57FA-403D-BD46-7A1DC123D369" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>Local test runs with the VS 2015 Experimental Hive</Description>
+  <Execution>
+    <Timeouts runTimeout="7200000" testTimeout="300000" />
+    <TestTypeSpecific>
+      <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
+        <AssemblyResolution>
+          <TestDirectory useLoadContext="true" />
+          <RuntimeResolution>
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies" includeSubDirectories="false" />
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\PrivateAssemblies" includeSubDirectories="false" />
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow" includeSubDirectories="false" />
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\Extensions\Microsoft\Web Tools\Editors" includeSubDirectories="false" />
+          </RuntimeResolution>
+          <DiscoveryResolution>
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies" includeSubDirectories="false" />
+            <Directory path="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\PrivateAssemblies" includeSubDirectories="false" />
+          </DiscoveryResolution>
+        </AssemblyResolution>
+      </UnitTestRunConfig>
+    </TestTypeSpecific>
+    <AgentRule name="LocalMachineDefaultRole">
+    </AgentRule>
+  </Execution>
+  <Properties>
+    <Property name="VSApplication" value="VisualStudio"/>
+    <Property name="VSExecutable" value="devenv"/>
+    <Property name="VSVersion" value="14.0"/>
+    <Property name="VSHive" value="Exp"/>
+    <Property name="VSDebugMixedMode" value="false"/>
+  </Properties>
+</TestSettings>