Update test_macro_throws

Author: blegat

Project.toml

@@ -19,7 +19,7 @@ SemialgebraicSets = "8e049039-38e8-557d-ae3a-bc521ccf6204"
 [compat]
 DataStructures = "0.18, 0.19"
 DynamicPolynomials = "0.5, 0.6"
-IntervalArithmetic = "0.22"
+IntervalArithmetic = "0.22, 1"
 JuMP = "1"
 MathOptInterface = "1"
 MultivariateBases = "0.2"

test/constraint.jl

@@ -120,14 +120,14 @@ function test_errors(var)
     @variable m β
     p = α * x * y + β * x^2
     q = α * x^2 + β * x * y + α * y^2
-    @test_macro_throws ErrorException @constraint(m, p)
-    @test_macro_throws ErrorException @constraint(m, begin
+    @test_throws_parsetime ErrorException @constraint(m, p)
+    @test_throws_parsetime ErrorException @constraint(m, begin
         p >= 0
     end)
-    @test_macro_throws ErrorException @constraint(m, +(p, p, p))
-    @test_macro_throws ErrorException @constraint(m, p >= 0, 1)
-    #@test_macro_throws ErrorException @constraint(m, p >= 0, domain = (@set x >= -1 && x <= 1, domain = y >= -1 && y <= 1))
-    @test_macro_throws ErrorException @constraint(
+    @test_throws_parsetime ErrorException @constraint(m, +(p, p, p))
+    @test_throws_parsetime ErrorException @constraint(m, p >= 0, 1)
+    #@test_throws_parsetime ErrorException @constraint(m, p >= 0, domain = (@set x >= -1 && x <= 1, domain = y >= -1 && y <= 1))
+    @test_throws_parsetime ErrorException @constraint(
         m,
         p + 0,
         domain = (@set x >= -1 && x <= 1)

test/utilities.jl

@@ -1,9 +1,36 @@
-# Test that the macro call `m` throws an error exception during pre-compilation
-macro test_macro_throws(errortype, m)
-    # See https://discourse.julialang.org/t/test-throws-with-macros-after-pr-23533/5878
-    return :(@test_throws $errortype try
-        @eval $m
-    catch err
-        throw(err.error)
-    end)
+#  Copyright 2017, Iain Dunning, Joey Huchette, Miles Lubin, and contributors
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#############################################################################
+
+# Copy-pasted from JuMP.jl/test/utilities.jl
+
+function _strip_line_from_error(err::ErrorException)
+    return ErrorException(replace(err.msg, r"^At.+\:[0-9]+\: `@" => "In `@"))
+end
+
+_strip_line_from_error(err::LoadError) = _strip_line_from_error(err.error)
+
+_strip_line_from_error(err) = err
+
+"""
+    @test_throws_parsetime(error_type, expression)
+
+Test that the macro call `expression` throws an `error_type` exception during
+the parsing of the macro.
+
+See https://discourse.julialang.org/t/test-throws-with-macros-after-pr-23533
+"""
+macro test_throws_parsetime(error_type, expression)
+    return quote
+        @test_throws(
+            $(esc(_strip_line_from_error(error_type))),
+            try
+                @eval $expression
+            catch err
+                throw(_strip_line_from_error(err))
+            end
+        )
+    end
 end