Fixing mutex tests

adamdriscoll · Aug 15, 2016 · c89b8b7 · c89b8b7
1 parent fd07c42
commit c89b8b7
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 36 deletions.
diff --git a/Build/NewManifest.ps1 b/Build/NewManifest.ps1
@@ -57,6 +57,7 @@ $NestedModules = @(
 				  ".\Interop.ps1",
                   ".\ListDlls.ps1", 
 				  '.\ListUsers.ps1',
+				  ".\Mutex.ps1",
                   ".\MoveFile.ps1", 
 				  ".\MemoryMappedFile.ps1", 
                   ".\NamedPipes.ps1",

diff --git a/Hooks.ps1 b/Hooks.ps1
@@ -325,7 +325,6 @@ function Register-PoshHook
 	$CompilerParameters.ReferencedAssemblies.Add("System.dll") | Out-Null
 	$CompilerParameters.ReferencedAssemblies.Add("System.Core.dll") | Out-Null
 	$CompilerParameters.ReferencedAssemblies.Add("System.Runtime.Remoting.dll") | Out-Null
-	$CompilerParameters.ReferencedAssemblies.Add("EasyHook.dll") | Out-Null
 	$CompilerParameters.OutputAssembly = $HookPath
 
 	Add-Type -Path (Join-Path $PSScriptRoot "HookInject.cs") -CompilerParameters $CompilerParameters | Out-Null 

diff --git a/Mutex.ps1 b/Mutex.ps1
@@ -19,24 +19,12 @@ function Enter-Mutex
 {
 	[CmdletBinding()]
 	param(
-	[Parameter(ValueFromPipeline=$true, Mandatory, ParmeterSetName='Mutex')]
-	[System.Threading.Mutex]$Mutex,
-	[Parameter(ValueFromPipeline=$true, Mandatory, ParmeterSetName='Name')]
-	[System.Threading.Mutex]$Name
+	[Parameter(ValueFromPipeline=$true, Mandatory)]
+	[System.Threading.Mutex]$Mutex
 	)
 
 	Process {
-		if ($PSCmdlet.ParameterSetName -eq 'Mutex')
-		{
-			$Mutex.WaitOne()
-		}
-		elseif ($PSCmdlet.ParameterSetName -eq 'Name')
-		{
-
-		}
-
-
-
+		$Mutex.WaitOne()
 	}
 }
 

diff --git a/PoshInternals.psd1 b/PoshInternals.psd1
diff --git a/Tests/Handle.Tests.ps1 b/Tests/Handle.Tests.ps1
@@ -1,4 +1,4 @@
-Describe "Get-Handle" {
+Describe "Get-Handle"  {
 	. (Join-Path $PSScriptRoot 'InitializeTest.ps1')
 
 	Context "File is locked" {

diff --git a/Tests/Hooks.Tests.ps1 b/Tests/Hooks.Tests.ps1
@@ -1,31 +1,23 @@
 Describe "HooksTest" {
 	. (Join-Path $PSScriptRoot 'InitializeTest.ps1')
 
-	try 
-	{
-		Register-PoshHook 
-	}
-	catch 
-	{
-		Write-Warning $_
-		return
-	}
-
+	Register-PoshHook 
 
-	Context "LocalHookTest" {
-		Set-Hook -Dll "Kernel32.dll" -ReturnType "bool" -EntryPoint "Beep" -Verbose -ScriptBlock {
+	Context "Local hooked beep set to return false" {
+		Set-Hook -Dll "Kernel32.dll" -ReturnType "bool" -EntryPoint "Beep" -ScriptBlock {
 			param([int]$Freq, [int]$Duration)
-			Write-Host "Frequency was ($Freq) and duration was ($Duration)"
-			return $true
+			throw "Exception"
 		}
 
-		[Console]::Beep(1000, 1000)
-
+		It "should return false" {
+			[Console]::Beep(1000, 1000) | Should be $false
+		}
+
 		Get-Hook | Remove-Hook
 	}
 
 	Context "RemoteHookTest" {
-		$Posh = Start-Process PowerShell -ArgumentList " '& [Console]::Beep()'" -PassThru
+		$Posh = Start-Process PowerShell -ArgumentList " -noexit '& [Console]::Beep()'" -PassThru
 
 		Set-Hook -ProcessId $Posh.ProcessId -Dll "Kernel32.dll" -ReturnType "bool" -EntryPoint "Beep" -ScriptBlock {
 			param([int]$Freq, [int]$Duration)

diff --git a/Tests/Mutex.Tests.ps1 b/Tests/Mutex.Tests.ps1
@@ -7,8 +7,6 @@ Describe "Mutex" {
 		try {
 			Enter-Mutex $Mutex 
 
-			Write-Host 'Ok'
-
 			Exit-Mutex $Mutex 
 		}
 		finally {