Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit 20ac052

Browse files
patricktpatrickt
committed
Enable all the other tests.
1 parent 4b75bf2 commit 20ac052

File tree

15 files changed

+117
-48
lines changed

15 files changed

+117
-48
lines changed

‎WORKSPACE

+2
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ new_git_repository(
227227
name = "tree-sitter-ql",
228228
build_file_content = """
229229
exports_files(["src/node-types.json"])
230+
231+
filegroup(name = "corpus", srcs = glob(['**/corpus/*.txt']), visibility = ["//visibility:public"])
230232
""",
231233
commit = "c0d674abed8836bb5a4770f547343ef100f88c24",
232234
remote = "https://github.com/tree-sitter/tree-sitter-ql.git",

‎build/common.bzl

+11-5
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ filegroup(name = "corpus", srcs = glob(['**/corpus/*.txt']))
4747
sha256 = sha256,
4848
)
4949

50-
def semantic_language_library(language, name, srcs, nodetypes = "", **kwargs):
50+
def semantic_language_library(language, name, srcs, ts_package = "", nodetypes = "", **kwargs):
5151
"""Create a new library target with dependencies needed for a language-AST project."""
5252
if nodetypes == "":
5353
nodetypes = "@tree-sitter-{}//:src/node-types.json".format(language)
54+
if ts_package == "":
55+
ts_package = language
5456
haskell_library(
5557
name = name,
5658
# We can't use Template Haskell to find out the location of the
@@ -63,7 +65,7 @@ def semantic_language_library(language, name, srcs, nodetypes = "", **kwargs):
6365
'-DNODE_TYPES_PATH="../../../../$(rootpath {})"'.format(nodetypes),
6466
],
6567
srcs = srcs,
66-
extra_srcs = [nodetypes, "@tree-sitter-{}//:corpus".format(language)],
68+
extra_srcs = [nodetypes, "@tree-sitter-{}//:corpus".format(ts_package)],
6769
deps = [
6870
"//:base",
6971
"//semantic-analysis",
@@ -91,11 +93,15 @@ def semantic_language_library(language, name, srcs, nodetypes = "", **kwargs):
9193
],
9294
)
9395

94-
def semantic_language_parsing_test(language):
96+
def semantic_language_parsing_test(language, semantic_package = "", ts_package = ""):
97+
if semantic_package == "":
98+
semantic_package = language
99+
if ts_package == "":
100+
ts_package = language
95101
haskell_test(
96102
name = "test",
97103
srcs = ["test/PreciseTest.hs"],
98-
data = ["@tree-sitter-{}//:corpus".format(language)],
104+
data = ["@tree-sitter-{}//:corpus".format(ts_package)],
99105
deps = [
100106
":semantic-{}".format(language),
101107
"//:base",
@@ -109,6 +115,6 @@ def semantic_language_parsing_test(language):
109115
"@stackage//:tasty",
110116
"@stackage//:tasty-hedgehog",
111117
"@stackage//:tasty-hunit",
112-
"@stackage//:tree-sitter-" + language,
118+
"@stackage//:tree-sitter-" + semantic_package,
113119
],
114120
)

‎semantic-codeql/BUILD.bazel

+6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@ package(default_visibility = ["//visibility:public"])
33
load(
44
"//:build/common.bzl",
55
"semantic_language_library",
6+
"semantic_language_parsing_test",
67
)
78

89
semantic_language_library(
910
name = "semantic-codeql",
1011
srcs = glob(["src/**/*.hs"]),
1112
language = "ql",
1213
)
14+
15+
semantic_language_parsing_test(
16+
language = "codeql",
17+
project = "ql",
18+
)

‎semantic-codeql/test/PreciseTest.hs

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications #-}
1+
{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications, ImplicitParams #-}
22
module Main (main) where
33

44
import AST.TestHelpers
@@ -7,14 +7,22 @@ import qualified Language.CodeQL.AST as CodeQL
77
import Language.CodeQL.Grammar
88
import qualified System.Path as Path
99
import Test.Tasty
10+
import qualified System.Path.Fixture as Fixture
11+
import qualified Bazel.Runfiles as Runfiles
1012

1113
main :: IO ()
12-
main
13-
= Path.absDir <$> CodeQL.getTestCorpusDir
14-
>>= readCorpusFiles'
15-
>>= traverse (testCorpus parse)
16-
>>= defaultMain . tests
17-
where parse = parseByteString @CodeQL.Ql @() tree_sitter_ql
14+
main = do
15+
rf <- Runfiles.create
16+
-- dirs <- Path.absDir <$> Ruby.getTestCorpusDir
17+
let ?project = Path.relDir "semantic-codeql"
18+
?runfiles = rf
19+
20+
let dirs = Fixture.bazelDir "/../external/tree-sitter-ql/test/corpus"
21+
parse = parseByteString @CodeQL.Ql @() tree_sitter_ql
22+
23+
readCorpusFiles' dirs
24+
>>= traverse (testCorpus parse)
25+
>>= defaultMain . tests
1826

1927
tests :: [TestTree] -> TestTree
2028
tests = testGroup "tree-sitter-ql corpus tests"

‎semantic-java/BUILD.bazel

+3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ package(default_visibility = ["//visibility:public"])
33
load(
44
"//:build/common.bzl",
55
"semantic_language_library",
6+
"semantic_language_parsing_test",
67
)
78

89
semantic_language_library(
910
name = "semantic-java",
1011
srcs = glob(["src/**/*.hs"]),
1112
language = "java",
1213
)
14+
15+
semantic_language_parsing_test(language = "java")

‎semantic-java/test/PreciseTest.hs

+22-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
1-
{-# LANGUAGE OverloadedStrings, TypeApplications #-}
2-
module Main (main) where
1+
{-# LANGUAGE ImplicitParams #-}
2+
{-# LANGUAGE OverloadedStrings #-}
3+
{-# LANGUAGE TypeApplications #-}
34

5+
module Main
6+
( main,
7+
)
8+
where
49

5-
import TreeSitter.Java
6-
import AST.TestHelpers
7-
import AST.Unmarshal
10+
import AST.TestHelpers
11+
import AST.Unmarshal
12+
import qualified Bazel.Runfiles as Runfiles
813
import qualified Language.Java.AST as Java
914
import qualified System.Path as Path
10-
import Test.Tasty
15+
import qualified System.Path.Fixture as Fixture
16+
import Test.Tasty
17+
import TreeSitter.Java
1118

1219
main :: IO ()
13-
main
14-
= Path.absDir <$> Java.getTestCorpusDir
15-
>>= readCorpusFiles'
16-
>>= traverse (testCorpus parse)
17-
>>= defaultMain . tests
20+
main = do
21+
rf <- Runfiles.create
22+
-- dirs <- Path.absDir <$> Java.getTestCorpusDir
23+
let ?project = Path.relDir "semantic-java"
24+
?runfiles = rf
25+
let dirs = Fixture.bazelDir "/../external/tree-sitter-java/corpus"
26+
readCorpusFiles' dirs
27+
>>= traverse (testCorpus parse)
28+
>>= defaultMain . tests
1829
where
1930
parse = parseByteString @Java.Program @() tree_sitter_java
2031

‎semantic-php/BUILD.bazel

-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@ package(default_visibility = ["//visibility:public"])
33
load(
44
"//:build/common.bzl",
55
"semantic_language_library",
6-
"semantic_language_parsing_test",
76
)
87

98
semantic_language_library(
109
name = "semantic-php",
1110
srcs = glob(["src/**/*.hs"]),
1211
language = "php",
1312
)
14-
15-
semantic_language_parsing_test(language = "php")

‎semantic-python/BUILD.bazel

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package(default_visibility = ["//visibility:public"])
44
load(
55
"//:build/common.bzl",
66
"semantic_language_library",
7+
"semantic_language_parsing_test",
78
)
89

910
semantic_language_library(
@@ -17,3 +18,5 @@ semantic_language_library(
1718
),
1819
language = "python",
1920
)
21+
22+
semantic_language_parsing_test(language = "python")

‎semantic-python/test/PreciseTest.hs

+16-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications #-}
1+
{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications, ImplicitParams #-}
22
module Main (main) where
33

44
import qualified System.Path as Path
@@ -7,14 +7,23 @@ import TreeSitter.Python
77
import qualified Language.Python.AST as Py
88
import AST.TestHelpers
99
import AST.Unmarshal
10+
import qualified Bazel.Runfiles as Runfiles
11+
import qualified System.Path.Fixture as Fixture
1012

1113
main :: IO ()
12-
main
13-
= Path.absDir <$> Py.getTestCorpusDir
14-
>>= readCorpusFiles'
15-
>>= traverse (testCorpus parse)
16-
>>= defaultMain . tests
17-
where parse = parseByteString @Py.Module @() tree_sitter_python
14+
main = do
15+
rf <- Runfiles.create
16+
-- dirs <- Path.absDir <$> Ruby.getTestCorpusDir
17+
let ?project = Path.relDir "semantic-python"
18+
?runfiles = rf
19+
20+
let dirs = Fixture.bazelDir "/../external/tree-sitter-python/test/corpus"
21+
parse = parseByteString @Py.Module @() tree_sitter_python
22+
23+
Fixture.delay (Path.toString dirs)
24+
readCorpusFiles' dirs
25+
>>= traverse (testCorpus parse)
26+
>>= defaultMain . tests
1827

1928
tests :: [TestTree] -> TestTree
2029
tests = testGroup "tree-sitter-python corpus tests"

‎semantic-ruby/test/PreciseTest.hs

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ main = do
1919
let ?project = Path.relDir "semantic-ruby"
2020
?runfiles = rf
2121
let dirs = Fixture.bazelDir "/../external/tree-sitter-ruby/test/corpus"
22-
hFlush stdout
23-
threadDelay 0
2422

2523
readCorpusFiles' dirs
2624
>>= traverse (testCorpus parse)

‎semantic-tsx/BUILD.bazel

+8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@ package(default_visibility = ["//visibility:public"])
33
load(
44
"//:build/common.bzl",
55
"semantic_language_library",
6+
"semantic_language_parsing_test",
67
)
78

89
semantic_language_library(
910
name = "semantic-tsx",
1011
srcs = glob(["src/**/*.hs"]),
1112
language = "tsx",
1213
nodetypes = "@tree-sitter-typescript//:tsx/src/node-types.json",
14+
ts_package = "typescript",
15+
)
16+
17+
semantic_language_parsing_test(
18+
language = "tsx",
19+
semantic_package = "tsx",
20+
ts_package = "typescript",
1321
)

‎semantic-tsx/test/PreciseTest.hs

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications #-}
1+
{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications, ImplicitParams #-}
22
module Main (main) where
33

44

@@ -8,13 +8,20 @@ import AST.Unmarshal
88
import qualified Language.TSX.AST as Tsx
99
import qualified System.Path as Path
1010
import Test.Tasty
11+
import qualified Bazel.Runfiles as Runfiles
12+
import qualified System.Path.Fixture as Fixture
1113

1214
main :: IO ()
13-
main
14-
= Path.absDir <$> Tsx.getTestCorpusDir
15-
>>= readCorpusFiles'
16-
>>= traverse (testCorpus parse)
17-
>>= defaultMain . tests
15+
main = do
16+
rf <- Runfiles.create
17+
-- dirs <- Path.absDir <$> Typescript.getTestCorpusDir
18+
let ?project = Path.relDir "semantic-tsx"
19+
?runfiles = rf
20+
let dirs = Fixture.bazelDir "/../external/tree-sitter-typescript/tsx/corpus"
21+
22+
readCorpusFiles' dirs
23+
>>= traverse (testCorpus parse)
24+
>>= defaultMain . tests
1825
where parse = parseByteString @Tsx.Program @() tree_sitter_tsx
1926

2027
tests :: [TestTree] -> TestTree

‎semantic-typescript/BUILD.bazel

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package(default_visibility = ["//visibility:public"])
33
load(
44
"//:build/common.bzl",
55
"semantic_language_library",
6+
"semantic_language_parsing_test",
67
)
78

89
semantic_language_library(
@@ -11,3 +12,5 @@ semantic_language_library(
1112
language = "typescript",
1213
nodetypes = "@tree-sitter-typescript//:typescript/src/node-types.json",
1314
)
15+
16+
semantic_language_parsing_test(language = "typescript")

‎semantic-typescript/test/PreciseTest.hs

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications #-}
1+
{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications, ImplicitParams #-}
22
module Main (main) where
33

44
import TreeSitter.TypeScript
@@ -7,13 +7,21 @@ import AST.Unmarshal
77
import qualified Language.TypeScript.AST as Ts
88
import qualified System.Path as Path
99
import Test.Tasty
10+
import qualified Bazel.Runfiles as Runfiles
11+
import qualified System.Path.Fixture as Fixture
1012

1113
main :: IO ()
12-
main
13-
= Path.absDir <$> Ts.getTestCorpusDir
14-
>>= readCorpusFiles'
15-
>>= traverse (testCorpus parse)
16-
>>= defaultMain . tests
14+
main = do
15+
rf <- Runfiles.create
16+
-- dirs <- Path.absDir <$> Typescript.getTestCorpusDir
17+
let ?project = Path.relDir "semantic-typescript"
18+
?runfiles = rf
19+
let dirs = Fixture.bazelDir "/../external/tree-sitter-typescript/typescript/corpus"
20+
Fixture.delay (Path.toString dirs)
21+
22+
readCorpusFiles' dirs
23+
>>= traverse (testCorpus parse)
24+
>>= defaultMain . tests
1725
where parse = parseByteString @Ts.Program @() tree_sitter_typescript
1826

1927
tests :: [TestTree] -> TestTree

‎semantic/test/System/Path/Fixture.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ delay :: String -> IO ()
2929
delay s = do
3030
putStrLn s
3131
hFlush stdout
32-
threadDelay 10000000
32+
threadDelay 100000000
3333

3434
absFile :: (HasFixture) => String -> Path.AbsFile
3535
absFile x = Path.absFile (Bazel.rlocation ?runfiles ("semantic/" <> Path.toString ?project <> x))

0 commit comments

Comments
 (0)