Move things around

Author: vors

tests/pester/Syntax.Tests.ps1

@@ -4,18 +4,21 @@ Import-Module "$PSScriptRoot\SyntaxHelper.psm1"
 
 Describe "Syntax highlighting" {
 
-    if (-not (Test-Path $scopesFile)) {
+    Context "test-file.ps1" {
+        
+        $tokensFileName = "test-file.ps1.tokens"
+        $tokensFolder = Join-Path $sublimeRoot "Data\Packages\User\UnitTesting\tokens" 
+        $scopesFile = Join-Path $tokensFolder $tokensFileName 
+
+        $testFile = Resolve-Path "$PSScriptRoot\..\samples\test-file.ps1"
+
+        if (-not (Test-Path $scopesFile)) {
         Write-Warning @'
 This Pester UT file consumes scopes generated by python unit test Test_TokenGenerator.testGetTokens .
 You need to run python tests first to make it work.
 '@
         return
-    }
-
-    Context "test-file.ps1" {
-        
-        $scopesFile = Join-Path $sublimeRoot "Data\Packages\User\UnitTesting\tokens\PowerShell_tokens"
-        $testFile = Resolve-Path "$PSScriptRoot\..\samples\test-file.ps1"
+        }
 
         # splitted in two lines, because of a bug in Sort-Object
         $stScopes = cat -Raw $scopesFile | ConvertFrom-Json; $stScopes = $stScopes | sort -Property @('startOffset', 'endOffset')
@@ -47,7 +50,7 @@ You need to run python tests first to make it work.
                             $ignore = $true
                         }
 
-                        # These are bugs, TODO it
+                        # TODO: These are bugs
                         if (@('Number', 'Redirection') -contains $psScope.Kind) {
                             $ignore = $true    
                         }
@@ -59,6 +62,7 @@ You need to run python tests first to make it work.
                     }
                 }
             }
+            # TODO: These are bugs, make it 0
             $errorCounter | Should be @(0..4)
         }
     }

tests/py/__init__.py

@@ -1,7 +1,7 @@
 import unittest
-
 import sublime
-
+import os
+import json
 
 class ViewTest(unittest.TestCase):
     def setUp(self):
@@ -39,6 +39,20 @@ def setUp(self):
 
 class PowerShellSyntaxTokenTest(PowerShellSyntaxTest):
 
+    def writeTokensToFile(self, tokens, name):
+        outputdir = os.path.join(sublime.packages_path(), 'User', 'UnitTesting', "tokens")
+        if not os.path.isdir(outputdir):
+            os.makedirs(outputdir)
+        outfile = os.path.join(outputdir, name)
+
+        if os.path.exists(outfile):
+            os.remove(outfile)
+        with open(outfile, 'w') as f:
+            f.write(json.dumps(tokens, indent=4, separators=(',', ': ')))
+
+    def getTestFilePath(self):
+        return os.path.join(sublime.packages_path(), 'PowerShell', 'tests', 'samples', 'test-file.ps1')
+
     def getTokens(self):
         selectors = [
             "comment.block",

tests/py/syntax_def/test_token_gen.py

@@ -5,23 +5,17 @@
 from PowerShell.tests.py import PowerShellSyntaxTokenTest
 
 class Test_TokenGenerator(PowerShellSyntaxTokenTest):
-    def testGetTokens(self):
+    
+    def setUp(self):
+        super().setUp()
+        self.test_path = os.path.join(sublime.packages_path(), 'PowerShell', 'tests', 'samples', 'test-file.ps1')
 
-        test_path = os.path.join(sublime.packages_path(), 'PowerShell', 'tests', 'samples', 'test-file.ps1')
+    def testGetTokens(self):
 
-        with open(test_path) as f:
+        with open(self.test_path) as f:
             content = f.readlines()
             for line in content:
                 self.append(line)
 
-        tokens = self.getTokens()
-        
-        outputdir = os.path.join(sublime.packages_path(), 'User', 'UnitTesting', "tokens")
-        if not os.path.isdir(outputdir):
-            os.makedirs(outputdir)
-        outfile = os.path.join(outputdir, "PowerShell_tokens")
-
-        if os.path.exists(outfile):
-            os.remove(outfile)
-        with open(outfile, 'w') as f:
-            f.write(json.dumps(tokens, indent=4, separators=(',', ': ')))
+        self.writeTokensToFile(self.getTokens(), "test-file.ps1.tokens")
+