From 092b913bfb8b67ad7fd2e0300ca61cc4cd7dc8a6 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sun, 25 Sep 2011 19:10:55 +0100 Subject: [PATCH] Refactor TextTemplatingVariables class. --- .../Project/Src/ITextTemplatingVariables.cs | 2 +- .../TextTemplating/Project/Src/TextTemplatingHost.cs | 2 +- .../Project/Src/TextTemplatingPathResolver.cs | 2 +- .../Project/Src/TextTemplatingVariables.cs | 2 +- .../Test/Helpers/FakeTextTemplatingVariables.cs | 2 +- .../Test/Src/TextTemplatingVariablesTests.cs | 12 ++++++------ 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/AddIns/Misc/TextTemplating/Project/Src/ITextTemplatingVariables.cs b/src/AddIns/Misc/TextTemplating/Project/Src/ITextTemplatingVariables.cs index 6647850ee4..50ecc2058b 100644 --- a/src/AddIns/Misc/TextTemplating/Project/Src/ITextTemplatingVariables.cs +++ b/src/AddIns/Misc/TextTemplating/Project/Src/ITextTemplatingVariables.cs @@ -7,7 +7,7 @@ namespace ICSharpCode.TextTemplating { public interface ITextTemplatingVariables { - string Expand(string name); + string ExpandVariables(string name); string GetValue(string name); } } diff --git a/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingHost.cs b/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingHost.cs index 3029a6389a..f25e201911 100644 --- a/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingHost.cs +++ b/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingHost.cs @@ -60,7 +60,7 @@ namespace ICSharpCode.TextTemplating string ExpandPath(string path) { - return templatingVariables.Expand(path); + return templatingVariables.ExpandVariables(path); } } } diff --git a/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingPathResolver.cs b/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingPathResolver.cs index 7da0491838..10d8477fc3 100644 --- a/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingPathResolver.cs +++ b/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingPathResolver.cs @@ -26,7 +26,7 @@ namespace ICSharpCode.TextTemplating public string ResolvePath(string path) { path = environment.ExpandEnvironmentVariables(path); - return templatingVariables.Expand(path); + return templatingVariables.ExpandVariables(path); } } } diff --git a/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingVariables.cs b/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingVariables.cs index 760da94225..713f4735b4 100644 --- a/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingVariables.cs +++ b/src/AddIns/Misc/TextTemplating/Project/Src/TextTemplatingVariables.cs @@ -23,7 +23,7 @@ namespace ICSharpCode.TextTemplating this.stringParser = stringParser; } - public string Expand(string name) + public string ExpandVariables(string name) { var variablesBuilder = new TextTemplatingVariablesStringBuilder(name, this); foreach (TextTemplatingVariableLocation variableLocation in GetVariables(name)) { diff --git a/src/AddIns/Misc/TextTemplating/Test/Helpers/FakeTextTemplatingVariables.cs b/src/AddIns/Misc/TextTemplating/Test/Helpers/FakeTextTemplatingVariables.cs index a8b72fe69f..ed8c6f2f71 100644 --- a/src/AddIns/Misc/TextTemplating/Test/Helpers/FakeTextTemplatingVariables.cs +++ b/src/AddIns/Misc/TextTemplating/Test/Helpers/FakeTextTemplatingVariables.cs @@ -17,7 +17,7 @@ namespace TextTemplating.Tests.Helpers Variables.Add(name, value); } - public string Expand(string name) + public string ExpandVariables(string name) { foreach (KeyValuePair variable in Variables) { name = name.Replace(variable.Key, variable.Value); diff --git a/src/AddIns/Misc/TextTemplating/Test/Src/TextTemplatingVariablesTests.cs b/src/AddIns/Misc/TextTemplating/Test/Src/TextTemplatingVariablesTests.cs index 32fe428b08..4449014999 100644 --- a/src/AddIns/Misc/TextTemplating/Test/Src/TextTemplatingVariablesTests.cs +++ b/src/AddIns/Misc/TextTemplating/Test/Src/TextTemplatingVariablesTests.cs @@ -28,24 +28,24 @@ namespace TextTemplating.Tests } [Test] - public void Expand_SolutionDirProperty_SolutionDirPropertyIsExpanded() + public void ExpandVariables_SolutionDirProperty_SolutionDirPropertyIsExpanded() { CreateTextTemplatingVariables(); AddProperty("SolutionDir", @"d:\projects\MyProject\"); - string result = variables.Expand(@"$(SolutionDir)bin\Debug\Test.dll"); + string result = variables.ExpandVariables(@"$(SolutionDir)bin\Debug\Test.dll"); string expectedResult = @"d:\projects\MyProject\bin\Debug\Test.dll"; Assert.AreEqual(expectedResult, result); } [Test] - public void Expand_ProjectDirProperty_ProjectDirPropertyIsExpanded() + public void ExpandVariables_ProjectDirProperty_ProjectDirPropertyIsExpanded() { CreateTextTemplatingVariables(); AddProperty("ProjectDir", @"d:\projects\MyProject\"); - string result = variables.Expand(@"$(ProjectDir)bin\Debug\Test.dll"); + string result = variables.ExpandVariables(@"$(ProjectDir)bin\Debug\Test.dll"); string expectedResult = @"d:\projects\MyProject\bin\Debug\Test.dll"; Assert.AreEqual(expectedResult, result); @@ -227,12 +227,12 @@ namespace TextTemplating.Tests } [Test] - public void Expand_ProjectDirPropertyHasNoTrailingSlash_ProjectDirPropertyIsExpandedWithTrailingSlash() + public void ExpandVariables_ProjectDirPropertyHasNoTrailingSlash_ProjectDirPropertyIsExpandedWithTrailingSlash() { CreateTextTemplatingVariables(); AddProperty("ProjectDir", @"d:\projects\MyProject"); - string result = variables.Expand(@"$(ProjectDir)bin\Debug\Test.dll"); + string result = variables.ExpandVariables(@"$(ProjectDir)bin\Debug\Test.dll"); string expectedResult = @"d:\projects\MyProject\bin\Debug\Test.dll"; Assert.AreEqual(expectedResult, result);