launch test servers from julia (#14)

* launch test servers from julia

- launch test servers from julia
- add flags and depot path matching the test environment
- check http server port instead of sleep to detect server availability

* improve coverage

Author: tanmaykm

src/datetime.jl

@@ -22,7 +22,6 @@ function str2zoneddatetime(str::String)
         end
     end
     return ZonedDateTime(str2datetime(str), localzone())
-    throw(OpenAPIException("Unsupported ZonedDateTime format: $str"))
 end
 str2zoneddatetime(datetime::DateTime) = ZonedDateTime(datetime, localzone())
 

test/client/runtests.jl

@@ -13,6 +13,7 @@ function runtests()
         @testset "Utils" begin
             test_longpoll_exception_check()
             test_request_interrupted_exception_check()
+            test_date()
         end
         @testset "Validations" begin
             test_validations()

test/client/utilstests.jl

@@ -1,6 +1,22 @@
 using OpenAPI
 using OpenAPI.Clients
 using Test
+using Dates
+using TimeZones
+
+function test_date()
+    dt_string = string(ZonedDateTime(now(), localzone()))
+    dt = OpenAPI.str2zoneddatetime(dt_string)
+    @test dt_string == string(dt)
+
+    dt_string = string(DateTime(now()))
+    dt = OpenAPI.str2datetime(dt_string)
+    @test dt_string == string(dt)
+
+    dt_string = string(Date(now()))
+    dt = OpenAPI.str2date(dt_string)
+    @test dt_string == string(dt)
+end
 
 function as_taskfailedexception(ex)
     try
@@ -74,6 +90,13 @@ function test_custom_format_validations()
     return nothing
 end
 
+function test_numeric_format_validations()
+    @test OpenAPI.val_format(typemax(Float32), ":float")
+    @test OpenAPI.val_format(typemax(Float64), ":double")
+    @test OpenAPI.val_multiple_of(10.0, 5.0)
+    @test !OpenAPI.val_multiple_of(10.0, 3.0)
+end
+
 function test_validations()
     # maximum
     @test_throws OpenAPI.ValidationException OpenAPI.validate_param("test_param", "test_model", :maximum, 11, 10, true)
@@ -122,5 +145,6 @@ function test_validations()
 
     # custom format Validations
     test_custom_format_validations()
+    test_numeric_format_validations()
     return nothing
 end

test/runtests.jl

@@ -1,56 +1,62 @@
-using Test
+using Test, HTTP
 
+include("testutils.jl")
 include("client/runtests.jl")
 include("client/allany/runtests.jl")
 
 @testset "OpenAPI" begin
     @testset "Client" begin
         try
-            if get(ENV, "RUNNER_OS", "") == "Linux"
+            if run_tests_with_servers
                 run(`client/petstore_v2/start_petstore_server.sh`)
                 run(`client/petstore_v3/start_petstore_server.sh`)
-                sleep(20)
+                sleep(20) # let servers start
             end
             OpenAPIClientTests.runtests()
         finally
-            if get(ENV, "RUNNER_OS", "") == "Linux"
+            if run_tests_with_servers
                 run(`client/petstore_v2/stop_petstore_server.sh`)
                 run(`client/petstore_v3/stop_petstore_server.sh`)
             end
         end
     end
-    if get(ENV, "RUNNER_OS", "") == "Linux"
-        sleep(20)
-    end
+    run_tests_with_servers && sleep(20) # avoid port conflicts
     @testset "Server" begin
+        v2_ret = v2_out = v3_ret = v3_out = nothing
+        servers_running = true
+
         try
-            if get(ENV, "RUNNER_OS", "") == "Linux"
-                run(`server/petstore_v2/start_petstore_server.sh`)
-                run(`server/petstore_v3/start_petstore_server.sh`)
-                sleep(20)
+            if run_tests_with_servers
+                v2_ret, v2_out = run_server(joinpath(@__DIR__, "server", "petstore_v2", "petstore_server.jl"))
+                v3_ret, v3_out = run_server(joinpath(@__DIR__, "server", "petstore_v3", "petstore_server.jl"))
+                servers_running &= wait_server(8080)
+                servers_running &= wait_server(8081)
+            else
+                servers_running = false                
             end
-            OpenAPIClientTests.runtests()
+            servers_running && OpenAPIClientTests.runtests()
         finally
-            if get(ENV, "RUNNER_OS", "") == "Linux"
-                run(`server/petstore_v2/stop_petstore_server.sh`)
-                run(`server/petstore_v3/stop_petstore_server.sh`)
+            if run_tests_with_servers
+                stop_server(8080, v2_ret, v2_out)
+                stop_server(8081, v3_ret, v3_out)
             end
         end
     end
-    if get(ENV, "RUNNER_OS", "") == "Linux"
-        sleep(20)
-    end
+    run_tests_with_servers && sleep(20) # avoid port conflicts
     @testset "Union types" begin
+        ret = out = nothing
+        servers_running = true
+
         try
-            if get(ENV, "RUNNER_OS", "") == "Linux"
-                run(`server/allany/start_allany_server.sh`)
-                sleep(20)
+            if run_tests_with_servers
+                ret, out = run_server(joinpath(@__DIR__, "server", "allany", "allany_server.jl"))
+                servers_running &= wait_server(8081)
                 AllAnyTests.runtests()
+            else
+                servers_running = false
             end
         finally
-            if get(ENV, "RUNNER_OS", "") == "Linux"
-                run(`server/allany/stop_allany_server.sh`)
-            end
+            run_tests_with_servers && stop_server(8081, ret, out)
         end
     end
 end

test/server/allany/allany_server.jl

@@ -49,12 +49,21 @@ function stop(::HTTP.Request)
     return HTTP.Response(200, "")
 end
 
+function ping(::HTTP.Request)
+    return HTTP.Response(200, "")
+end
+
 function run_server(port=8081)
-    router = HTTP.Router()
-    router = AllAnyServer.register(router, @__MODULE__)
-    HTTP.register!(router, "GET", "/stop", stop)
-    server[] = HTTP.serve!(router, port)
-    wait(server[])
+    try
+        router = HTTP.Router()
+        router = AllAnyServer.register(router, @__MODULE__)
+        HTTP.register!(router, "GET", "/stop", stop)
+        HTTP.register!(router, "GET", "/ping", ping)
+        server[] = HTTP.serve!(router, port)
+        wait(server[])
+    catch ex
+        @error("Server error", exception=(ex, catch_backtrace()))
+    end
 end
 
 end # module AllAnyServerImpl

test/server/allany/start_allany_server.sh

@@ -148,12 +148,21 @@ function stop(::HTTP.Request)
     return HTTP.Response(200, "")
 end
 
+function ping(::HTTP.Request)
+    return HTTP.Response(200, "")
+end
+
 function run_server(port=8080)
-    router = HTTP.Router()
-    router = PetStoreServer.register(router, @__MODULE__; path_prefix="/v2")
-    HTTP.register!(router, "GET", "/stop", stop)
-    server[] = HTTP.serve!(router, port)
-    wait(server[])
+    try
+        router = HTTP.Router()
+        router = PetStoreServer.register(router, @__MODULE__; path_prefix="/v2")
+        HTTP.register!(router, "GET", "/stop", stop)
+        HTTP.register!(router, "GET", "/ping", ping)
+        server[] = HTTP.serve!(router, port)
+        wait(server[])
+    catch ex
+        @error("Server error", exception=(ex, catch_backtrace()))
+    end
 end
 
 end # module PetStoreV2Server