Cleanup test code

vors · vors · commit 849adcb9dd47 · 2015-01-21T01:22:37.000-08:00
diff --git a/tests/pester/Syntax.Tests.ps1 b/tests/pester/Syntax.Tests.ps1
@@ -17,7 +17,7 @@ Describe "Syntax highlighting" {
         }
 
         # splitted in two lines, because of a bug in Sort-Object
-        $stScopes = cat -Raw $scopesFile | ConvertFrom-Json; $stScopes = $stScopes | sort -Property @('startOffset', 'endOffset')
+        $stScopes =  Get-SublimeScopesFromFile $scopesFile
         # tokens are already sorted
         $psScopes = Get-TokensFromFile $testFile | Convert-TokenToScope 
 
diff --git a/tests/pester/SyntaxHelper.psm1 b/tests/pester/SyntaxHelper.psm1
@@ -18,7 +18,6 @@ function Get-SublimeScopesFromFile
         [string] $filePath
     )
 
-    # splitted in two lines, because of a bug in Sort-Object
     $scopes = cat -Raw $filePath | ConvertFrom-Json
     $scopes = $scopes | sort -Property @('startOffset', 'endOffset')
     return $scopes

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Describe "Syntax highlighting" {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`# splitted in two lines, because of a bug in Sort-Object`
`20`		`- $stScopes = cat -Raw $scopesFile \| ConvertFrom-Json; $stScopes = $stScopes \| sort -Property @('startOffset', 'endOffset')`
	`20`	`+ $stScopes = Get-SublimeScopesFromFile $scopesFile`
`21`	`21`	`# tokens are already sorted`
`22`	`22`	`$psScopes = Get-TokensFromFile $testFile \| Convert-TokenToScope`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ function Get-SublimeScopesFromFile`
`18`	`18`	`[string] $filePath`
`19`	`19`	`)`
`20`	`20`
`21`		`- # splitted in two lines, because of a bug in Sort-Object`
`22`	`21`	`$scopes = cat -Raw $filePath \| ConvertFrom-Json`
`23`	`22`	`$scopes = $scopes \| sort -Property @('startOffset', 'endOffset')`
`24`	`23`	`return $scopes`