Use relative import paths in tests (JuliaLang/JuliaLowering.jl#110)

For vendoring into Base we need to avoid absolute import paths as in
`using JuliaLowering` and `using JuliaSyntax` in the test files as
neither of these packages will be top level modules. Thus, replace all
occurrences of these with relative import paths except for one central
location (currently in util.jl) which can be easily adjusted.

Author: c42f

JuliaLowering/test/branching.jl

@@ -4,11 +4,6 @@
 
 test_mod = Module()
 
-Base.eval(test_mod, quote
-    using JuliaLowering: JuliaLowering, @ast, @chk
-    using JuliaSyntax
-end)
-
 #-------------------------------------------------------------------------------
 @testset "Tail position" begin
 

JuliaLowering/test/compat.jl

@@ -1,6 +1,4 @@
 using Test
-using JuliaSyntax
-using JuliaLowering
 const JS = JuliaSyntax
 const JL = JuliaLowering
 

JuliaLowering/test/import.jl

@@ -2,18 +2,7 @@
 
 test_mod = Module()
 
-JuliaLowering.include_string(test_mod, """
-    using JuliaSyntax
-    using JuliaLowering: SyntaxTree
-    using JuliaLowering: SyntaxTree as st
-    import JuliaLowering: SyntaxTree as st1, SyntaxTree as st2
-""")
-@test test_mod.SyntaxTree === JuliaLowering.SyntaxTree
-@test test_mod.st === JuliaLowering.SyntaxTree
-@test test_mod.st1 === JuliaLowering.SyntaxTree
-@test test_mod.st2 === JuliaLowering.SyntaxTree
-@test test_mod.parsestmt === JuliaSyntax.parsestmt
-
+# Test attributes are correctly set for export/public
 JuliaLowering.include_string(test_mod, """
 x = 1
 y = 2
@@ -25,21 +14,37 @@ public y
 @test Base.ispublic(test_mod, :y)
 @test !Base.isexported(test_mod, :y)
 
+# Test various forms of `using`
 C = JuliaLowering.include_string(test_mod, """
 module C
     module D
+        export x
+        public y, f
+        x = [101]
+        y = [202]
+
         function f()
             "hi"
         end
     end
     module E
-        using ...C.D: f
+        using ..D: f
+        using ..D
+        using .D: y as D_y
+        using .D: x as D_x_2, y as D_y_2
+        import .D.y as D_y_3
     end
 end
 """)
 @test C.D.f === C.E.f
+@test C.D.x === C.E.x
+@test C.D.y === C.E.D_y
+@test C.D.x === C.E.D_x_2
+@test C.D.y === C.E.D_y_2
+@test C.D.y === C.E.D_y_3
 
-# Test that `using` F brings in the symbol G immediately
+# Test that using F brings in the exported symbol G immediately and that it can
+# be used next in the import list.
 F = JuliaLowering.include_string(test_mod, """
 module F
     export G

JuliaLowering/test/macros.jl

@@ -4,10 +4,15 @@ test_mod = Module(:macro_test)
 Base.eval(test_mod, :(const var"@ast" = $(JuliaLowering.var"@ast")))
 Base.eval(test_mod, :(const var"@K_str" = $(JuliaLowering.var"@K_str")))
 
+# These libraries may either be packages or vendored into Base - need to pull
+# them in via relative paths in the `using` statements below.
+Base.eval(test_mod, :(const JuliaLowering = $(JuliaLowering)))
+Base.eval(test_mod, :(const JuliaSyntax = $(JuliaSyntax)))
+
 JuliaLowering.include_string(test_mod, raw"""
 module M
-    using JuliaLowering: JuliaLowering, @ast, @chk, adopt_scope
-    using JuliaSyntax
+    using ..JuliaLowering: JuliaLowering, adopt_scope
+    using ..JuliaSyntax
 
     # Introspection
     macro __MODULE__()

JuliaLowering/test/repl_mode.jl

@@ -1,3 +1,6 @@
+# JuliaLowering REPL mode: an interactive test utility for lowering code (not
+# part of the unit tests)
+
 module JuliaLoweringREPL
 
 import ReplMaker

JuliaLowering/test/runtests.jl

@@ -1,5 +1,3 @@
-using Test
-
 include("utils.jl")
 
 @testset "JuliaLowering.jl" begin

JuliaLowering/test/scopes_ir.jl

@@ -1,4 +1,4 @@
-using JuliaLowering: @islocal
+using .JuliaLowering: @islocal
 using Base: @locals
 
 #*******************************************************************************

JuliaLowering/test/utils.jl

@@ -1,7 +1,9 @@
+# Shared testing code which should be included before running individual test files.
 using Test
 
 using JuliaLowering
 using JuliaSyntax
+
 import FileWatching
 
 # The following are for docstrings testing. We need to load the REPL module
@@ -10,9 +12,9 @@ import FileWatching
 using Markdown
 import REPL
 
-using JuliaSyntax: sourcetext, set_numeric_flags
+using .JuliaSyntax: sourcetext, set_numeric_flags
 
-using JuliaLowering:
+using .JuliaLowering:
     SyntaxGraph, newnode!, ensure_attributes!,
     Kind, SourceRef, SyntaxTree, NodeId,
     makenode, makeleaf, setattr!, sethead!,
@@ -153,8 +155,9 @@ end
 
 function setup_ir_test_module(preamble)
     test_mod = Module(:TestMod)
-    JuliaLowering.include_string(test_mod, preamble)
+    Base.eval(test_mod, :(const JuliaLowering = $JuliaLowering))
     Base.eval(test_mod, :(const var"@ast_" = $(var"@ast_")))
+    JuliaLowering.include_string(test_mod, preamble)
     test_mod
 end