Fix tests' edge cases

Author: edvilme

src/Cli/dotnet/commands/dotnet-sln/remove/Program.cs

@@ -57,6 +57,11 @@ public override int Execute()
                 {
                     throw new GracefulException(CommonLocalizableStrings.InvalidSolutionFormatString, solutionFileFullPath, ex.Message);
                 }
+                // TODO: Check
+                if (ex.InnerException is GracefulException)
+                {
+                    throw ex.InnerException;
+                }
                 throw new GracefulException(ex.Message, ex);
             }
         }
@@ -81,7 +86,6 @@ private async Task RemoveProjectsAsync(string solutionFileFullPath, IEnumerable<
                 if (project != null)
                 {
                     solution.RemoveProject(project);
-
                     Reporter.Output.WriteLine(CommonLocalizableStrings.ProjectRemovedFromTheSolution, projectPath);
                 }
                 else
@@ -91,6 +95,18 @@ private async Task RemoveProjectsAsync(string solutionFileFullPath, IEnumerable<
             }
 
             // TODO: Remove empty solution folders
+            HashSet<SolutionFolderModel> emptySolutionFolders = solution.SolutionFolders.ToHashSet();
+            foreach (var item in solution.SolutionItems)
+            {
+                if (item.Parent != null)
+                {
+                    emptySolutionFolders.Remove(item.Parent);
+                }
+            }
+            foreach (var emptySolutionFolder in emptySolutionFolders)
+            {
+                solution.RemoveFolder(emptySolutionFolder);
+            }
 
             await serializer.SaveAsync(solutionFileFullPath, solution, cancellationToken);
         }

test/dotnet-sln.Tests/GivenDotnetSlnRemove.cs

@@ -64,6 +64,17 @@ dotnet solution <SLN_FILE> remove [<PROJECT_PATH>...] [options]
 VisualStudioVersion = 15.0.26006.2
 MinimumVisualStudioVersion = 10.0.40219.1
 Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
 EndGlobal
 ";
 
@@ -317,7 +328,7 @@ public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage(string solutionComm
                 .WithWorkingDirectory(projectDirectory)
                 .Execute(solutionCommand, "InvalidSolution.sln", "remove", projectToRemove);
             cmd.Should().Fail();
-            cmd.StdErr.Should().Match(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, "InvalidSolution.sln", "*"));
+            cmd.StdErr.Should().Match(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, Path.Combine(projectDirectory, "InvalidSolution.sln"), "*"));
             cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized("");
         }
 
@@ -474,7 +485,7 @@ public void WhenSolutionItemsExistInFolderParentFoldersAreNotRemoved(string solu
                 .BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemoveProjectInSolutionWithNestedSolutionItems);
         }
 
-        [Theory]
+        [Theory(Skip = "vs-solutionpersistence does not allow duplicate references.")]
         [InlineData("sln")]
         [InlineData("solution")]
         public void WhenDuplicateReferencesArePresentItRemovesThemAll(string solutionCommand)