diff options
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionTemplate.cs | 7 | ||||
| -rw-r--r-- | main/tests/UnitTests/MonoDevelop.Ide.Templates/ProjectTemplateCategorizerTests.cs | 29 |
2 files changed, 36 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionTemplate.cs index 2c1acc5cce..f5f888f330 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionTemplate.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionTemplate.cs @@ -114,14 +114,18 @@ namespace MonoDevelop.Ide.Templates public void AddGroupTemplate (SolutionTemplate template)
{
groupedTemplates.Add (template);
+ template.Parent = this;
if (!availableLanguages.Contains (template.Language)) {
availableLanguages.Add (template.Language);
}
}
+ internal SolutionTemplate Parent { get; set; }
+
internal void ClearGroupedTemplates ()
{
+ Parent = null;
groupedTemplates.Clear ();
}
@@ -141,6 +145,9 @@ namespace MonoDevelop.Ide.Templates return this;
}
+ if (Parent != null)
+ return Parent.GetTemplate (predicate);
+
return groupedTemplates.FirstOrDefault (template => predicate (template));
}
diff --git a/main/tests/UnitTests/MonoDevelop.Ide.Templates/ProjectTemplateCategorizerTests.cs b/main/tests/UnitTests/MonoDevelop.Ide.Templates/ProjectTemplateCategorizerTests.cs index 1d4bbc6be3..9e7bdf795f 100644 --- a/main/tests/UnitTests/MonoDevelop.Ide.Templates/ProjectTemplateCategorizerTests.cs +++ b/main/tests/UnitTests/MonoDevelop.Ide.Templates/ProjectTemplateCategorizerTests.cs @@ -582,6 +582,35 @@ namespace MonoDevelop.Ide.Templates });
Assert.AreEqual (2, templateCount);
}
+
+ [Test]
+ public void GetCategorizedTemplates_TwoTemplatesWithGroupCondition_CanGetTemplateMatchingConditionFromAnyGroupedTemplate ()
+ {
+ CreateCategories ("android", "app", "general");
+ CreateCategorizer ();
+ SolutionTemplate template1 = AddTemplate ("template-id1", "android/app/general");
+ template1.GroupId = "console";
+ template1.Language = "C#";
+ template1.Condition = "Device=IPhone";
+ SolutionTemplate template2 = AddTemplate ("template-id2", "android/app/general");
+ template2.GroupId = "console";
+ template2.Language = "C#";
+ template2.Condition = "Device=IPad";
+ ProjectCreateParameters ipadParameters = CreateParameters ("Device", "IPad");
+ ProjectCreateParameters iphoneParameters = CreateParameters ("Device", "IPhone");
+
+ CategorizeTemplates ();
+
+ TemplateCategory generalCategory = categorizedTemplates.First ().Categories.First ().Categories.First ();
+ SolutionTemplate firstTemplate = generalCategory.Templates.FirstOrDefault ();
+ SolutionTemplate matchedIPadTemplate = firstTemplate.GetTemplate ("C#", ipadParameters);
+ SolutionTemplate matchedIPhoneTemplate = firstTemplate.GetTemplate ("C#", iphoneParameters);
+
+ Assert.AreEqual (template2, matchedIPadTemplate);
+ Assert.AreEqual (template1, matchedIPhoneTemplate);
+ Assert.AreEqual (template2, matchedIPadTemplate.GetTemplate ("C#", ipadParameters));
+ Assert.AreEqual (template1, matchedIPadTemplate.GetTemplate ("C#", iphoneParameters));
+ }
}
}
|