Fix tests' edge cases

Author: edvilme

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

@@ -81,7 +81,6 @@ private async Task RemoveProjectsAsync(string solutionFileFullPath, IEnumerable<
                 if (project != null)
                 {
                     solution.RemoveProject(project);
-
                     Reporter.Output.WriteLine(CommonLocalizableStrings.ProjectRemovedFromTheSolution, projectPath);
                 }
                 else
@@ -91,6 +90,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

@@ -317,7 +317,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("");
         }