Refactor TextTemplatingVariables class.

icsharpcode · Sep 25, 2011 · 092b913 · 092b913
1 parent 07b9251
commit 092b913
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -60,7 +60,7 @@ protected override string ResolvePath(string path)
 
 		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
@@ -26,7 +26,7 @@ public TextTemplatingPathResolver(
 		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
@@ -23,7 +23,7 @@ public TextTemplatingVariables(
 			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
@@ -17,7 +17,7 @@ public void AddVariable(string name, string value)
 			Variables.Add(name, value);
 		}
 
-		public string Expand(string name)
+		public string ExpandVariables(string name)
 		{
 			foreach (KeyValuePair<string, string> 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
@@ -28,24 +28,24 @@ void AddProperty(string name, string value)
 		}
 
 		[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 @@ public void GetValue_NullPassed_ReturnsEmptyString()
 		}
 
 		[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);