[mono/monodevelop] f174b586: [CodeIssuePad] Fix unit tests.

   Branch: refs/heads/master
     Home: https://github.com/mono/monodevelop
  Compare: https://github.com/mono/monodevelop/compare/27c01cdc19e5...f174b586439e

   Commit: f174b586439e09631095ed8001eb74de970743cb
   Author: Therzok <[email protected]> (Therzok)
     Date: 2013-11-11 20:18:46 GMT
      URL: https://github.com/mono/monodevelop/commit/f174b586439e09631095ed8001eb74de970743cb

[CodeIssuePad] Fix unit tests.

Changed paths:
  M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
  M main/tests/UnitTests/MonoDevelop.Refactoring/FileGroupingProviderTests.cs

Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
===================================================================
@@ -38,11 +38,7 @@ protected override ProjectFile GetGroupingKey (IssueSummary issue)
 		}
 		protected override string GetGroupName (IssueSummary issue)
 		{
-			FilePath parent = issue.Project.FileName.ParentDirectory;
-			FilePath current = issue.File.FilePath;
-			if (current.IsChildPathOf (current))
-				return issue.File.FilePath.ToRelative (parent);
-			return current.ToRelative (issue.Project.ParentSolution.BaseDirectory);
+			return issue.File.FilePath.ToRelative (issue.Project.BaseDirectory);
 		}
 		#endregion
 	}


Modified: main/tests/UnitTests/MonoDevelop.Refactoring/FileGroupingProviderTests.cs
===================================================================
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using MonoDevelop.CodeIssues;
 using MonoDevelop.Projects;
+using System.IO;
 
 namespace MonoDevelop.Refactoring
 {
@@ -41,10 +42,16 @@ protected override IssueSummary[] GetDistinctSummaries ()
 		{
 			return new [] {
 				new IssueSummary {
-					File = new ProjectFile ("File1")
+					File = new ProjectFile (Path.Combine ("Directory1", "File1")),
+					Project = new DotNetAssemblyProject {
+						BaseDirectory = "Directory1"
+					}
 				},
 				new IssueSummary {
-					File = new ProjectFile ("File2")
+					File = new ProjectFile (Path.Combine ("Directory2", "File2")),
+					Project = new DotNetAssemblyProject {
+						BaseDirectory = "Directory1"
+					}
 				}
 			};
 		}



_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches