Merge remote-tracking branch 'upstream/master' into depItemNetCore

src/Adapter/MSTest.CoreAdapter/MSTestExecutor.cs

@@ -44,7 +44,6 @@ public MSTestExecutor()
 
         public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
         {
-            // System.Diagnostics.Debugger.Launch();
             ValidateArg.NotNull(frameworkHandle, "frameworkHandle");
             ValidateArg.NotNullOrEmpty(tests, "tests");
 
@@ -77,7 +76,6 @@ public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrame
 
         public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrameworkHandle frameworkHandle)
         {
-            // System.Diagnostics.Debugger.Launch();
             ValidateArg.NotNull(frameworkHandle, "frameworkHandle");
             ValidateArg.NotNullOrEmpty(sources, "sources");
 

src/Adapter/PlatformServices.Shared/netstandard1.3/ns13TestRunDirectories.cs → src/Adapter/PlatformServices.Desktop/Deployment/DesktopTestRunDirectories.cs

@@ -7,13 +7,13 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Dep
     using System.Diagnostics;
     using System.IO;
 
-#pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName
-
     /// <summary>
     /// The test run directories.
     /// </summary>
     [Serializable]
+#pragma warning disable SA1649 // File name must match first type name
     public class TestRunDirectories
+#pragma warning restore SA1649 // File name must match first type name
     {
         /// <summary>
         /// The default deployment root directory. We do not want to localize it.

src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj

@@ -63,9 +63,6 @@
     <Compile Include="..\PlatformServices.Shared\netstandard1.3\ns13DeploymentItem.cs">
       <Link>Deployment\ns13DeploymentItem.cs</Link>
     </Compile>
-    <Compile Include="..\PlatformServices.Shared\netstandard1.3\ns13TestRunDirectories.cs">
-      <Link>Deployment\ns13TestRunDirectories.cs</Link>
-    </Compile>
     <Compile Include="..\PlatformServices.Shared\netstandard1.3\Resources\Resource.Designer.cs">
       <Link>Resources\Resource.Designer.cs</Link>
       <AutoGen>True</AutoGen>
@@ -98,6 +95,7 @@
     <Compile Include="Data\TestDataConnectionSql.cs" />
     <Compile Include="Data\XmlDataConnection.cs" />
     <Compile Include="Deployment\AssemblyLoadWorker.cs" />
+    <Compile Include="Deployment\DesktopTestRunDirectories.cs" />
     <Compile Include="Friends.cs" />
     <Compile Include="Utilities\AppDomainWrapper.cs" />
     <Compile Include="Utilities\IAppDomain.cs" />

src/Adapter/PlatformServices.Desktop/Utilities/DesktopDeploymentUtility.cs

@@ -61,7 +61,7 @@ public override void AddDeploymentItemsBasedOnMsTestSetting(string testSource, I
         /// </summary>
         /// <param name="baseDirectory">The base directory.</param>
         /// <returns>Root deployment directory.</returns>
-        protected override string GetRootDeploymentDirectory(string baseDirectory)
+        public override string GetRootDeploymentDirectory(string baseDirectory)
         {
             string dateTimeSufix = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss", DateTimeFormatInfo.InvariantInfo);
             string directoryName = string.Format(CultureInfo.CurrentCulture, Resource.TestRunName, DeploymentFolderPrefix, Environment.UserName, dateTimeSufix);

src/Adapter/PlatformServices.NetCore/Deployment/NetCoreTestRunDirectories.cs

@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment
+{
+    using System;
+    using System.Diagnostics;
+    using System.IO;
+
+#pragma warning disable SA1649 // SA1649FileNameMustMatchTypeName
+
+    /// <summary>
+    /// The test run directories.
+    /// </summary>
+    [Serializable]
+    public class TestRunDirectories
+    {
+        /// <summary>
+        /// The default deployment root directory. We do not want to localize it.
+        /// </summary>
+        internal const string DefaultDeploymentRootDirectory = "TestResults";
+
+        /// <summary>
+        /// The deployment in directory suffix.
+        /// </summary>
+        internal const string DeploymentInDirectorySuffix = "In";
+
+        public TestRunDirectories(string rootDirectory)
+        {
+            Debug.Assert(!string.IsNullOrEmpty(rootDirectory), "rootDirectory");
+
+            this.RootDeploymentDirectory = rootDirectory;
+        }
+
+        /// <summary>
+        /// Gets or sets the root deployment directory
+        /// </summary>
+        public string RootDeploymentDirectory { get; set; }
+
+        /// <summary>
+        /// Gets the In directory
+        /// </summary>
+        public string InDirectory
+        {
+            get
+            {
+                return Path.Combine(this.RootDeploymentDirectory, DeploymentInDirectorySuffix);
+            }
+        }
+
+        /// <summary>
+        /// Gets the Out directory
+        /// </summary>
+        public string OutDirectory
+        {
+            get
+            {
+                return Directory.GetCurrentDirectory();
+            }
+        }
+
+        /// <summary>
+        /// Gets In\MachineName directory
+        /// </summary>
+        public string InMachineNameDirectory
+        {
+            get
+            {
+                return Path.Combine(Path.Combine(this.RootDeploymentDirectory, DeploymentInDirectorySuffix), Environment.MachineName);
+            }
+        }
+    }
+}

src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj

@@ -19,6 +19,7 @@
     <Compile Include="..\PlatformServices.Shared\netstandard1.0\MarshalByRefObject.cs" Link="MarshalByRefObject.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.0\ns10RecursiveDirectoryPath.cs" Link="ns10RecursiveDirectoryPath.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.0\SerializableAttribute.cs" Link="SerializableAttribute.cs" />
+    <Compile Include="Deployment\NetCoreTestRunDirectories.cs" />
     <Compile Include="Services\NetCoreFileOperations.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.0\Services\ns10DiaSessionOperations.cs" Link="Services\ns10DiaSessionOperations.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.0\Services\ns10MSTestSettingsProvider.cs" Link="Services\ns10MSTestSettingsProvider.cs" />
@@ -31,7 +32,6 @@
     <Compile Include="..\PlatformServices.Shared\netstandard1.0\Utilities\ns10Validate.cs" Link="Utilities\ns10Validate.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.3\Extensions\ns13ExceptionExtensions.cs" Link="Extensions\ns13ExceptionExtensions.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.3\ns13DeploymentItem.cs" Link="Deployment\ns13DeploymentItem.cs" />
-    <Compile Include="..\PlatformServices.Shared\netstandard1.3\ns13TestRunDirectories.cs" Link="Deployment\ns13TestRunDirectories.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.3\Services\ns13MSTestAdapterSettings.cs" Link="Services\ns13MSTestAdapterSettings.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.3\Services\ns13TestDeployment.cs" Link="Services\ns13TestDeployment.cs" />
     <Compile Include="..\PlatformServices.Shared\netstandard1.3\Services\ns13TraceListener.cs" Link="Services\ns13TraceListener.cs" />

src/Adapter/PlatformServices.NetCore/Services/NetCoreFileOperations.cs

@@ -4,7 +4,6 @@
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
 {
     using System;
-    using System.Collections.Generic;
     using System.IO;
     using System.Reflection;
     using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;

src/Adapter/PlatformServices.NetCore/Utilities/NetCoreDeploymentUtility.cs

@@ -34,16 +34,14 @@ public DeploymentUtility(DeploymentItemUtility deploymentItemUtility, AssemblyUt
 
         public override void AddDeploymentItemsBasedOnMsTestSetting(string testSource, IList<DeploymentItem> deploymentItems, List<string> warnings)
         {
-            EqtTrace.Info("Adding the test source directory to the deploymentitems list");
-            this.DeploymentItemUtility.AddDeploymentItem(deploymentItems, new DeploymentItem(Path.GetDirectoryName(testSource)));
         }
 
         /// <summary>
         /// Get root deployment directory
         /// </summary>
         /// <param name="baseDirectory">The base directory.</param>
         /// <returns>Root deployment directory.</returns>
-        protected override string GetRootDeploymentDirectory(string baseDirectory)
+        public override string GetRootDeploymentDirectory(string baseDirectory)
         {
             string dateTimeSufix = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss", DateTimeFormatInfo.InvariantInfo);
             string directoryName = string.Format(CultureInfo.CurrentCulture, Resource.TestRunName, DeploymentFolderPrefix, Environment.GetEnvironmentVariable("USERNAME") ?? Environment.GetEnvironmentVariable("USER"), dateTimeSufix);

src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs

@@ -88,6 +88,31 @@ public TestRunDirectories CreateDeploymentDirectories(IRunContext runContext)
         /// <param name="warnings">Warnings.</param>
         public abstract void AddDeploymentItemsBasedOnMsTestSetting(string testSource, IList<DeploymentItem> deploymentItems, List<string> warnings);
 
+        /// <summary>
+        /// Get the parent test results directory where deployment will be done.
+        /// </summary>
+        /// <param name="runContext">The run context.</param>
+        /// <returns>The test results directory.</returns>
+        public string GetTestResultsDirectory(IRunContext runContext)
+        {
+            var resultsDirectory = (!string.IsNullOrEmpty(runContext?.TestRunDirectory)) ?
+                runContext.TestRunDirectory : null;
+
+            if (string.IsNullOrEmpty(resultsDirectory))
+            {
+                resultsDirectory = Path.GetFullPath(Path.Combine(Path.GetTempPath(), TestRunDirectories.DefaultDeploymentRootDirectory));
+            }
+
+            return resultsDirectory;
+        }
+
+        /// <summary>
+        /// Get root deployment directory
+        /// </summary>
+        /// <param name="baseDirectory">The base directory.</param>
+        /// <returns>Root deployment directory.</returns>
+        public abstract string GetRootDeploymentDirectory(string baseDirectory);
+
         internal string GetConfigFile(string testSource)
         {
             string configFile = null;
@@ -249,13 +274,6 @@ protected IEnumerable<string> Deploy(IList<DeploymentItem> deploymentItems, stri
             return warnings;
         }
 
-        /// <summary>
-        /// Get root deployment directory
-        /// </summary>
-        /// <param name="baseDirectory">The base directory.</param>
-        /// <returns>Root deployment directory.</returns>
-        protected abstract string GetRootDeploymentDirectory(string baseDirectory);
-
         // Find dependencies of test deployment items
         protected abstract void AddDependenciesOfDeploymentItem(string deploymentItemFile, IList<string> filesToDeploy, IList<string> warnings);
 
@@ -448,23 +466,5 @@ private bool IsDeploymentItemSourceADirectory(DeploymentItem deploymentItem, str
 
             return false;
         }
-
-        /// <summary>
-        /// Get the parent test results directory where deployment will be done.
-        /// </summary>
-        /// <param name="runContext">The run context.</param>
-        /// <returns>The test results directory.</returns>
-        private string GetTestResultsDirectory(IRunContext runContext)
-        {
-            var resultsDirectory = (!string.IsNullOrEmpty(runContext?.TestRunDirectory)) ?
-                runContext.TestRunDirectory : null;
-
-            if (string.IsNullOrEmpty(resultsDirectory))
-            {
-                resultsDirectory = Path.GetFullPath(Path.Combine(Path.GetTempPath(), TestRunDirectories.DefaultDeploymentRootDirectory));
-            }
-
-            return resultsDirectory;
-        }
     }
 }

test/UnitTests/PlatformServices.NetCore.Unit.Tests/Utilities/NetCoreDeploymentUtilityTests.cs

@@ -159,57 +159,6 @@ public void DeployShouldDeployContentsOfADirectoryIfSpecified()
                 Times.Once);
         }
 
-        [TestMethod]
-        public void DeployShouldDeployPdbWithSourceIfPdbFileIsPresentInSourceDirectory()
-        {
-            TestRunDirectories testRunDirectories;
-            var testCase = this.GetTestCaseAndTestRunDirectories(DefaultDeploymentItemPath, DefaultDeploymentItemOutputDirectory, out testRunDirectories);
-
-            // Setup mocks.
-            DeploymentItem sampleDepItem = new DeploymentItem(testCase.Source);
-            IList<DeploymentItem> listOfFiles= new List<DeploymentItem> { sampleDepItem };
-            List<String> listOfFilesInDir = new List<string>() { testCase.Source };
-
-            this.mockFileUtility.Setup(fu => fu.DoesDirectoryExist(It.Is<string>(s => !s.EndsWith(".dll")))).Returns(true);
-            this.mockFileUtility.Setup(fu => fu.DoesFileExist(It.IsAny<string>())).Returns(true);
-            this.mockFileUtility.Setup(fu => fu.AddFilesFromDirectory(It.Is<string>( s => s.Contains("netcore")), It.IsAny<Func<string, bool>>(), It.IsAny<bool>())).Returns(listOfFilesInDir);
-            string warning;
-            this.mockFileUtility.Setup(fu => fu.CopyFileOverwrite(It.IsAny<string>(), It.IsAny<string>(), out warning))
-                .Returns(
-                    (string x, string y, string z) =>
-                        {
-                            z = string.Empty;
-                            return y;
-                        });
-
-            // Act.
-            Assert.IsTrue(
-                this.deploymentUtility.Deploy(
-                    new List<TestCase> { testCase },
-                    testCase.Source,
-                    this.mockRunContext.Object,
-                    this.mocktestExecutionRecorder.Object,
-                    testRunDirectories));
-
-            // Assert.
-            var sourceFile = typeof(DeploymentUtilityTests).GetTypeInfo().Assembly.GetName().Name + ".dll";
-            var pdbFile = typeof(DeploymentUtilityTests).GetTypeInfo().Assembly.GetName().Name + ".pdb";
-            this.mockFileUtility.Verify(
-                fu =>
-                fu.CopyFileOverwrite(
-                    It.Is<string>(s => s.Contains(sourceFile)),
-                    Path.Combine(testRunDirectories.OutDirectory, sourceFile),
-                    out warning),
-                Times.Once);
-            this.mockFileUtility.Verify(
-                fu =>
-                fu.CopyFileOverwrite(
-                    It.Is<string>(s => s.Contains(pdbFile)),
-                    Path.Combine(testRunDirectories.OutDirectory, pdbFile),
-                    out warning),
-                Times.Once);
-        }
-
         #endregion
 
         #region private methods

test/UnitTests/PlatformServices.Shared.Unit.Tests/netstandard1.0/Utilities/ns10DeploymentUtilityTests.cs

@@ -82,7 +82,7 @@ public void CreateDeploymentDirectoriesShouldCreateDeploymentDirectoryFromRunCon
             // Assert.
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(RootDeploymentDirectory), Times.Once);
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentInDirectorySuffix)), Times.Once);
-            this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentOutDirectorySuffix)), Times.Once);
+            this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(RootDeploymentDirectory), Times.Once);
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentInDirectorySuffix), Environment.MachineName)), Times.Once);
         }
 
@@ -100,7 +100,7 @@ public void CreateDeploymentDirectoriesShouldCreateDefaultDeploymentDirectoryIfT
             // Assert.
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(RootDeploymentDirectory), Times.Once);
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentInDirectorySuffix)), Times.Once);
-            this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentOutDirectorySuffix)), Times.Once);
+            this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(RootDeploymentDirectory), Times.Once);
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentInDirectorySuffix), Environment.MachineName)), Times.Once);
         }
 
@@ -117,7 +117,7 @@ public void CreateDeploymentDirectoriesShouldCreateDefaultDeploymentDirectoryIfR
             // Assert.
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(RootDeploymentDirectory), Times.Once);
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentInDirectorySuffix)), Times.Once);
-            this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentOutDirectorySuffix)), Times.Once);
+            this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(RootDeploymentDirectory), Times.Once);
             this.mockFileUtility.Verify(fu => fu.CreateDirectoryIfNotExists(Path.Combine(Path.Combine(RootDeploymentDirectory, TestRunDirectories.DeploymentInDirectorySuffix), Environment.MachineName)), Times.Once);
         }