Merge pull request #22 from startersclan/fix/tests-fix-unit-tests-to-…

…work-correctly Fix (tests): Fix unit tests to work correctly
startersclan · Feb 7, 2023 · 74c61d6 · 74c61d6
2 parents fa1872a + 6d94585
commit 74c61d6
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 47 deletions.
diff --git a/src/PSSourceQuery/public/GoldSourceRcon.Tests.ps1 b/src/PSSourceQuery/public/GoldSourceRcon.Tests.ps1
@@ -4,29 +4,30 @@ $sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path) -replace '\.Tests\.', '.'
 
 Describe "GoldSourceRcon" -Tag 'Unit' {
 
-    Context 'Runs' {
-
-        $gameservers = [ordered]@{
-            # Goldsource
-            cstrike = @{
-                Address = 'cs.startersclan.com'
-                Port = 27815
-            }
-            czero = @{
-                Address = 'cs.startersclan.com'
-                Port = 27615
-            }
-            valve = @{
-                Address = 'hl.startersclan.com'
-                Port = 27915
-            }
+    $gameservers = [ordered]@{
+        # Goldsource
+        cstrike = @{
+            Address = 'cs.startersclan.com'
+            Port = 27815
+        }
+        czero = @{
+            Address = 'cs.startersclan.com'
+            Port = 27615
+        }
+        valve = @{
+            Address = 'hl.startersclan.com'
+            Port = 27915
         }
+    }
+
+    Context 'Error handling' {
 
         It 'Handles errors (error stream)' {
             $password = 'foo'
             $command = 'status'
             $ErrorActionPreference = 'Continue'
-            Mock Write-Verbose {
+            . "$here\..\private\Resolve-DNS.ps1"
+            Mock Resolve-DNS {
                 throw 'some error'
             }
 
@@ -41,7 +42,8 @@ Describe "GoldSourceRcon" -Tag 'Unit' {
             $password = 'foo'
             $command = 'status'
             $ErrorActionPreference = 'Stop'
-            Mock Write-Verbose {
+            . "$here\..\private\Resolve-DNS.ps1"
+            Mock Resolve-DNS {
                 throw 'some exception'
             }
 
@@ -50,18 +52,21 @@ Describe "GoldSourceRcon" -Tag 'Unit' {
                 { GoldSourceRcon @params -Password $password -Command $command } | Should -Throw 'some exception'
             }
         }
+    }
+
+    Context 'Behavior' {
 
         It 'Fails when rcon password is wrong' {
             $password = "$( Get-Random -Minimum 1 -Maximum 1000000 )"
             $command = 'status'
             $ErrorActionPreference = 'Stop'
-            Mock Write-Verbose {}
-
+            . "$here\..\private\Resolve-DNS.ps1"
             foreach ($game in $gameservers.Keys) {
                 $params = $gameservers[$game]
-                { GoldSourceRcon @params -Password $password -Command $command } | Should -Throw 'Bad rcon_password'
+                {
+                    GoldSourceRcon @params -Password $password -Command $command
+                } | Should -Throw 'Bad rcon_password'
             }
-
         }
 
     }

diff --git a/src/PSSourceQuery/public/SourceQuery.Tests.ps1 b/src/PSSourceQuery/public/SourceQuery.Tests.ps1
@@ -4,15 +4,15 @@ $sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path) -replace '\.Tests\.', '.'
 
 Describe "SourceQuery" -Tag 'Unit' {
 
-    Context 'Runs' {
+    Context 'Behavior' {
 
         $gameservers = [ordered]@{
             # Source
-            left4dead2 = @{
-                Address = 'l4d.startersclan.com'
-                Port = 27015
-                Engine = 'Source'
-            }
+            # left4dead2 = @{
+            #     Address = 'l4d.startersclan.com'
+            #     Port = 27016
+            #     Engine = 'Source'
+            # }
             csgo = @{
                 Address = 'cs.startersclan.com'
                 Port = 27115
@@ -44,6 +44,7 @@ Describe "SourceQuery" -Tag 'Unit' {
         It 'Gets info' {
             $type = 'info'
             $ErrorActionPreference = 'Stop'
+            . "$here\..\private\Resolve-DNS.ps1"
 
             foreach ($game in $gameservers.Keys) {
                 $params = $gameservers[$game]
@@ -56,6 +57,7 @@ Describe "SourceQuery" -Tag 'Unit' {
         It 'Gets players' {
             $type = 'players'
             $ErrorActionPreference = 'Stop'
+            . "$here\..\private\Resolve-DNS.ps1"
 
             foreach ($game in $gameservers.Keys) {
                 $params = $gameservers[$game]
@@ -68,6 +70,7 @@ Describe "SourceQuery" -Tag 'Unit' {
         It 'Gets rules' {
             $type = 'rules'
             $ErrorActionPreference = 'Stop'
+            . "$here\..\private\Resolve-DNS.ps1"
 
             foreach ($game in $gameservers.Keys) {
                 $params = $gameservers[$game]

diff --git a/src/PSSourceQuery/public/SourceRcon.Tests.ps1 b/src/PSSourceQuery/public/SourceRcon.Tests.ps1
@@ -4,29 +4,29 @@ $sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path) -replace '\.Tests\.', '.'
 
 Describe "SourceRcon" -Tag 'Unit' {
 
-    Context 'Runs' {
-
-        $gameservers = [ordered]@{
-            # Source
-            left4dead2 = @{
-                Address = 'cs.startersclan.com'
-                Port = 27015
-            }
-            csgo = @{
-                Address = 'cs.startersclan.com'
-                Port = 27115
-            }
-            hl2mp = @{
-                Address = 'hl.startersclan.com'
-                Port = 27215
-            }
+    $gameservers = [ordered]@{
+        # Source
+        # left4dead2 = @{
+        #     Address = 'l4d.startersclan.com'
+        #     Port = 27015
+        # }
+        csgo = @{
+            Address = 'cs.startersclan.com'
+            Port = 27115
+        }
+        hl2mp = @{
+            Address = 'hl.startersclan.com'
+            Port = 27215
         }
+    }
+
+    Context 'Error handling' {
 
         It 'Handles errors (error stream)' {
             $password = 'foo'
             $command = 'status'
             $ErrorActionPreference = 'Continue'
-            Mock Write-Verbose {
+            function Resolve-DNS {
                 throw 'some error'
             }
 
@@ -41,7 +41,7 @@ Describe "SourceRcon" -Tag 'Unit' {
             $password = 'foo'
             $command = 'status'
             $ErrorActionPreference = 'Stop'
-            Mock Write-Verbose {
+            function Resolve-DNS {
                 throw 'some exception'
             }
 
@@ -51,6 +51,10 @@ Describe "SourceRcon" -Tag 'Unit' {
             }
         }
 
+    }
+
+    Context 'Behavior' {
+
         It 'Fails when rcon password is wrong' {
             $password = "$( Get-Random -Minimum 1 -Maximum 1000000 )"
             $command = 'status'
@@ -59,7 +63,9 @@ Describe "SourceRcon" -Tag 'Unit' {
 
             foreach ($game in $gameservers.Keys) {
                 $params = $gameservers[$game]
-                { SourceRcon @params -Password $password -Command $command } | Should -Throw 'Bad rcon password.'
+                {
+                    SourceRcon @params -Password $password -Command $command
+                } | Should -Throw 'Bad rcon password.'
             }
 
         }