Skip to content

Rename some tests because they are duplicates #6312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 1 commit into from
Mar 7, 2018
Merged

Rename some tests because they are duplicates #6312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions test/powershell/Language/Classes/Scripting.Classes.BasicParsing.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ Describe 'Negative Parsing Tests' -Tags "CI" {
ShouldBeParseError 'class foo {} class foo {}' MemberAlreadyDefined 13
ShouldBeParseError 'class foo { $x; $x; }' MemberAlreadyDefined 16 -SkipAndCheckRuntimeError
ShouldBeParseError 'class foo { [int][string]$x; }' TooManyTypes 17
ShouldBeParseError 'class foo { [int][string]$x; }' TooManyTypes 17
ShouldBeParseError 'class foo { static static $x; }' DuplicateQualifier 19
ShouldBeParseError 'class foo { [zz]$x; }' TypeNotFound 13
ShouldBeParseError 'class foo { [zz]f() { return 0 } }' TypeNotFound 13
Expand Down Expand Up @@ -286,11 +285,6 @@ Describe 'Negative Parsing Tests' -Tags "CI" {
ShouldBeParseError 'class C { $x; static bar() { $this.x = 1 } }' NonStaticMemberAccessInStaticMember 29
ShouldBeParseError 'class C { $x; static $y = $this.x }' NonStaticMemberAccessInStaticMember 26

ShouldBeParseError 'class C { $x; static bar() { $this.x = 1 } }' NonStaticMemberAccessInStaticMember 29
ShouldBeParseError 'class C { $x; static $y = $this.x }' NonStaticMemberAccessInStaticMember 26
ShouldBeParseError 'class C { $x; static bar() { $This.x = 1 } }' NonStaticMemberAccessInStaticMember 29
ShouldBeParseError 'class C { $x; static $y = $This.x }' NonStaticMemberAccessInStaticMember 26

ShouldBeParseError 'class C { [void]foo() { try { throw "foo"} finally { return } } }' ControlLeavingFinally 53
ShouldBeParseError 'class C { [int]foo() { return; return 1 } }' NonVoidMethodMissingReturnValue 23
ShouldBeParseError 'class C { [int]foo() { try { throw "foo"} catch { } } }' MethodHasCodePathNotReturn 15
Expand Down Expand Up @@ -371,20 +365,20 @@ Describe 'Negative ClassAttributes Tests' -Tags "CI" {
[System.Management.Automation.Cmdlet("Get", "Thing")]class C{}
$t = [C].GetCustomAttributes($false)

It "Should have one attribute" {$t.Count | should be 1}
It "Should have instance of CmdletAttribute" {$t[0].GetType().FullName | should be System.Management.Automation.CmdletAttribute }
It "Should have one attribute (class C)" {$t.Count | should be 1}
It "Should have instance of CmdletAttribute (class C)" {$t[0].GetType().FullName | should be System.Management.Automation.CmdletAttribute }

[System.Management.Automation.CmdletAttribute]$c = $t[0]
It "Verb should be Get" {$c.VerbName | should be 'Get'}
It "Noun should be Thing" {$c.NounName | should be 'Thing'}
It "Verb should be Get (class C)" {$c.VerbName | should be 'Get'}
It "Noun should be Thing (class C)" {$c.NounName | should be 'Thing'}

[System.Management.Automation.Cmdlet("Get", "Thing", SupportsShouldProcess = $true, SupportsPaging = $true)]class C2{}
$t = [C2].GetCustomAttributes($false)
It "Should have one attribute" { $t.Count | should be 1 }
It "Should have instance of CmdletAttribute" { $t[0].GetType().FullName | should be System.Management.Automation.CmdletAttribute }
It "Should have one attribute (class C2)" { $t.Count | should be 1 }
It "Should have instance of CmdletAttribute (class C2)" { $t[0].GetType().FullName | should be System.Management.Automation.CmdletAttribute }
[System.Management.Automation.CmdletAttribute]$c = $t[0]
It "Verb should be Get" {$c.VerbName | should be 'Get'}
It "Noun should be Thing" {$c.NounName | should be 'Thing'}
It "Verb should be Get (class C2)" {$c.VerbName | should be 'Get'}
It "Noun should be Thing (class C2)" {$c.NounName | should be 'Thing'}

It "SupportsShouldProcess should be $true" { $c.ConfirmImpact | should be $true }
It "SupportsPaging should be `$true" { $c.SupportsPaging | should be $true }
Expand Down Expand Up @@ -433,7 +427,7 @@ Describe 'Positive SelfClass Type As Parameter Test' -Tags "CI" {
Print() { Write-Host "[`$x=$($this.x) `$y=$($this.y)]" }
Set($x, $y) { $this.x = $x; $this.y = $y }
}
It "[Point]::Add works" {
It "[Point]::Add works construction via ::new" {
$point = [Point]::new(100,200)
$point2 = [Point]::new(1,2)
$point.Add($point2)
Expand All @@ -442,7 +436,7 @@ Describe 'Positive SelfClass Type As Parameter Test' -Tags "CI" {
$point.y | should be 202
}

It "[Point]::Add works" {
It "[Point]::Add works construction via new-object" {
$point = New-Object Point 100,200
$point2 = New-Object Point 1,2
$point.Add($point2)
Expand Down Expand Up @@ -517,8 +511,8 @@ $ctorAssignments

`$inst = [Foo]::new($methodArguments)
`$sum = $addUpProperties
It "ExpectedTotal" { `$sum | should be $expectedTotal }
It "ExpectedTotal"{ `$inst.DoSomething($methodArguments) | should be $expectedTotal }
It "ExpectedTotal: Sum should be $expectedTotal" { `$sum | should be $expectedTotal }
It "ExpectedTotal: Invocation should return $expectedTotal" { `$inst.DoSomething($methodArguments) | should be $expectedTotal }
"@

Invoke-Expression $class
Expand Down
6 changes: 3 additions & 3 deletions test/powershell/Language/Scripting/Debugging/DebuggerScriptTests.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,13 @@ Describe "Unit tests for various script breakpoints" -Tags "CI" {
{
$actual = @(& $command)

It "Script breakpoint count" {
It "Script breakpoint count '${command}'|${expected}" {
$actual.Count | Should Be $expected.Count
}

foreach ($breakpoint in $actual)
{
It "Expected script breakpoints" {
It "Expected script breakpoints '${command}|${breakpoint}'" {
($expected -contains $breakpoint) | Should Be $true
}
}
Expand All @@ -286,7 +286,7 @@ Describe "Unit tests for various script breakpoints" -Tags "CI" {
}
catch
{
It "Script failed expected exception" {
It "Script failed expected exception '${command}'" {
$_.Exception.GetType().Name | Should Be $exception
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/tools/Modules/HelpersLanguage/HelpersLanguage.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ function ShouldBeParseError
{
$errorId = $err.ErrorId
}
It "Error Id" { $errorId | Should Be $expectedErrors[$i] }
It "Error Id (iteration:$i)" { $errorId | Should Be $expectedErrors[$i] }
$acutalPostion = $err.Extent.StartScriptPosition.Offset
if ( $CheckColumnNumber ) { $acutalPostion = $err.Extent.StartScriptPosition.ColumnNumber }
It "Error position" -Pending:$SkipAndCheckRuntimeError { $acutalPostion | Should Be $expectedOffsets[$i] }
It "Error position (iteration:$i)" -Pending:$SkipAndCheckRuntimeError { $acutalPostion | Should Be $expectedOffsets[$i] }
}
}
}
Expand Down