Browse Source

Make IPackageScript method names consistent with other classes.

pull/15/head
Matt Ward 15 years ago
parent
commit
75a921410d
  1. 2
      src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/PackageManagementCmdlet.cs
  2. 12
      src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InvokeRunPackageScriptsCmdletTests.cs
  3. 6
      src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/PackageManagementCmdletTests.cs
  4. 2
      src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IPackageScript.cs
  5. 2
      src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializationScripts.cs
  6. 2
      src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializeScript.cs
  7. 14
      src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageScript.cs
  8. 10
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageScript.cs
  9. 14
      src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializationScriptsTests.cs
  10. 60
      src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializeScriptTests.cs
  11. 2
      src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInstallScriptTests.cs

2
src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/PackageManagementCmdlet.cs

@ -100,7 +100,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
public void Run(IPackageScript script) public void Run(IPackageScript script)
{ {
if (script.Exists()) { if (script.Exists()) {
script.Execute(this); script.Run(this);
} }
} }
} }

12
src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InvokeRunPackageScriptsCmdletTests.cs

@ -42,9 +42,9 @@ namespace PackageManagement.Cmdlets.Tests
FakePackageScript script = AddScript(); FakePackageScript script = AddScript();
RunCmdlet(); RunCmdlet();
bool executed = script.IsExecuted; bool run = script.IsRun;
Assert.IsTrue(executed); Assert.IsTrue(run);
} }
[Test] [Test]
@ -55,9 +55,9 @@ namespace PackageManagement.Cmdlets.Tests
FakePackageScript script = AddScript(); FakePackageScript script = AddScript();
RunCmdlet(); RunCmdlet();
bool executed = script.IsExecuted; bool run = script.IsRun;
Assert.IsTrue(executed); Assert.IsTrue(run);
} }
[Test] [Test]
@ -67,7 +67,7 @@ namespace PackageManagement.Cmdlets.Tests
FakePackageScript script = AddScript(); FakePackageScript script = AddScript();
RunCmdlet(); RunCmdlet();
IPackageScriptSession session = script.SessionPassedToExecute; IPackageScriptSession session = script.SessionPassedToRun;
Assert.AreEqual(cmdlet, session); Assert.AreEqual(cmdlet, session);
} }
@ -80,7 +80,7 @@ namespace PackageManagement.Cmdlets.Tests
FakePackageScript script = AddScript(); FakePackageScript script = AddScript();
RunCmdlet(); RunCmdlet();
IPackageScriptSession session = script.SessionPassedToExecute; IPackageScriptSession session = script.SessionPassedToRun;
Assert.AreEqual(cmdlet, session); Assert.AreEqual(cmdlet, session);
} }

6
src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/PackageManagementCmdletTests.cs

@ -120,7 +120,7 @@ namespace PackageManagement.Cmdlets.Tests
var script = new FakePackageScript(); var script = new FakePackageScript();
cmdlet.Run(script); cmdlet.Run(script);
IPackageScriptSession session = script.SessionPassedToExecute; IPackageScriptSession session = script.SessionPassedToRun;
Assert.AreEqual(cmdlet, session); Assert.AreEqual(cmdlet, session);
} }
@ -134,9 +134,9 @@ namespace PackageManagement.Cmdlets.Tests
script.ExistsReturnValue = false; script.ExistsReturnValue = false;
cmdlet.Run(script); cmdlet.Run(script);
bool executed = script.IsExecuted; bool run = script.IsRun;
Assert.IsFalse(executed); Assert.IsFalse(run);
} }
} }
} }

2
src/AddIns/Misc/PackageManagement/Project/Src/Scripting/IPackageScript.cs

@ -10,6 +10,6 @@ namespace ICSharpCode.PackageManagement.Scripting
IPackageManagementProject Project { get; set; } IPackageManagementProject Project { get; set; }
bool Exists(); bool Exists();
void Execute(IPackageScriptSession session); void Run(IPackageScriptSession session);
} }
} }

2
src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageInitializationScripts.cs

@ -25,7 +25,7 @@ namespace ICSharpCode.PackageManagement.Scripting
public void Run(IPackageScriptSession session) public void Run(IPackageScriptSession session)
{ {
foreach (IPackageScript script in GetScripts()) { foreach (IPackageScript script in GetScripts()) {
script.Execute(session); script.Run(session);
} }
} }

2
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(); AddScriptDirectoryToEnvironmentPath();
} }

14
src/AddIns/Misc/PackageManagement/Project/Src/Scripting/PackageScript.cs

@ -25,23 +25,23 @@ namespace ICSharpCode.PackageManagement.Scripting
return ScriptFileName.FileExists(); return ScriptFileName.FileExists();
} }
public void Execute(IPackageScriptSession session) public void Run(IPackageScriptSession session)
{ {
this.Session = session; this.Session = session;
Execute(); Run();
} }
void Execute() void Run()
{ {
BeforeExecute(); BeforeRun();
if (Exists()) { if (Exists()) {
AddSessionVariables(); AddSessionVariables();
ExecuteScript(); RunScript();
RemoveSessionVariables(); RemoveSessionVariables();
} }
} }
protected virtual void BeforeExecute() protected virtual void BeforeRun()
{ {
} }
@ -61,7 +61,7 @@ namespace ICSharpCode.PackageManagement.Scripting
return null; return null;
} }
void ExecuteScript() void RunScript()
{ {
string script = GetScript(); string script = GetScript();
Session.InvokeScript(script); Session.InvokeScript(script);

10
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageScript.cs

@ -11,13 +11,13 @@ namespace PackageManagement.Tests.Helpers
{ {
public IPackageManagementProject Project { get; set; } public IPackageManagementProject Project { get; set; }
public bool IsExecuted; public bool IsRun;
public IPackageScriptSession SessionPassedToExecute; public IPackageScriptSession SessionPassedToRun;
public void Execute(IPackageScriptSession session) public void Run(IPackageScriptSession session)
{ {
IsExecuted = true; IsRun = true;
SessionPassedToExecute = session; SessionPassedToRun = session;
} }
public bool ExistsReturnValue = true; public bool ExistsReturnValue = true;

14
src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializationScriptsTests.cs

@ -59,13 +59,13 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Run_OnePackageInRepository_OnePackageScriptExecuted() public void Run_OnePackageInRepository_OnePackageScriptIsRun()
{ {
CreateScripts(); CreateScripts();
AddPackageToRepository("Test"); AddPackageToRepository("Test");
scripts.Run(fakeSession); scripts.Run(fakeSession);
IPackageScriptSession session = fakeScriptFactory.FirstPackageInitializeScriptCreated.SessionPassedToExecute; IPackageScriptSession session = fakeScriptFactory.FirstPackageInitializeScriptCreated.SessionPassedToRun;
FakePackageScriptSession expectedSession = fakeSession; FakePackageScriptSession expectedSession = fakeSession;
Assert.AreEqual(expectedSession, session); Assert.AreEqual(expectedSession, session);
@ -99,14 +99,14 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Run_TwoPackagesInRepository_SecondScriptIsExecuted() public void Run_TwoPackagesInRepository_SecondScriptIsRun()
{ {
CreateScripts(); CreateScripts();
AddPackageToRepository("A"); AddPackageToRepository("A");
AddPackageToRepository("B"); AddPackageToRepository("B");
scripts.Run(fakeSession); scripts.Run(fakeSession);
IPackageScriptSession session = fakeScriptFactory.FakePackageInitializeScriptsCreated[1].SessionPassedToExecute; IPackageScriptSession session = fakeScriptFactory.FakePackageInitializeScriptsCreated[1].SessionPassedToRun;
FakePackageScriptSession expectedSession = fakeSession; FakePackageScriptSession expectedSession = fakeSession;
Assert.AreEqual(expectedSession, session); Assert.AreEqual(expectedSession, session);
@ -147,15 +147,15 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Run_TwoPackagesInRepositoryAndLastPackageScriptFileExistsButNotFirst_FirstScriptNotExecuted() public void Run_TwoPackagesInRepositoryAndLastPackageScriptFileExistsButNotFirst_FirstScriptNotRun()
{ {
CreateScriptsWithTwoPackagesInRepositoryAndLastPackageScriptFileExistsButNotFirst(); CreateScriptsWithTwoPackagesInRepositoryAndLastPackageScriptFileExistsButNotFirst();
FakePackageScript firstScript = fakeScriptFactoryWithPredefinedPackageScripts.FakeInitializeScripts[0]; FakePackageScript firstScript = fakeScriptFactoryWithPredefinedPackageScripts.FakeInitializeScripts[0];
scripts.Run(fakeSession); scripts.Run(fakeSession);
bool executed = firstScript.IsExecuted; bool run = firstScript.IsRun;
Assert.IsFalse(executed); Assert.IsFalse(run);
} }
} }
} }

60
src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInitializeScriptTests.cs

@ -29,19 +29,19 @@ namespace PackageManagement.Tests.Scripting
Assert.IsTrue(removed); Assert.IsTrue(removed);
} }
void ExecuteScript() void RunScript()
{ {
script.Execute(fakeSession); script.Run(fakeSession);
} }
[Test] [Test]
public void Execute_ExistingEnvironmentPathIsEmptyString_PathToScriptAddedToEnvironmentPath() public void Run_ExistingEnvironmentPathIsEmptyString_PathToScriptAddedToEnvironmentPath()
{ {
CreateScript(); CreateScript();
fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools";
fakeSession.SetEnvironmentPath(String.Empty); fakeSession.SetEnvironmentPath(String.Empty);
ExecuteScript(); RunScript();
string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath();
string expectedEnvironmentPath = @"d:\projects\myproject\packages\test\tools"; string expectedEnvironmentPath = @"d:\projects\myproject\packages\test\tools";
@ -50,13 +50,13 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_OneItemInOriginalEnvironmentPath_PathToScriptAppendedToEnvironmentPath() public void Run_OneItemInOriginalEnvironmentPath_PathToScriptAppendedToEnvironmentPath()
{ {
CreateScript(); CreateScript();
fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools";
fakeSession.SetEnvironmentPath(@"c:\users\sharpdevelop\ps;"); fakeSession.SetEnvironmentPath(@"c:\users\sharpdevelop\ps;");
ExecuteScript(); RunScript();
string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath();
string expectedEnvironmentPath = @"c:\users\sharpdevelop\ps;d:\projects\myproject\packages\test\tools"; string expectedEnvironmentPath = @"c:\users\sharpdevelop\ps;d:\projects\myproject\packages\test\tools";
@ -65,13 +65,13 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_OneItemInOriginalEnvironmentPathMissingSemiColonAtEnd_PathToScriptAppendedToEnvironmentPathWithSemiColonAtStart() public void Run_OneItemInOriginalEnvironmentPathMissingSemiColonAtEnd_PathToScriptAppendedToEnvironmentPathWithSemiColonAtStart()
{ {
CreateScript(); CreateScript();
fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools";
fakeSession.SetEnvironmentPath(@"c:\users\sharpdevelop\ps"); fakeSession.SetEnvironmentPath(@"c:\users\sharpdevelop\ps");
ExecuteScript(); RunScript();
string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath();
string expectedEnvironmentPath = @"c:\users\sharpdevelop\ps;d:\projects\myproject\packages\test\tools"; string expectedEnvironmentPath = @"c:\users\sharpdevelop\ps;d:\projects\myproject\packages\test\tools";
@ -80,13 +80,13 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_OriginalEnvironmentPathIsNull_PathToScriptAppendedToEnvironmentPath() public void Run_OriginalEnvironmentPathIsNull_PathToScriptAppendedToEnvironmentPath()
{ {
CreateScript(); CreateScript();
fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools";
fakeSession.SetEnvironmentPath(null); fakeSession.SetEnvironmentPath(null);
ExecuteScript(); RunScript();
string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath();
string expectedEnvironmentPath = @"d:\projects\myproject\packages\test\tools"; string expectedEnvironmentPath = @"d:\projects\myproject\packages\test\tools";
@ -95,14 +95,14 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_ScriptDirectoryDoesNotExist_PathIsNotUpdated() public void Run_ScriptDirectoryDoesNotExist_PathIsNotUpdated()
{ {
CreateScript(); CreateScript();
fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools";
fakeScriptFileName.ScriptDirectoryExistsReturnValue = false; fakeScriptFileName.ScriptDirectoryExistsReturnValue = false;
fakeSession.SetEnvironmentPath(String.Empty); fakeSession.SetEnvironmentPath(String.Empty);
ExecuteScript(); RunScript();
string actualEnvironmentPath = fakeSession.GetEnvironmentPath(); string actualEnvironmentPath = fakeSession.GetEnvironmentPath();
string expectedEnvironmentPath = String.Empty; string expectedEnvironmentPath = String.Empty;
@ -111,12 +111,12 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_PackageIsSet_PackageSessionVariableIsSet() public void Run_PackageIsSet_PackageSessionVariableIsSet()
{ {
CreateScript(); CreateScript();
var expectedPackage = new FakePackage("Test"); var expectedPackage = new FakePackage("Test");
script.Package = expectedPackage; script.Package = expectedPackage;
ExecuteScript(); RunScript();
var actualPackage = fakeSession.VariablesAdded["__package"]; var actualPackage = fakeSession.VariablesAdded["__package"];
@ -124,12 +124,12 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_PackageInstallDirectoryIsSet_RootPathSessionVariableIsSet() public void Run_PackageInstallDirectoryIsSet_RootPathSessionVariableIsSet()
{ {
CreateScript(); CreateScript();
string expectedRootPath = @"d:\projects\myproject\packages\test"; string expectedRootPath = @"d:\projects\myproject\packages\test";
fakeScriptFileName.PackageInstallDirectory = expectedRootPath; fakeScriptFileName.PackageInstallDirectory = expectedRootPath;
ExecuteScript(); RunScript();
var rootPath = fakeSession.VariablesAdded["__rootPath"]; var rootPath = fakeSession.VariablesAdded["__rootPath"];
@ -137,11 +137,11 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_PackageInstallDirectoryIsSet_ToolsPathSessionVariableIsSet() public void Run_PackageInstallDirectoryIsSet_ToolsPathSessionVariableIsSet()
{ {
CreateScript(); CreateScript();
fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools"; fakeScriptFileName.GetScriptDirectoryReturnValue = @"d:\projects\myproject\packages\test\tools";
ExecuteScript(); RunScript();
var toolsPath = fakeSession.VariablesAdded["__toolsPath"]; var toolsPath = fakeSession.VariablesAdded["__toolsPath"];
string expectedToolsPath = @"d:\projects\myproject\packages\test\tools"; string expectedToolsPath = @"d:\projects\myproject\packages\test\tools";
@ -150,10 +150,10 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_PackageInstallDirectoryIsSet_ProjectSessionVariableIsSet() public void Run_PackageInstallDirectoryIsSet_ProjectSessionVariableIsSet()
{ {
CreateScript(); CreateScript();
ExecuteScript(); RunScript();
var project = fakeSession.VariablesAdded["__project"]; var project = fakeSession.VariablesAdded["__project"];
@ -161,11 +161,11 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_PackageInstallDirectoryIsSet_ScriptIsInvoked() public void Run_PackageInstallDirectoryIsSet_ScriptIsInvoked()
{ {
CreateScript(); CreateScript();
fakeScriptFileName.ToStringReturnValue = @"d:\projects\myproject\packages\test\tools\init.ps1"; fakeScriptFileName.ToStringReturnValue = @"d:\projects\myproject\packages\test\tools\init.ps1";
ExecuteScript(); RunScript();
string actualScript = fakeSession.ScriptPassedToInvokeScript; string actualScript = fakeSession.ScriptPassedToInvokeScript;
@ -176,37 +176,37 @@ namespace PackageManagement.Tests.Scripting
} }
[Test] [Test]
public void Execute_PackageInstallDirectoryIsSet_PackageSessionVariableIsRemoved() public void Run_PackageInstallDirectoryIsSet_PackageSessionVariableIsRemoved()
{ {
CreateScript(); CreateScript();
ExecuteScript(); RunScript();
AssertSessionVariableIsRemoved("__package"); AssertSessionVariableIsRemoved("__package");
} }
[Test] [Test]
public void Execute_PackageInstallDirectoryIsSet_RootPathSessionVariableIsRemoved() public void Run_PackageInstallDirectoryIsSet_RootPathSessionVariableIsRemoved()
{ {
CreateScript(); CreateScript();
ExecuteScript(); RunScript();
AssertSessionVariableIsRemoved("__rootPath"); AssertSessionVariableIsRemoved("__rootPath");
} }
[Test] [Test]
public void Execute_PackageInstallDirectoryIsSet_ToolsPathSessionVariableIsRemoved() public void Run_PackageInstallDirectoryIsSet_ToolsPathSessionVariableIsRemoved()
{ {
CreateScript(); CreateScript();
ExecuteScript(); RunScript();
AssertSessionVariableIsRemoved("__toolsPath"); AssertSessionVariableIsRemoved("__toolsPath");
} }
[Test] [Test]
public void Execute_PackageInstallDirectoryIsSet_ProjectSessionVariableIsRemoved() public void Run_PackageInstallDirectoryIsSet_ProjectSessionVariableIsRemoved()
{ {
CreateScript(); CreateScript();
ExecuteScript(); RunScript();
AssertSessionVariableIsRemoved("__project"); AssertSessionVariableIsRemoved("__project");
} }

2
src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageInstallScriptTests.cs

@ -32,7 +32,7 @@ namespace PackageManagement.Tests.Scripting
void ExecuteScript() void ExecuteScript()
{ {
script.Execute(fakeSession); script.Run(fakeSession);
} }
[Test] [Test]

Loading…
Cancel
Save