From 264fcd4cbad567df2a23abace235562b33489de5 Mon Sep 17 00:00:00 2001 From: sethvs Date: Thu, 30 Aug 2018 10:52:44 +0300 Subject: [PATCH 1/2] Fix module specification hashtable in ModuleSpecification.Tests.ps1. --- test/powershell/engine/Module/ModuleSpecification.Tests.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/powershell/engine/Module/ModuleSpecification.Tests.ps1 b/test/powershell/engine/Module/ModuleSpecification.Tests.ps1 index f41f3a262f3..210cc6634b1 100644 --- a/test/powershell/engine/Module/ModuleSpecification.Tests.ps1 +++ b/test/powershell/engine/Module/ModuleSpecification.Tests.ps1 @@ -228,7 +228,7 @@ Describe "ModuleSpecification objects and logic" -Tag "CI" { $testCases = @( @{ TestName = "Version+RequiredVersion" - ModuleSpecification = @{ Name = "BadVersionModule"; ModuleVersion = "3.1"; RequiredVersion = "3.1" } + ModuleSpecification = @{ ModuleName = "BadVersionModule"; ModuleVersion = "3.1"; RequiredVersion = "3.1" } }, @{ TestName = "NoName" @@ -236,11 +236,11 @@ Describe "ModuleSpecification objects and logic" -Tag "CI" { }, @{ TestName = "BadField" - ModuleSpecification = @{ Name = "StrangeFieldModule"; RequiredVersion = "7.4"; Duck = "1.2" } + ModuleSpecification = @{ ModuleName = "StrangeFieldModule"; RequiredVersion = "7.4"; Duck = "1.2" } }, @{ TestName = "BadType" - ModuleSpecification = @{ Name = "BadTypeModule"; RequiredVersion = "Hello!" } + ModuleSpecification = @{ ModuleName = "BadTypeModule"; RequiredVersion = "Hello!" } } ) } From 34a5f3a8cd91881a63d130451542603f3ece3c1a Mon Sep 17 00:00:00 2001 From: sethvs Date: Fri, 31 Aug 2018 12:23:47 +0300 Subject: [PATCH 2/2] Add ErrorId. --- test/powershell/engine/Module/ModuleSpecification.Tests.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/powershell/engine/Module/ModuleSpecification.Tests.ps1 b/test/powershell/engine/Module/ModuleSpecification.Tests.ps1 index 210cc6634b1..b9f81a47463 100644 --- a/test/powershell/engine/Module/ModuleSpecification.Tests.ps1 +++ b/test/powershell/engine/Module/ModuleSpecification.Tests.ps1 @@ -229,18 +229,22 @@ Describe "ModuleSpecification objects and logic" -Tag "CI" { @{ TestName = "Version+RequiredVersion" ModuleSpecification = @{ ModuleName = "BadVersionModule"; ModuleVersion = "3.1"; RequiredVersion = "3.1" } + ErrorId = 'ArgumentException' }, @{ TestName = "NoName" ModuleSpecification = @{ ModuleVersion = "0.2" } + ErrorId = 'MissingMemberException' }, @{ TestName = "BadField" ModuleSpecification = @{ ModuleName = "StrangeFieldModule"; RequiredVersion = "7.4"; Duck = "1.2" } + ErrorId = 'ArgumentException' }, @{ TestName = "BadType" ModuleSpecification = @{ ModuleName = "BadTypeModule"; RequiredVersion = "Hello!" } + ErrorId = 'PSInvalidCastException' } ) } @@ -252,7 +256,7 @@ Describe "ModuleSpecification objects and logic" -Tag "CI" { It "Cannot create from invalid module hashtables: " -TestCases $testCases { param([string]$TestName, [hashtable]$ModuleSpecification) - { [ModuleSpecification]::new($ModuleSpecification) } | Should -Throw + { [ModuleSpecification]::new($ModuleSpecification) } | Should -Throw -ErrorId $ErrorId } } }