test: use specific language in testhelper

Bearer · Jun 13, 2024 · 2d064bb · 2d064bb
1 parent c3af4dd
commit 2d064bb
Show file tree

Hide file tree

Showing 44 changed files with 149 additions and 93 deletions.
diff --git a/...es/golang/.snapshots/TestImport--main.yml → ...ges/golang/.snapshots/TestImport-main.yml b/...es/golang/.snapshots/TestImport--main.yml → ...ges/golang/.snapshots/TestImport-main.yml
diff --git a/...es/golang/.snapshots/TestScope--scope.yml → ...ges/golang/.snapshots/TestScope-scope.yml b/...es/golang/.snapshots/TestScope--scope.yml → ...ges/golang/.snapshots/TestScope-scope.yml
diff --git a/...apshots/flow/TestFlow--different-line.yml → ...napshots/flow/TestFlow-different-line.yml b/...apshots/flow/TestFlow--different-line.yml → ...napshots/flow/TestFlow-different-line.yml
diff --git a/...g/.snapshots/flow/TestFlow--same-line.yml → ...ng/.snapshots/flow/TestFlow-same-line.yml b/...g/.snapshots/flow/TestFlow--same-line.yml → ...ng/.snapshots/flow/TestFlow-same-line.yml
diff --git a/pkg/languages/golang/golang_test.go b/pkg/languages/golang/golang_test.go
@@ -4,6 +4,7 @@ import (
 	_ "embed"
 	"testing"
 
+	"github.com/bearer/bearer/pkg/languages/golang"
 	"github.com/bearer/bearer/pkg/languages/testhelper"
 )
 
@@ -17,13 +18,13 @@ var scopeRule []byte
 var importRule []byte
 
 func TestFlow(t *testing.T) {
-	testhelper.GetRunner(t, loggerRule, "Go").RunTest(t, "./testdata/testcases/flow", ".snapshots/flow/")
+	testhelper.GetRunner(t, loggerRule, golang.Get()).RunTest(t, "./testdata/testcases/flow", ".snapshots/flow/")
 }
 
 func TestScope(t *testing.T) {
-	testhelper.GetRunner(t, scopeRule, "Go").RunTest(t, "./testdata/scope", ".snapshots/")
+	testhelper.GetRunner(t, scopeRule, golang.Get()).RunTest(t, "./testdata/scope", ".snapshots/")
 }
 
 func TestImport(t *testing.T) {
-	testhelper.GetRunner(t, importRule, "Go").RunTest(t, "./testdata/import", ".snapshots/")
+	testhelper.GetRunner(t, importRule, golang.Get()).RunTest(t, "./testdata/import", ".snapshots/")
 }
diff --git a/...ages/java/.snapshots/TestScope--scope.yml → ...uages/java/.snapshots/TestScope-scope.yml b/...ages/java/.snapshots/TestScope--scope.yml → ...uages/java/.snapshots/TestScope-scope.yml
diff --git a/...apshots/flow/TestFlow--different-line.yml → ...napshots/flow/TestFlow-different-line.yml b/...apshots/flow/TestFlow--different-line.yml → ...napshots/flow/TestFlow-different-line.yml
diff --git a/...a/.snapshots/flow/TestFlow--same-line.yml → ...va/.snapshots/flow/TestFlow-same-line.yml b/...a/.snapshots/flow/TestFlow--same-line.yml → ...va/.snapshots/flow/TestFlow-same-line.yml
diff --git a/pkg/languages/java/java_test.go b/pkg/languages/java/java_test.go
@@ -18,11 +18,11 @@ var loggerRule []byte
 var scopeRule []byte
 
 func TestFlow(t *testing.T) {
-	testhelper.GetRunner(t, loggerRule, "Java").RunTest(t, "./testdata/testcases/flow", ".snapshots/flow/")
+	testhelper.GetRunner(t, loggerRule, java.Get()).RunTest(t, "./testdata/testcases/flow", ".snapshots/flow/")
 }
 
 func TestScope(t *testing.T) {
-	testhelper.GetRunner(t, scopeRule, "Java").RunTest(t, "./testdata/scope", ".snapshots/")
+	testhelper.GetRunner(t, scopeRule, java.Get()).RunTest(t, "./testdata/scope", ".snapshots/")
 }
 
 func TestPattern(t *testing.T) {

diff --git a/....snapshots/TestPatternVariables--main.yml → .../.snapshots/TestPatternVariables-main.yml b/....snapshots/TestPatternVariables--main.yml → .../.snapshots/TestPatternVariables-main.yml
diff --git a/...avascript/.snapshots/TestScope--scope.yml → ...javascript/.snapshots/TestScope-scope.yml b/...avascript/.snapshots/TestScope--scope.yml → ...javascript/.snapshots/TestScope-scope.yml
diff --git a/...s/flow/TestFlow--assigment-expression.yml → ...ts/flow/TestFlow-assigment-expression.yml b/...s/flow/TestFlow--assigment-expression.yml → ...ts/flow/TestFlow-assigment-expression.yml
diff --git a/...ts/flow/TestFlow--variable-declarator.yml → ...ots/flow/TestFlow-variable-declarator.yml b/...ts/flow/TestFlow--variable-declarator.yml → ...ots/flow/TestFlow-variable-declarator.yml
diff --git a/.../.snapshots/import/TestImport--import.yml → ...t/.snapshots/import/TestImport-import.yml b/.../.snapshots/import/TestImport--import.yml → ...t/.snapshots/import/TestImport-import.yml
diff --git a/...tObjectDeconstructing--deconstructing.yml → ...stObjectDeconstructing-deconstructing.yml b/...tObjectDeconstructing--deconstructing.yml → ...stObjectDeconstructing-deconstructing.yml
diff --git a/...bjectDeconstructing--multiple_objects.yml → ...ObjectDeconstructing-multiple_objects.yml b/...bjectDeconstructing--multiple_objects.yml → ...ObjectDeconstructing-multiple_objects.yml
diff --git a/...hots/string/TestString--concatanation.yml → ...shots/string/TestString-concatanation.yml b/...hots/string/TestString--concatanation.yml → ...shots/string/TestString-concatanation.yml
diff --git a/.../.snapshots/string/TestString--simple.yml → ...t/.snapshots/string/TestString-simple.yml b/.../.snapshots/string/TestString--simple.yml → ...t/.snapshots/string/TestString-simple.yml
diff --git a/...hots/string/TestString--single-quotes.yml → ...shots/string/TestString-single-quotes.yml b/...hots/string/TestString--single-quotes.yml → ...shots/string/TestString-single-quotes.yml
diff --git a/...ing--template-variable-reconciliation.yml → ...ring-template-variable-reconciliation.yml b/...ing--template-variable-reconciliation.yml → ...ring-template-variable-reconciliation.yml
diff --git a/...snapshots/string/TestString--template.yml → ....snapshots/string/TestString-template.yml b/...snapshots/string/TestString--template.yml → ....snapshots/string/TestString-template.yml
diff --git a/pkg/languages/javascript/javascript_test.go b/pkg/languages/javascript/javascript_test.go
@@ -4,6 +4,7 @@ import (
 	_ "embed"
 	"testing"
 
+	"github.com/bearer/bearer/pkg/languages/javascript"
 	"github.com/bearer/bearer/pkg/languages/testhelper"
 )
 
@@ -26,25 +27,25 @@ var patternVariablesRule []byte
 var scopeRule []byte
 
 func TestFlow(t *testing.T) {
-	testhelper.GetRunner(t, datatypeRule, "Javascript").RunTest(t, "./testdata/testcases/flow", ".snapshots/flow/")
+	testhelper.GetRunner(t, datatypeRule, javascript.Get()).RunTest(t, "./testdata/testcases/flow", ".snapshots/flow/")
 }
 
 func TestObjectDeconstructing(t *testing.T) {
-	testhelper.GetRunner(t, deconstructingRule, "Javascript").RunTest(t, "./testdata/testcases/object-deconstructing", ".snapshots/object-deconstructing/")
+	testhelper.GetRunner(t, deconstructingRule, javascript.Get()).RunTest(t, "./testdata/testcases/object-deconstructing", ".snapshots/object-deconstructing/")
 }
 
 func TestImport(t *testing.T) {
-	testhelper.GetRunner(t, importRule, "Javascript").RunTest(t, "./testdata/import", ".snapshots/import/")
+	testhelper.GetRunner(t, importRule, javascript.Get()).RunTest(t, "./testdata/import", ".snapshots/import/")
 }
 
 func TestString(t *testing.T) {
-	testhelper.GetRunner(t, insecureURLRule, "Javascript").RunTest(t, "./testdata/testcases/string", ".snapshots/string/")
+	testhelper.GetRunner(t, insecureURLRule, javascript.Get()).RunTest(t, "./testdata/testcases/string", ".snapshots/string/")
 }
 
 func TestPatternVariables(t *testing.T) {
-	testhelper.GetRunner(t, patternVariablesRule, "Javascript").RunTest(t, "./testdata/pattern_variables", ".snapshots/")
+	testhelper.GetRunner(t, patternVariablesRule, javascript.Get()).RunTest(t, "./testdata/pattern_variables", ".snapshots/")
 }
 
 func TestScope(t *testing.T) {
-	testhelper.GetRunner(t, scopeRule, "Javascript").RunTest(t, "./testdata/scope", ".snapshots/")
+	testhelper.GetRunner(t, scopeRule, javascript.Get()).RunTest(t, "./testdata/scope", ".snapshots/")
 }
diff --git a/...guages/php/.snapshots/TestConst--main.yml → ...nguages/php/.snapshots/TestConst-main.yml b/...guages/php/.snapshots/TestConst--main.yml → ...nguages/php/.snapshots/TestConst-main.yml
diff --git a/...uages/php/.snapshots/TestScope--scope.yml → ...guages/php/.snapshots/TestScope-scope.yml b/...uages/php/.snapshots/TestScope--scope.yml → ...guages/php/.snapshots/TestScope-scope.yml
diff --git a/...apshots/flow/TestFlow--different-line.yml → ...napshots/flow/TestFlow-different-line.yml b/...apshots/flow/TestFlow--different-line.yml → ...napshots/flow/TestFlow-different-line.yml
diff --git a/...p/.snapshots/flow/TestFlow--same-line.yml → ...hp/.snapshots/flow/TestFlow-same-line.yml b/...p/.snapshots/flow/TestFlow--same-line.yml → ...hp/.snapshots/flow/TestFlow-same-line.yml
diff --git a/pkg/languages/php/php_test.go b/pkg/languages/php/php_test.go
@@ -26,15 +26,15 @@ var scopeRule []byte
 var mdRule []byte
 
 func TestFlow(t *testing.T) {
-	testhelper.GetRunner(t, loggerRule, "PHP").RunTest(t, "./testdata/testcases/flow", ".snapshots/flow/")
+	testhelper.GetRunner(t, loggerRule, php.Get()).RunTest(t, "./testdata/testcases/flow", ".snapshots/flow/")
 }
 
 func TestScope(t *testing.T) {
-	testhelper.GetRunner(t, scopeRule, "PHP").RunTest(t, "./testdata/scope", ".snapshots/")
+	testhelper.GetRunner(t, scopeRule, php.Get()).RunTest(t, "./testdata/scope", ".snapshots/")
 }
 
 func TestConst(t *testing.T) {
-	testhelper.GetRunner(t, mdRule, "PHP").RunTest(t, "./testdata/md", ".snapshots/")
+	testhelper.GetRunner(t, mdRule, php.Get()).RunTest(t, "./testdata/md", ".snapshots/")
 }
 
 func TestAnalyzer(t *testing.T) {

diff --git a/...apshots/TestDatatypes--different-line.yml → ...napshots/TestDatatypes-different-line.yml b/...apshots/TestDatatypes--different-line.yml → ...napshots/TestDatatypes-different-line.yml
diff --git a/...n/.snapshots/TestDatatypes--same-line.yml → ...on/.snapshots/TestDatatypes-same-line.yml b/...n/.snapshots/TestDatatypes--same-line.yml → ...on/.snapshots/TestDatatypes-same-line.yml
diff --git a/...ages/python/.snapshots/TestFlow--flow.yml → ...uages/python/.snapshots/TestFlow-flow.yml b/...ages/python/.snapshots/TestFlow--flow.yml → ...uages/python/.snapshots/TestFlow-flow.yml
diff --git a/.../python/.snapshots/TestImport--import.yml → ...s/python/.snapshots/TestImport-import.yml b/.../python/.snapshots/TestImport--import.yml → ...s/python/.snapshots/TestImport-import.yml
diff --git a/...ages/python/.snapshots/TestPair--pair.yml → ...uages/python/.snapshots/TestPair-pair.yml b/...ages/python/.snapshots/TestPair--pair.yml → ...uages/python/.snapshots/TestPair-pair.yml
diff --git a/...es/python/.snapshots/TestScope--scope.yml → ...ges/python/.snapshots/TestScope-scope.yml b/...es/python/.snapshots/TestScope--scope.yml → ...ges/python/.snapshots/TestScope-scope.yml
diff --git a/...n/.snapshots/TestSubscript--subscript.yml → ...on/.snapshots/TestSubscript-subscript.yml b/...n/.snapshots/TestSubscript--subscript.yml → ...on/.snapshots/TestSubscript-subscript.yml
diff --git a/pkg/languages/python/python_test.go b/pkg/languages/python/python_test.go
@@ -4,6 +4,7 @@ import (
 	_ "embed"
 	"testing"
 
+	"github.com/bearer/bearer/pkg/languages/python"
 	"github.com/bearer/bearer/pkg/languages/testhelper"
 )
 
@@ -26,25 +27,25 @@ var subscriptRule []byte
 var pairRule []byte
 
 func TestDatatypes(t *testing.T) {
-	testhelper.GetRunner(t, datatypesRule, "python").RunTest(t, "./testdata/datatypes", ".snapshots/")
+	testhelper.GetRunner(t, datatypesRule, python.Get()).RunTest(t, "./testdata/datatypes", ".snapshots/")
 }
 
 func TestScope(t *testing.T) {
-	testhelper.GetRunner(t, scopeRule, "python").RunTest(t, "./testdata/scope", ".snapshots/")
+	testhelper.GetRunner(t, scopeRule, python.Get()).RunTest(t, "./testdata/scope", ".snapshots/")
 }
 
 func TestFlow(t *testing.T) {
-	testhelper.GetRunner(t, flowRule, "python").RunTest(t, "./testdata/flow", ".snapshots/")
+	testhelper.GetRunner(t, flowRule, python.Get()).RunTest(t, "./testdata/flow", ".snapshots/")
 }
 
 func TestImport(t *testing.T) {
-	testhelper.GetRunner(t, importRule, "python").RunTest(t, "./testdata/import", ".snapshots/")
+	testhelper.GetRunner(t, importRule, python.Get()).RunTest(t, "./testdata/import", ".snapshots/")
 }
 
 func TestSubscript(t *testing.T) {
-	testhelper.GetRunner(t, subscriptRule, "python").RunTest(t, "./testdata/subscript", ".snapshots/")
+	testhelper.GetRunner(t, subscriptRule, python.Get()).RunTest(t, "./testdata/subscript", ".snapshots/")
 }
 
 func TestPair(t *testing.T) {
-	testhelper.GetRunner(t, pairRule, "python").RunTest(t, "./testdata/pair", ".snapshots/")
+	testhelper.GetRunner(t, pairRule, python.Get()).RunTest(t, "./testdata/pair", ".snapshots/")
 }
diff --git a/....snapshots/TestPatternVariables--main.yml → .../.snapshots/TestPatternVariables-main.yml b/....snapshots/TestPatternVariables--main.yml → .../.snapshots/TestPatternVariables-main.yml
diff --git a/...guages/ruby/.snapshots/TestRuby--call.yml → ...nguages/ruby/.snapshots/TestRuby-call.yml b/...guages/ruby/.snapshots/TestRuby--call.yml → ...nguages/ruby/.snapshots/TestRuby-call.yml
diff --git a/...uby/.snapshots/TestRuby--insecure-url.yml → ...ruby/.snapshots/TestRuby-insecure-url.yml b/...uby/.snapshots/TestRuby--insecure-url.yml → ...ruby/.snapshots/TestRuby-insecure-url.yml
diff --git a/...tRuby--object-variable-reconciliation.yml → ...stRuby-object-variable-reconciliation.yml b/...tRuby--object-variable-reconciliation.yml → ...stRuby-object-variable-reconciliation.yml
diff --git a/...ages/ruby/.snapshots/TestRuby--object.yml → ...uages/ruby/.snapshots/TestRuby-object.yml b/...ages/ruby/.snapshots/TestRuby--object.yml → ...uages/ruby/.snapshots/TestRuby-object.yml
diff --git a/...ages/ruby/.snapshots/TestScope--scope.yml → ...uages/ruby/.snapshots/TestScope-scope.yml b/...ages/ruby/.snapshots/TestScope--scope.yml → ...uages/ruby/.snapshots/TestScope-scope.yml
diff --git a/pkg/languages/ruby/ruby_test.go b/pkg/languages/ruby/ruby_test.go
@@ -4,6 +4,7 @@ import (
 	_ "embed"
 	"testing"
 
+	"github.com/bearer/bearer/pkg/languages/ruby"
 	"github.com/bearer/bearer/pkg/languages/testhelper"
 )
 
@@ -17,13 +18,13 @@ var patternVariablesRule []byte
 var scopeRule []byte
 
 func TestRuby(t *testing.T) {
-	testhelper.GetRunner(t, loggerRule, "Ruby").RunTest(t, "./testdata/testcases", ".snapshots/")
+	testhelper.GetRunner(t, loggerRule, ruby.Get()).RunTest(t, "./testdata/testcases", ".snapshots/")
 }
 
 func TestPatternVariables(t *testing.T) {
-	testhelper.GetRunner(t, patternVariablesRule, "Ruby").RunTest(t, "./testdata/pattern_variables", ".snapshots/")
+	testhelper.GetRunner(t, patternVariablesRule, ruby.Get()).RunTest(t, "./testdata/pattern_variables", ".snapshots/")
 }
 
 func TestScope(t *testing.T) {
-	testhelper.GetRunner(t, scopeRule, "Ruby").RunTest(t, "./testdata/scope", ".snapshots/")
+	testhelper.GetRunner(t, scopeRule, ruby.Get()).RunTest(t, "./testdata/scope", ".snapshots/")
 }