diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/PackageManagementCmdlet.cs b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/PackageManagementCmdlet.cs index ba47bbff9f..8e50e02084 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/PackageManagementCmdlet.cs +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/PackageManagementCmdlet.cs @@ -100,7 +100,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets public void Run(IPackageScript script) { if (script.Exists()) { - script.Execute(this); + script.Run(this); } } } diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InvokeRunPackageScriptsCmdletTests.cs b/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InvokeRunPackageScriptsCmdletTests.cs index 42fc4d8a32..08ecb7c4e1 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InvokeRunPackageScriptsCmdletTests.cs +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InvokeRunPackageScriptsCmdletTests.cs @@ -42,9 +42,9 @@ namespace PackageManagement.Cmdlets.Tests FakePackageScript script = AddScript(); RunCmdlet(); - bool executed = script.IsExecuted; + bool run = script.IsRun; - Assert.IsTrue(executed); + Assert.IsTrue(run); } [Test] @@ -55,9 +55,9 @@ namespace PackageManagement.Cmdlets.Tests FakePackageScript script = AddScript(); RunCmdlet(); - bool executed = script.IsExecuted; + bool run = script.IsRun; - Assert.IsTrue(executed); + Assert.IsTrue(run); } [Test] @@ -67,7 +67,7 @@ namespace PackageManagement.Cmdlets.Tests FakePackageScript script = AddScript(); RunCmdlet(); - IPackageScriptSession session = script.SessionPassedToExecute; + IPackageScriptSession session = script.SessionPassedToRun; Assert.AreEqual(cmdlet, session); } @@ -80,7 +80,7 @@ namespace PackageManagement.Cmdlets.Tests FakePackageScript script = AddScript(); RunCmdlet(); - IPackageScriptSession session = script.SessionPassedToExecute; + IPackageScriptSession session = script.SessionPassedToRun; Assert.AreEqual(cmdlet, session); } diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/PackageManagementCmdletTests.cs b/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/PackageManagementCmdletTests.cs index f12d98c180..a472e13270 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/PackageManagementCmdletTests.cs +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/PackageManagementCmdletTests.cs @@ -120,7 +120,7 @@ namespace PackageManagement.Cmdlets.Tests var script = new FakePackageScript(); cmdlet.Run(script); - IPackageScriptSession session = script.SessionPassedToExecute; + IPackageScriptSession session = script.SessionPassedToRun; Assert.AreEqual(cmdlet, session); } @@ -134,9 +134,9 @@ namespace PackageManagement.Cmdlets.Tests script.ExistsReturnValue = false; cmdlet.Run(script); - bool executed = script.IsExecuted; + bool run = script.IsRun; - Assert.IsFalse(executed); + Assert.IsFalse(run); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IPackageScript.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IPackageScript.cs index 592e69e50a..ea0ed7e2f5 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IPackageScript.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IPackageScript.cs @@ -10,6 +10,6 @@ namespace ICSharpCode.PackageManagement.Scripting IPackageManagementProject Project { get; set; } bool Exists(); - void Execute(IPackageScriptSession session); + void Run(IPackageScriptSession session); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializationScripts.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializationScripts.cs index 4b490a08b7..7ec286c078 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializationScripts.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializationScripts.cs @@ -25,7 +25,7 @@ namespace ICSharpCode.PackageManagement.Scripting public void Run(IPackageScriptSession session) { foreach (IPackageScript script in GetScripts()) { - script.Execute(session); + script.Run(session); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializeScript.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializeScript.cs index 092ab3fb56..be8e33ee7b 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializeScript.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializeScript.cs @@ -13,7 +13,7 @@ namespace ICSharpCode.PackageManagement.Scripting { } - protected override void BeforeExecute() + protected override void BeforeRun() { AddScriptDirectoryToEnvironmentPath(); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageScript.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageScript.cs index 0e7fc504a4..a5819ebdf9 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageScript.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageScript.cs @@ -25,23 +25,23 @@ namespace ICSharpCode.PackageManagement.Scripting return ScriptFileName.FileExists(); } - public void Execute(IPackageScriptSession session) + public void Run(IPackageScriptSession session) { this.Session = session; - Execute(); + Run(); } - void Execute() + void Run() { - BeforeExecute(); + BeforeRun(); if (Exists()) { AddSessionVariables(); - ExecuteScript(); + RunScript(); RemoveSessionVariables(); } } - protected virtual void BeforeExecute() + protected virtual void BeforeRun() { } @@ -61,7 +61,7 @@ namespace ICSharpCode.PackageManagement.Scripting return null; } - void ExecuteScript() + void RunScript() { string script = GetScript(); Session.InvokeScript(script); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageScript.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageScript.cs index 84098a5f46..4de7ac413a 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageScript.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageScript.cs @@ -11,13 +11,13 @@ namespace PackageManagement.Tests.Helpers { public IPackageManagementProject Project { get; set; } - public bool IsExecuted; - public IPackageScriptSession SessionPassedToExecute; + public bool IsRun; + public IPackageScriptSession SessionPassedToRun; - public void Execute(IPackageScriptSession session) + public void Run(IPackageScriptSession session) { - IsExecuted = true; - SessionPassedToExecute = session; + IsRun = true; + SessionPassedToRun = session; } public bool ExistsReturnValue = true; diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializationScriptsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializationScriptsTests.cs index 5b90e9edb5..5c5672d8ee 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializationScriptsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializationScriptsTests.cs @@ -59,13 +59,13 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Run_OnePackageInRepository_OnePackageScriptExecuted() + public void Run_OnePackageInRepository_OnePackageScriptIsRun() { CreateScripts(); AddPackageToRepository("Test"); scripts.Run(fakeSession); - IPackageScriptSession session = fakeScriptFactory.FirstPackageInitializeScriptCreated.SessionPassedToExecute; + IPackageScriptSession session = fakeScriptFactory.FirstPackageInitializeScriptCreated.SessionPassedToRun; FakePackageScriptSession expectedSession = fakeSession; Assert.AreEqual(expectedSession, session); @@ -99,14 +99,14 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Run_TwoPackagesInRepository_SecondScriptIsExecuted() + public void Run_TwoPackagesInRepository_SecondScriptIsRun() { CreateScripts(); AddPackageToRepository("A"); AddPackageToRepository("B"); scripts.Run(fakeSession); - IPackageScriptSession session = fakeScriptFactory.FakePackageInitializeScriptsCreated[1].SessionPassedToExecute; + IPackageScriptSession session = fakeScriptFactory.FakePackageInitializeScriptsCreated[1].SessionPassedToRun; FakePackageScriptSession expectedSession = fakeSession; Assert.AreEqual(expectedSession, session); @@ -147,15 +147,15 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Run_TwoPackagesInRepositoryAndLastPackageScriptFileExistsButNotFirst_FirstScriptNotExecuted() + public void Run_TwoPackagesInRepositoryAndLastPackageScriptFileExistsButNotFirst_FirstScriptNotRun() { CreateScriptsWithTwoPackagesInRepositoryAndLastPackageScriptFileExistsButNotFirst(); FakePackageScript firstScript = fakeScriptFactoryWithPredefinedPackageScripts.FakeInitializeScripts[0]; scripts.Run(fakeSession); - bool executed = firstScript.IsExecuted; + bool run = firstScript.IsRun; - Assert.IsFalse(executed); + Assert.IsFalse(run); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializeScriptTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializeScriptTests.cs index 427bbc9d4b..f8fe5d1569 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializeScriptTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializeScriptTests.cs @@ -29,19 +29,19 @@ namespace PackageManagement.Tests.Scripting Assert.IsTrue(removed); } - void ExecuteScript() + void RunScript() { - script.Execute(fakeSession); + script.Run(fakeSession); } [Test] - public void Execute_ExistingEnvironmentPathIsEmptyString_PathToScriptAddedToEnvironmentPath() + public void Run_ExistingEnvironmentPathIsEmptyString_PathToScriptAddedToEnvironmentPath() { CreateScript(); fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeSession.SetEnvironmentPath(String.Empty); - ExecuteScript(); + RunScript(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string expectedEnvironmentPath = @"d:\projects\myproject\packages\test\tools"; @@ -50,13 +50,13 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_OneItemInOriginalEnvironmentPath_PathToScriptAppendedToEnvironmentPath() + public void Run_OneItemInOriginalEnvironmentPath_PathToScriptAppendedToEnvironmentPath() { CreateScript(); fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeSession.SetEnvironmentPath(@"c:\users\sharpdevelop\ps;"); - ExecuteScript(); + RunScript(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string expectedEnvironmentPath = @"c:\users\sharpdevelop\ps;d:\projects\myproject\packages\test\tools"; @@ -65,13 +65,13 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_OneItemInOriginalEnvironmentPathMissingSemiColonAtEnd_PathToScriptAppendedToEnvironmentPathWithSemiColonAtStart() + public void Run_OneItemInOriginalEnvironmentPathMissingSemiColonAtEnd_PathToScriptAppendedToEnvironmentPathWithSemiColonAtStart() { CreateScript(); fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeSession.SetEnvironmentPath(@"c:\users\sharpdevelop\ps"); - ExecuteScript(); + RunScript(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string expectedEnvironmentPath = @"c:\users\sharpdevelop\ps;d:\projects\myproject\packages\test\tools"; @@ -80,13 +80,13 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_OriginalEnvironmentPathIsNull_PathToScriptAppendedToEnvironmentPath() + public void Run_OriginalEnvironmentPathIsNull_PathToScriptAppendedToEnvironmentPath() { CreateScript(); fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeSession.SetEnvironmentPath(null); - ExecuteScript(); + RunScript(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string expectedEnvironmentPath = @"d:\projects\myproject\packages\test\tools"; @@ -95,14 +95,14 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_ScriptDirectoryDoesNotExist_PathIsNotUpdated() + public void Run_ScriptDirectoryDoesNotExist_PathIsNotUpdated() { CreateScript(); fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeScriptFileName.ScriptDirectoryExistsReturnValue = false; fakeSession.SetEnvironmentPath(String.Empty); - ExecuteScript(); + RunScript(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string expectedEnvironmentPath = String.Empty; @@ -111,12 +111,12 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_PackageIsSet_PackageSessionVariableIsSet() + public void Run_PackageIsSet_PackageSessionVariableIsSet() { CreateScript(); var expectedPackage = new FakePackage("Test"); script.Package = expectedPackage; - ExecuteScript(); + RunScript(); var actualPackage = fakeSession.VariablesAdded["__package"]; @@ -124,12 +124,12 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_PackageInstallDirectoryIsSet_RootPathSessionVariableIsSet() + public void Run_PackageInstallDirectoryIsSet_RootPathSessionVariableIsSet() { CreateScript(); string expectedRootPath = @"d:\projects\myproject\packages\test"; fakeScriptFileName.PackageInstallDirectory = expectedRootPath; - ExecuteScript(); + RunScript(); var rootPath = fakeSession.VariablesAdded["__rootPath"]; @@ -137,11 +137,11 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_PackageInstallDirectoryIsSet_ToolsPathSessionVariableIsSet() + public void Run_PackageInstallDirectoryIsSet_ToolsPathSessionVariableIsSet() { CreateScript(); fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; - ExecuteScript(); + RunScript(); var toolsPath = fakeSession.VariablesAdded["__toolsPath"]; string expectedToolsPath = @"d:\projects\myproject\packages\test\tools"; @@ -150,10 +150,10 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_PackageInstallDirectoryIsSet_ProjectSessionVariableIsSet() + public void Run_PackageInstallDirectoryIsSet_ProjectSessionVariableIsSet() { CreateScript(); - ExecuteScript(); + RunScript(); var project = fakeSession.VariablesAdded["__project"]; @@ -161,11 +161,11 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_PackageInstallDirectoryIsSet_ScriptIsInvoked() + public void Run_PackageInstallDirectoryIsSet_ScriptIsInvoked() { CreateScript(); fakeScriptFileName.ToStringReturnValue = @"d:\projects\myproject\packages\test\tools\init.ps1"; - ExecuteScript(); + RunScript(); string actualScript = fakeSession.ScriptPassedToInvokeScript; @@ -176,37 +176,37 @@ namespace PackageManagement.Tests.Scripting } [Test] - public void Execute_PackageInstallDirectoryIsSet_PackageSessionVariableIsRemoved() + public void Run_PackageInstallDirectoryIsSet_PackageSessionVariableIsRemoved() { CreateScript(); - ExecuteScript(); + RunScript(); AssertSessionVariableIsRemoved("__package"); } [Test] - public void Execute_PackageInstallDirectoryIsSet_RootPathSessionVariableIsRemoved() + public void Run_PackageInstallDirectoryIsSet_RootPathSessionVariableIsRemoved() { CreateScript(); - ExecuteScript(); + RunScript(); AssertSessionVariableIsRemoved("__rootPath"); } [Test] - public void Execute_PackageInstallDirectoryIsSet_ToolsPathSessionVariableIsRemoved() + public void Run_PackageInstallDirectoryIsSet_ToolsPathSessionVariableIsRemoved() { CreateScript(); - ExecuteScript(); + RunScript(); AssertSessionVariableIsRemoved("__toolsPath"); } [Test] - public void Execute_PackageInstallDirectoryIsSet_ProjectSessionVariableIsRemoved() + public void Run_PackageInstallDirectoryIsSet_ProjectSessionVariableIsRemoved() { CreateScript(); - ExecuteScript(); + RunScript(); AssertSessionVariableIsRemoved("__project"); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInstallScriptTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInstallScriptTests.cs index 9e54dae36c..fc5a69370b 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInstallScriptTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInstallScriptTests.cs @@ -32,7 +32,7 @@ namespace PackageManagement.Tests.Scripting void ExecuteScript() { - script.Execute(fakeSession); + script.Run(fakeSession); } [Test]