(maint) - moves unit tests to /tests/unit dir

puppetlabs · Feb 8, 2024 · febead6 · febead6
1 parent d0b6ce2
commit febead6
Show file tree

Hide file tree

Showing 47 changed files with 982 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,8 +61,7 @@ jobs:
           $ErrorActionPreference = "Stop"
           $ResultsPath = "${{ matrix.results_file }}"
           $TestPath = @(
-            (Resolve-Path .\src\Puppet.Dsc\functions)
-            (Resolve-Path .\src\Puppet.Dsc\internal\functions)
+            (Resolve-Path .\src\Puppet.Dsc\tests\Unit)
             (Resolve-Path .\src\Puppet.Dsc\tests\general)
           )
           $Results = .\scripts\invoke_tests.ps1 -TestPath $TestPath -ResultsPath $ResultsPath -Tag ${{ matrix.tag }}

diff --git a/Puppet.Dsc b/Puppet.Dsc
diff --git a/...functions/Add-DscResourceModule.Tests.ps1 → ...ests/Unit/Add-DscResourceModule.Tests.ps1 b/...functions/Add-DscResourceModule.Tests.ps1 → ...ests/Unit/Add-DscResourceModule.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Add-DscResourceModule' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
 
     Mock New-Item -Verifiable
     Mock Save-Module -Verifiable

diff --git a/...dd-PuppetReferenceDocumentation.Tests.ps1 → ...dd-PuppetReferenceDocumentation.Tests.ps1 b/...dd-PuppetReferenceDocumentation.Tests.ps1 → ...dd-PuppetReferenceDocumentation.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Add-PuppetReferenceDocumentation' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...ctions/ConvertFrom-VersionBuild.Tests.ps1 → ...s/Unit/ConvertFrom-VersionBuild.Tests.ps1 b/...ctions/ConvertFrom-VersionBuild.Tests.ps1 → ...s/Unit/ConvertFrom-VersionBuild.Tests.ps1
@@ -1,6 +1,6 @@
 Describe 'ConvertFrom-VersionBuild' -Tag 'Unit' {
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...ertTo-CanonicalPuppetAuthorName.Tests.ps1 → ...ertTo-CanonicalPuppetAuthorName.Tests.ps1 b/...ertTo-CanonicalPuppetAuthorName.Tests.ps1 → ...ertTo-CanonicalPuppetAuthorName.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'ConvertTo-CanonicalPuppetAuthorName' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
   Context 'Basic verification' {
     It 'lower-cases author name' {

diff --git a/...ons/ConvertTo-PuppetResourceApi.Tests.ps1 → ...nit/ConvertTo-PuppetResourceApi.Tests.ps1 b/...ons/ConvertTo-PuppetResourceApi.Tests.ps1 → ...nit/ConvertTo-PuppetResourceApi.Tests.ps1
@@ -3,7 +3,7 @@ Describe 'ConvertTo-CanonicalPuppetAuthorName' -Tag 'Unit' {
     $ModuleRootPath = Split-Path -Parent $PSCommandPath |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...ions/ConvertTo-PuppetRubyString.Tests.ps1 → ...Unit/ConvertTo-PuppetRubyString.Tests.ps1 b/...ions/ConvertTo-PuppetRubyString.Tests.ps1 → ...Unit/ConvertTo-PuppetRubyString.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'ConvertTo-CanonicalPuppetAuthorName' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...ertTo-StandardizedVersionString.Tests.ps1 → ...ertTo-StandardizedVersionString.Tests.ps1 b/...ertTo-StandardizedVersionString.Tests.ps1 → ...ertTo-StandardizedVersionString.Tests.ps1
@@ -1,6 +1,6 @@
 Describe 'ConvertTo-StandardizedVersionString' -Tag 'Unit' {
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...nctions/ConvertTo-UnescapedJson.Tests.ps1 → ...ts/Unit/ConvertTo-UnescapedJson.Tests.ps1 b/...nctions/ConvertTo-UnescapedJson.Tests.ps1 → ...ts/Unit/ConvertTo-UnescapedJson.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'ConvertTo-UnescapedJson' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
   Context 'Basic verification' {
     It 'Converts the object to JSON without unicode escapes' {

diff --git a/...unctions/ConvertTo-VersionBuild.Tests.ps1 → ...sts/Unit/ConvertTo-VersionBuild.Tests.ps1 b/...unctions/ConvertTo-VersionBuild.Tests.ps1 → ...sts/Unit/ConvertTo-VersionBuild.Tests.ps1
@@ -1,6 +1,6 @@
 Describe 'ConvertTo-VersionBuild' -Tag 'Unit' {
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...c/functions/Export-PuppetModule.Tests.ps1 → .../tests/Unit/Export-PuppetModule.Tests.ps1 b/...c/functions/Export-PuppetModule.Tests.ps1 → .../tests/Unit/Export-PuppetModule.Tests.ps1
@@ -6,7 +6,7 @@ Describe 'Export-PuppetModule' -Tag 'Unit' {
   }
 
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...ions/Get-CimClassPropertiesList.Tests.ps1 → ...Unit/Get-CimClassPropertiesList.Tests.ps1 b/...ions/Get-CimClassPropertiesList.Tests.ps1 → ...Unit/Get-CimClassPropertiesList.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-CimClassPropertiesList' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...s/Get-DscResourceImplementation.Tests.ps1 → ...t/Get-DscResourceImplementation.Tests.ps1 b/...s/Get-DscResourceImplementation.Tests.ps1 → ...t/Get-DscResourceImplementation.Tests.ps1
@@ -1,6 +1,6 @@
 Describe 'Get-DscResourceImplementation' -Tag 'Unit' {
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
 
     # The using statement will fail without a correct module path;
     # The scriptblock in Start-Job can't see the Pester TestDrive,

diff --git a/...ns/Get-DscResourceParameterInfo.Tests.ps1 → ...it/Get-DscResourceParameterInfo.Tests.ps1 b/...ns/Get-DscResourceParameterInfo.Tests.ps1 → ...it/Get-DscResourceParameterInfo.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-DscResourceParameterInfo' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'When the AST can be parsed for functions' {

diff --git a/...ResourceParameterInfoByCimClass.Tests.ps1 → ...ResourceParameterInfoByCimClass.Tests.ps1 b/...ResourceParameterInfoByCimClass.Tests.ps1 → ...ResourceParameterInfoByCimClass.Tests.ps1
@@ -6,7 +6,7 @@ Describe 'Get-DscResourceParameterInfoByCimClass' -Skip:(!$RunningElevated) -Tag
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/.../Get-DscResourceTypeInformation.Tests.ps1 → .../Get-DscResourceTypeInformation.Tests.ps1 b/.../Get-DscResourceTypeInformation.Tests.ps1 → .../Get-DscResourceTypeInformation.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-DscResourceTypeInformation' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...nctions/Get-EmbeddedCimInstance.Tests.ps1 → ...ts/Unit/Get-EmbeddedCimInstance.Tests.ps1 b/...nctions/Get-EmbeddedCimInstance.Tests.ps1 → ...ts/Unit/Get-EmbeddedCimInstance.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-EmbeddedCimInstance' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...c/functions/Get-ForgeModuleInfo.Tests.ps1 → .../tests/Unit/Get-ForgeModuleInfo.Tests.ps1 b/...c/functions/Get-ForgeModuleInfo.Tests.ps1 → .../tests/Unit/Get-ForgeModuleInfo.Tests.ps1
@@ -1,6 +1,6 @@
 Describe 'Get-ForgeModuleInfo' -Tag 'Unit' {
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'functions')).Replace('.Tests.ps1', '.ps1')
 
     Function New-ModuleInfo {
       Param(

diff --git a/...ernal/functions/Get-LatestBuild.Tests.ps1 → ....Dsc/tests/Unit/Get-LatestBuild.Tests.ps1 b/...ernal/functions/Get-LatestBuild.Tests.ps1 → ....Dsc/tests/Unit/Get-LatestBuild.Tests.ps1
@@ -7,7 +7,7 @@ Describe 'Get-LatestBuild' -Tag 'Unit' {
   }
 
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...nctions/Get-PowerShellDscModule.Tests.ps1 → ...ts/Unit/Get-PowerShellDscModule.Tests.ps1 b/...nctions/Get-PowerShellDscModule.Tests.ps1 → ...ts/Unit/Get-PowerShellDscModule.Tests.ps1
@@ -1,6 +1,6 @@
 Describe 'Get-PowerShellDscModule' -Tag 'Unit' {
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...l/functions/Get-ProviderContent.Tests.ps1 → .../tests/Unit/Get-ProviderContent.Tests.ps1 b/...l/functions/Get-ProviderContent.Tests.ps1 → .../tests/Unit/Get-ProviderContent.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-ProviderContent' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...al/functions/Get-PuppetDataType.Tests.ps1 → ...c/tests/Unit/Get-PuppetDataType.Tests.ps1 b/...al/functions/Get-PuppetDataType.Tests.ps1 → ...c/tests/Unit/Get-PuppetDataType.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-PuppetDataType' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...nctions/Get-PuppetModuleVersion.Tests.ps1 → ...ts/Unit/Get-PuppetModuleVersion.Tests.ps1 b/...nctions/Get-PuppetModuleVersion.Tests.ps1 → ...ts/Unit/Get-PuppetModuleVersion.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-PuppetModuleVersion' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...ctions/Get-PuppetizedModuleName.Tests.ps1 → ...s/Unit/Get-PuppetizedModuleName.Tests.ps1 b/...ctions/Get-PuppetizedModuleName.Tests.ps1 → ...s/Unit/Get-PuppetizedModuleName.Tests.ps1
@@ -3,7 +3,7 @@ Describe 'Get-PuppetizedModuleName' -Tag 'Unit' {
     $ModuleRootPath = Split-Path -Parent $PSCommandPath |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...nal/functions/Get-ReadmeContent.Tests.ps1 → ...sc/tests/Unit/Get-ReadmeContent.Tests.ps1 b/...nal/functions/Get-ReadmeContent.Tests.ps1 → ...sc/tests/Unit/Get-ReadmeContent.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-ReadmeContent' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...nternal/functions/Get-ShortType.Tests.ps1 → ...et.Dsc/tests/Unit/Get-ShortType.Tests.ps1 b/...nternal/functions/Get-ShortType.Tests.ps1 → ...et.Dsc/tests/Unit/Get-ShortType.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-ShortType' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic functionality' {

diff --git a/...ernal/functions/Get-TypeContent.Tests.ps1 → ....Dsc/tests/Unit/Get-TypeContent.Tests.ps1 b/...ernal/functions/Get-TypeContent.Tests.ps1 → ....Dsc/tests/Unit/Get-TypeContent.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-TypeContent' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...ctions/Get-TypeParameterContent.Tests.ps1 → ...s/Unit/Get-TypeParameterContent.Tests.ps1 b/...ctions/Get-TypeParameterContent.Tests.ps1 → ...s/Unit/Get-TypeParameterContent.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Get-TypeParameterContent' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...et-UnpuppetizedDscModuleVersion.Tests.ps1 → ...et-UnpuppetizedDscModuleVersion.Tests.ps1 b/...et-UnpuppetizedDscModuleVersion.Tests.ps1 → ...et-UnpuppetizedDscModuleVersion.Tests.ps1
diff --git a/.../Initialize-DscResourceCimClass.Tests.ps1 → .../Initialize-DscResourceCimClass.Tests.ps1 b/.../Initialize-DscResourceCimClass.Tests.ps1 → .../Initialize-DscResourceCimClass.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Initialize-DscResourceCimClass' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'basic functionality' {

diff --git a/...nctions/Initialize-PuppetModule.Tests.ps1 → ...ts/Unit/Initialize-PuppetModule.Tests.ps1 b/...nctions/Initialize-PuppetModule.Tests.ps1 → ...ts/Unit/Initialize-PuppetModule.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Initialize-PuppetModule' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...nal/functions/Invoke-PdkCommand.Tests.ps1 → ...sc/tests/Unit/Invoke-PdkCommand.Tests.ps1 b/...nal/functions/Invoke-PdkCommand.Tests.ps1 → ...sc/tests/Unit/Invoke-PdkCommand.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Invoke-PdkCommand' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...c/functions/New-PuppetDscModule.Tests.ps1 → .../tests/Unit/New-PuppetDscModule.Tests.ps1 b/...c/functions/New-PuppetDscModule.Tests.ps1 → .../tests/Unit/New-PuppetDscModule.Tests.ps1
@@ -3,7 +3,7 @@ Describe 'New-PuppetDscModule' -Tag 'Unit' {
     $ModuleRootPath = Split-Path -Parent $PSCommandPath |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...internal/functions/Out-Utf8File.Tests.ps1 → ...pet.Dsc/tests/Unit/Out-Utf8File.Tests.ps1 b/...internal/functions/Out-Utf8File.Tests.ps1 → ...pet.Dsc/tests/Unit/Out-Utf8File.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Out-Utf8File' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...ons/Publish-NewDscModuleVersion.Tests.ps1 → ...nit/Publish-NewDscModuleVersion.Tests.ps1 b/...ons/Publish-NewDscModuleVersion.Tests.ps1 → ...nit/Publish-NewDscModuleVersion.Tests.ps1
diff --git a/.../functions/Publish-PuppetModule.Tests.ps1 → ...tests/Unit/Publish-PuppetModule.Tests.ps1 b/.../functions/Publish-PuppetModule.Tests.ps1 → ...tests/Unit/Publish-PuppetModule.Tests.ps1
diff --git a/...rnal/functions/Set-PSModulePath.Tests.ps1 → ...Dsc/tests/Unit/Set-PSModulePath.Tests.ps1 b/...rnal/functions/Set-PSModulePath.Tests.ps1 → ...Dsc/tests/Unit/Set-PSModulePath.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Set-PSModulePath' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...nctions/Set-PuppetModuleVersion.Tests.ps1 → ...ts/Unit/Set-PuppetModuleVersion.Tests.ps1 b/...nctions/Set-PuppetModuleVersion.Tests.ps1 → ...ts/Unit/Set-PuppetModuleVersion.Tests.ps1
@@ -6,7 +6,7 @@ Describe 'Update-PuppetModuleMetadata' -Tag 'Unit' {
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
   }
   BeforeAll {
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...ResourcePropertyParameterStatus.Tests.ps1 → ...ResourcePropertyParameterStatus.Tests.ps1 b/...ResourcePropertyParameterStatus.Tests.ps1 → ...ResourcePropertyParameterStatus.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Test-DscResourcePropertyParameterStatus' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...functions/Test-EmbeddedInstance.Tests.ps1 → ...ests/Unit/Test-EmbeddedInstance.Tests.ps1 b/...functions/Test-EmbeddedInstance.Tests.ps1 → ...ests/Unit/Test-EmbeddedInstance.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Test-EmbeddedInstance' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/.../functions/Test-RunningElevated.Tests.ps1 → ...tests/Unit/Test-RunningElevated.Tests.ps1 b/.../functions/Test-RunningElevated.Tests.ps1 → ...tests/Unit/Test-RunningElevated.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Test-RunningElevated' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...al/functions/Test-SymLinkedItem.Tests.ps1 → ...c/tests/Unit/Test-SymLinkedItem.Tests.ps1 b/...al/functions/Test-SymLinkedItem.Tests.ps1 → ...c/tests/Unit/Test-SymLinkedItem.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Test-SymLinkedItem' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   Context 'Basic verification' {

diff --git a/...ns/Update-PuppetModuleChangelog.Tests.ps1 → ...it/Update-PuppetModuleChangelog.Tests.ps1 b/...ns/Update-PuppetModuleChangelog.Tests.ps1 → ...it/Update-PuppetModuleChangelog.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'UpdatePuppetModuleChangelog' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope Puppet.Dsc {

diff --git a/...ions/Update-PuppetModuleFixture.Tests.ps1 → ...Unit/Update-PuppetModuleFixture.Tests.ps1 b/...ions/Update-PuppetModuleFixture.Tests.ps1 → ...Unit/Update-PuppetModuleFixture.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Update-PuppetModuleFixture' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...ons/Update-PuppetModuleMetadata.Tests.ps1 → ...nit/Update-PuppetModuleMetadata.Tests.ps1 b/...ons/Update-PuppetModuleMetadata.Tests.ps1 → ...nit/Update-PuppetModuleMetadata.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Update-PuppetModuleMetadata' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {

diff --git a/...tions/Update-PuppetModuleReadme.Tests.ps1 → .../Unit/Update-PuppetModuleReadme.Tests.ps1 b/...tions/Update-PuppetModuleReadme.Tests.ps1 → .../Unit/Update-PuppetModuleReadme.Tests.ps1
@@ -4,7 +4,7 @@ Describe 'Update-PuppetModuleReadme' -Tag 'Unit' {
       Split-Path -Parent |
       Split-Path -Parent
     Import-Module "$ModuleRootPath/Puppet.Dsc.psd1"
-    . $PSCommandPath.Replace('.Tests.ps1', '.ps1')
+    . ($PSCommandPath.Replace('tests\Unit', 'internal\functions')).Replace('.Tests.ps1', '.ps1')
   }
 
   InModuleScope puppet.dsc {