Merge pull request #73 from julia-vscode/testitems

Migrate to testitem framework

Author: davidanthoff

Project.toml

@@ -9,11 +9,12 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 
 [compat]
 JSON = "0.20, 0.21"
 julia = "1"
 
 [targets]
-test = ["Test", "Sockets"]
+test = ["Test", "TestItemRunner", "Sockets"]

test/runtests.jl

@@ -1,34 +1,3 @@
-using Test
-using JSON
-using JSONRPC
-using JSONRPC: typed_res, @dict_readable, Outbound
-using Sockets
+using TestItemRunner
 
-@dict_readable struct Foo <: Outbound
-    fieldA::Int
-    fieldB::String
-    fieldC::Union{Missing,String}
-    fieldD::Union{String,Missing}
-end
-
-@dict_readable struct Foo2 <: Outbound
-    fieldA::Union{Nothing,Int}
-    fieldB::Vector{Int}
-end
-
-Base.:(==)(a::Foo2,b::Foo2) = a.fieldA == b.fieldA && a.fieldB == b.fieldB
-
-@testset "JSONRPC" begin
-    include("test_core.jl")
-    include("test_interface_def.jl")
-    include("test_typed.jl")
-
-    @testset "check response type" begin
-        @test typed_res(nothing, Nothing) isa Nothing
-        @test typed_res([1,"2",3], Vector{Any}) isa Vector{Any}
-        @test typed_res([1,2,3], Vector{Int}) isa Vector{Int}
-        @test typed_res([1,2,3], Vector{Float64}) isa Vector{Float64}
-        @test typed_res(['f','o','o'], String) isa String
-        @test typed_res("foo", String) isa String
-    end
-end
+@run_package_tests

test/shared_test_code.jl

@@ -0,0 +1,15 @@
+using JSONRPC: @dict_readable, Outbound
+
+@dict_readable struct Foo <: Outbound
+    fieldA::Int
+    fieldB::String
+    fieldC::Union{Missing,String}
+    fieldD::Union{String,Missing}
+end
+
+@dict_readable struct Foo2 <: Outbound
+    fieldA::Union{Nothing,Int}
+    fieldB::Vector{Int}
+end
+
+Base.:(==)(a::Foo2,b::Foo2) = a.fieldA == b.fieldA && a.fieldB == b.fieldB

test/test_core.jl

@@ -1,4 +1,4 @@
-@testset "Core" begin
+@testitem "Core" begin
     @test sprint(showerror, JSONRPC.JSONRPCError(-32700, "FOO", "BAR")) == "ParseError: FOO (BAR)"
     @test sprint(showerror, JSONRPC.JSONRPCError(-32600, "FOO", "BAR")) == "InvalidRequest: FOO (BAR)"
     @test sprint(showerror, JSONRPC.JSONRPCError(-32601, "FOO", "BAR")) == "MethodNotFound: FOO (BAR)"

test/test_interface_def.jl

@@ -1,5 +1,7 @@
-@testset "Interface Definition" begin
-
+@testitem "Interface Definition" begin
+    using JSON
+    include("shared_test_code.jl")
+    
     @test_throws ErrorException Foo()
 
     a = Foo(fieldA=1, fieldB="A")

test/test_typed.jl

@@ -1,4 +1,7 @@
-@testset "Message dispatcher" begin
+@testitem "Message dispatcher" begin
+    using Sockets
+
+    include("shared_test_code.jl")
 
     if Sys.iswindows()
         global_socket_name1 = "\\\\.\\pipe\\jsonrpc-testrun1"
@@ -28,7 +31,7 @@
             params.fieldA == 1 ? "YES" : "NO"
         end
         msg_dispatcher[request2_type] = (conn, params) -> JSONRPC.JSONRPCError(-32600, "Our message", nothing)
-        msg_dispatcher[notify1_type] = (conn, params) -> g_var = params
+        msg_dispatcher[notify1_type] = (conn, params) -> global g_var = params
 
         run(conn)
 
@@ -107,3 +110,14 @@
     fetch(server_task)
 
 end
+
+@testitem "check response type" begin
+    using JSONRPC: typed_res
+    
+    @test typed_res(nothing, Nothing) isa Nothing
+    @test typed_res([1,"2",3], Vector{Any}) isa Vector{Any}
+    @test typed_res([1,2,3], Vector{Int}) isa Vector{Int}
+    @test typed_res([1,2,3], Vector{Float64}) isa Vector{Float64}
+    @test typed_res(['f','o','o'], String) isa String
+    @test typed_res("foo", String) isa String
+end