Skip to content

Commit 2e6eea3

Browse files
PremwoikPremwoik
committed
Adapt tests
1 parent f678b91 commit 2e6eea3

File tree

4 files changed

+48
-47
lines changed

4 files changed

+48
-47
lines changed

‎test/gradient/elixir_expr_test.exs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ defmodule Gradient.ElixirExprTest do
4545
end
4646
|> ElixirExpr.pp_expr()
4747

48-
assert "fn {:ok, v} -> v; {:error, _} -> :error end" == actual
48+
assert ~s(fn {:"ok", v} -> v; {:"error", _} -> :"error" end) == actual
4949
end
5050

5151
test "binary comprehension" do
@@ -79,7 +79,7 @@ defmodule Gradient.ElixirExprTest do
7979
end
8080
|> ElixirExpr.pp_expr()
8181

82-
assert "receive do {:hello, msg} -> msg end" == actual
82+
assert ~s(receive do {:"hello", msg} -> msg end) == actual
8383
end
8484

8585
test "receive after" do
@@ -93,7 +93,7 @@ defmodule Gradient.ElixirExprTest do
9393
end
9494
|> ElixirExpr.pp_expr()
9595

96-
assert ~s(receive do {:hello, msg} -> msg after 1000 -> "nothing happened" end) == actual
96+
assert ~s(receive do {:"hello", msg} -> msg after 1000 -> "nothing happened" end) == actual
9797
end
9898

9999
test "call pipe" do
@@ -123,7 +123,7 @@ defmodule Gradient.ElixirExprTest do
123123
end
124124
|> ElixirExpr.pp_expr()
125125

126-
assert "map = %{a: 12, b: 0}; case :maps.find(:a, map) do {:ok, a} -> case :maps.find(:b, map) do {:ok, b} -> a + b; _gen -> case _gen do :error -> 0; _gen -> raise {:with_clause, _gen} end end; _gen -> case _gen do :error -> 0; _gen -> raise {:with_clause, _gen} end end" ==
126+
assert ~s(map = %{"a": 12, "b": 0}; case :maps.find(:"a", map\) do {:"ok", a} -> case :maps.find(:"b", map\) do {:"ok", b} -> a + b; _gen -> case _gen do :"error" -> 0; _gen -> raise {:"with_clause", _gen} end end; _gen -> case _gen do :"error" -> 0; _gen -> raise {:"with_clause", _gen} end end) ==
127127
actual
128128
end
129129

@@ -140,7 +140,7 @@ defmodule Gradient.ElixirExprTest do
140140
end
141141
|> ElixirExpr.pp_expr()
142142

143-
assert ~s(try do raise "ok"; catch :error, e -> IO.puts(Exception.format(:error, e, __STACKTRACE__\)\); reraise e, __STACKTRACE__ end) ==
143+
assert ~s(try do raise "ok"; catch :"error", e -> IO.puts(Exception.format(:"error", e, __STACKTRACE__\)\); reraise e, __STACKTRACE__ end) ==
144144
actual
145145
end
146146

@@ -155,7 +155,7 @@ defmodule Gradient.ElixirExprTest do
155155
end
156156
|> ElixirExpr.pp_expr()
157157

158-
assert ~s(try do raise "oops"; catch :error, %RuntimeError{} = _ -> "Error!" end) ==
158+
assert ~s(try do raise "oops"; catch :"error", %RuntimeError{} = _ -> "Error!" end) ==
159159
actual
160160
end
161161

@@ -170,7 +170,7 @@ defmodule Gradient.ElixirExprTest do
170170
end
171171
|> ElixirExpr.pp_expr()
172172

173-
assert "try do :ok; catch :error, _ -> :ok end" == actual
173+
assert ~s(try do :"ok"; catch :"error", _ -> :"ok" end) == actual
174174
end
175175

176176
test "simple after try" do
@@ -184,7 +184,7 @@ defmodule Gradient.ElixirExprTest do
184184
end
185185
|> ElixirExpr.pp_expr()
186186

187-
assert "try do :ok; after :ok end" == actual
187+
assert ~s(try do :"ok"; after :"ok" end) == actual
188188
end
189189

190190
test "try guard" do
@@ -215,7 +215,7 @@ defmodule Gradient.ElixirExprTest do
215215
end
216216
|> ElixirExpr.pp_expr()
217217

218-
assert ~s(try do throw "good"; :ok; else v when v == :ok -> :ok; v -> :nok; catch :error, %RuntimeError{} = e -> 11; e; :throw, val -> val; :throw, _ -> 0; after IO.puts("Cleaning!"\) end) ==
218+
assert ~s(try do throw "good"; :"ok"; else v when v == :"ok" -> :"ok"; v -> :"nok"; catch :"error", %RuntimeError{} = e -> 11; e; :"throw", val -> val; :"throw", _ -> 0; after IO.puts("Cleaning!"\) end) ==
219219
actual
220220
end
221221

@@ -235,7 +235,7 @@ defmodule Gradient.ElixirExprTest do
235235
end
236236
|> ElixirExpr.pp_expr()
237237

238-
assert "case {:ok, 10} do {:ok, v} when v > 0 and v > 1 or v < - 1 -> :ok; t when :erlang.is_tuple(t) -> :nok; _ -> :err end" ==
238+
assert ~s(case {:"ok", 10} do {:"ok", v} when v > 0 and v > 1 or v < - 1 -> :"ok"; t when :erlang.is_tuple(t\) -> :"nok"; _ -> :"err" end) ==
239239
actual
240240
end
241241

@@ -249,7 +249,7 @@ defmodule Gradient.ElixirExprTest do
249249
end
250250
|> ElixirExpr.pp_expr()
251251

252-
assert "case {:ok, 13} do {:ok, v} -> v; _err -> :error end" == actual
252+
assert ~s(case {:"ok", 13} do {:"ok", v} -> v; _err -> :"error" end) == actual
253253
end
254254

255255
test "if" do
@@ -263,7 +263,7 @@ defmodule Gradient.ElixirExprTest do
263263
end
264264
|> ElixirExpr.pp_expr()
265265

266-
assert "if :math.floor(1.9) == 1.0 do :ok else :error end" == actual
266+
assert ~s(if :math.floor(1.9\) == 1.0 do :"ok" else :"error" end) == actual
267267
end
268268

269269
test "unless" do
@@ -277,7 +277,7 @@ defmodule Gradient.ElixirExprTest do
277277
end
278278
|> ElixirExpr.pp_expr()
279279

280-
assert "if :math.floor(1.9) == 1.0 do :error else :ok end" == actual
280+
assert ~s(if :math.floor(1.9\) == 1.0 do :"error" else :"ok" end) == actual
281281
end
282282

283283
test "cond" do
@@ -296,7 +296,7 @@ defmodule Gradient.ElixirExprTest do
296296
end
297297
|> ElixirExpr.pp_expr()
298298

299-
assert "cond do true == false -> :ok; :math.floor(1.9) == 1.0 -> :ok; true -> :error end" ==
299+
assert ~s(cond do true == false -> :"ok"; :math.floor\(1.9\) == 1.0 -> :"ok"; true -> :"error" end) ==
300300
actual
301301
end
302302

@@ -322,7 +322,7 @@ defmodule Gradient.ElixirExprTest do
322322
|> ElixirExpr.pp_expr()
323323

324324
assert ~s(try do if true do throw "good" else raise "oops" end;) <>
325-
~s( catch :error, %RuntimeError{} = e -> 11; e; :throw, val -> 12; val end) ==
325+
~s( catch :"error", %RuntimeError{} = e -> 11; e; :"throw", val -> 12; val end) ==
326326
actual
327327
end
328328
end

‎test/gradient/elixir_fmt_test.exs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ defmodule Gradient.ElixirFmtTest do
209209

210210
test "string", %{wrong_ret_errors: errors} do
211211
expr = expr_format_error_to_binary(errors.ret_wrong_boolean2)
212-
assert String.contains?(expr, "\"1234\"")
212+
assert String.contains?(expr, ~s("1234"))
213213
end
214214

215215
test "char", %{wrong_ret_errors: errors} do
@@ -225,7 +225,7 @@ defmodule Gradient.ElixirFmtTest do
225225

226226
test "record", %{record_type_errors: errors} do
227227
expr = expr_format_error_to_binary(errors.ret_wrong_atom)
228-
assert String.contains?(expr, "{:user, \"Kate\", 25}")
228+
assert String.contains?(expr, ~s({:user, "Kate", 25}))
229229
end
230230

231231
test "call", %{wrong_ret_errors: errors} do
@@ -270,8 +270,8 @@ defmodule Gradient.ElixirFmtTest do
270270
end
271271

272272
defp expr_format_error_to_binary(error, opts \\ []) do
273-
opts = Keyword.put_new(opts, :fmt_type_fun, &mock_fmt/1)
274-
opts = Keyword.put_new(opts, :colors, false)
273+
opts = Keyword.put_new(opts, :ex_fmt_type_fun, &mock_fmt/1)
274+
opts = Keyword.put_new(opts, :ex_colors, use_colors: false)
275275

276276
error
277277
|> ElixirFmt.format_error(opts)
@@ -281,8 +281,8 @@ defmodule Gradient.ElixirFmtTest do
281281
end
282282

283283
defp type_format_error_to_binary(error, opts \\ []) do
284-
opts = Keyword.put_new(opts, :fmt_expr_fun, &mock_fmt/1)
285-
opts = Keyword.put_new(opts, :colors, false)
284+
opts = Keyword.put_new(opts, :ex_fmt_expr_fun, &mock_fmt/1)
285+
opts = Keyword.put_new(opts, :ex_colors, use_colors: false)
286286

287287
error
288288
|> ElixirFmt.format_error(opts)

‎test/support/expr_data.ex‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ defmodule Gradient.ExprData do
2020

2121
def value_test_data() do
2222
[
23-
{"geric atom", {:atom, 0, :fjdksaose}, ":fjdksaose"},
23+
{"geric atom", {:atom, 0, :fjdksaose}, ~s(:"fjdksaose")},
2424
{"module atom", {:atom, 0, Gradient.ElixirExpr}, "Gradient.ElixirExpr"},
2525
{"nil atom", {:atom, 0, nil}, "nil"},
2626
{"true atom", {:atom, 0, true}, "true"},
@@ -42,7 +42,7 @@ defmodule Gradient.ExprData do
4242
{:cons, 0, {:integer, 0, 1}, {:cons, 0, {:integer, 0, 2}, {nil, 0}}}}, "[0, 1, 2]"},
4343
{"mixed list",
4444
{:cons, 0, {:integer, 0, 0},
45-
{:cons, 0, {:atom, 0, :ok}, {:cons, 0, {:integer, 0, 2}, {nil, 0}}}}, "[0, :ok, 2]"},
45+
{:cons, 0, {:atom, 0, :ok}, {:cons, 0, {:integer, 0, 2}, {nil, 0}}}}, ~s([0, :"ok", 2])},
4646
{"var in list", {:cons, 0, {:integer, 0, 0}, {:cons, 0, {:var, 0, :a}, {nil, 0}}},
4747
"[0, a]"},
4848
{"list tail pm", elixir_to_ast([a | t] = [12, 13, 14]), "[a | t] = [12, 13, 14]"},
@@ -71,7 +71,7 @@ defmodule Gradient.ExprData do
7171

7272
def exception_test_data() do
7373
[
74-
{"throw", elixir_to_ast(throw({:ok, 12})), "throw {:ok, 12}"},
74+
{"throw", elixir_to_ast(throw({:ok, 12})), ~s(throw {:"ok", 12})},
7575
{"raise/1", elixir_to_ast(raise "test error"), ~s(raise "test error")},
7676
{"raise/1 without msg", elixir_to_ast(raise RuntimeError), "raise RuntimeError"},
7777
{"raise/2", elixir_to_ast(raise RuntimeError, "test error"), ~s(raise "test error")},
@@ -95,10 +95,10 @@ defmodule Gradient.ExprData do
9595
def map_test_data do
9696
[
9797
{"string map", elixir_to_ast(%{"a" => 12}), ~s(%{"a" => 12})},
98-
{"map pm", elixir_to_ast(%{a: a} = %{a: 12}), "%{a: a} = %{a: 12}"},
99-
{"update map", elixir_to_ast(%{%{} | a: 1}), "%{%{} | a: 1}"},
98+
{"map pm", elixir_to_ast(%{a: a} = %{a: 12}), ~s(%{"a": a} = %{"a": 12})},
99+
{"update map", elixir_to_ast(%{%{} | a: 1}), ~s(%{%{} | "a": 1})},
100100
{"struct expr", elixir_to_ast(%{__struct__: TestStruct, name: "John"}),
101-
~s(%TestStruct{name: "John"})}
101+
~s(%TestStruct{"name": "John"})}
102102
]
103103
end
104104

@@ -118,16 +118,16 @@ defmodule Gradient.ExprData do
118118
"\"String without escape codes \\x26 without \#{interpolation}\""},
119119
{"char lists", elixir_to_ast(~c(this is a char list containing 'single quotes')),
120120
"'this is a char list containing \\'single quotes\\''"},
121-
{"word list", elixir_to_ast(~w(foo bar bat)), "[\"foo\", \"bar\", \"bat\"]"},
122-
{"word list atom", elixir_to_ast(~w(foo bar bat)a), "[:foo, :bar, :bat]"},
121+
{"word list", elixir_to_ast(~w(foo bar bat)), ~s(["foo", "bar", "bat"])},
122+
{"word list atom", elixir_to_ast(~w(foo bar bat)a), ~s([:"foo", :"bar", :"bat"])},
123123
{"date", elixir_to_ast(~D[2019-10-31]),
124-
"%Date{calendar: Calendar.ISO, year: 2019, month: 10, day: 31}"},
124+
~s(%Date{"calendar": Calendar.ISO, "year": 2019, "month": 10, "day": 31})},
125125
{"time", elixir_to_ast(~T[23:00:07.0]),
126-
"%Time{calendar: Calendar.ISO, hour: 23, minute: 0, second: 7, microsecond: {0, 1}}"},
126+
~s(%Time{"calendar": Calendar.ISO, "hour": 23, "minute": 0, "second": 7, "microsecond": {0, 1}})},
127127
{"naive date time", elixir_to_ast(~N[2019-10-31 23:00:07]),
128-
"%NaiveDateTime{calendar: Calendar.ISO, year: 2019, month: 10, day: 31, hour: 23, minute: 0, second: 7, microsecond: {0, 0}}"},
128+
~s(%NaiveDateTime{"calendar": Calendar.ISO, "year": 2019, "month": 10, "day": 31, "hour": 23, "minute": 0, "second": 7, "microsecond": {0, 0}})},
129129
{"date time", elixir_to_ast(~U[2019-10-31 19:59:03Z]),
130-
"%DateTime{calendar: Calendar.ISO, year: 2019, month: 10, day: 31, hour: 19, minute: 59, second: 3, microsecond: {0, 0}, time_zone: \"Etc/UTC\", zone_abbr: \"UTC\", utc_offset: 0, std_offset: 0}"}
130+
~s(%DateTime{"calendar": Calendar.ISO, "year": 2019, "month": 10, "day": 31, "hour": 19, "minute": 59, "second": 3, "microsecond": {0, 0}, "time_zone": "Etc/UTC", "zone_abbr": "UTC", "utc_offset": 0, "std_offset": 0})}
131131
]
132132
end
133133

@@ -195,15 +195,16 @@ defmodule Gradient.ExprData do
195195
end
196196

197197
defp regex_exp() do
198-
<<37, 82, 101, 103, 101, 120, 123, 111, 112, 116, 115, 58, 32, 60, 60, 62, 62, 44, 32, 114,
199-
101, 95, 112, 97, 116, 116, 101, 114, 110, 58, 32, 123, 58, 114, 101, 95, 112, 97, 116, 116,
200-
101, 114, 110, 44, 32, 48, 44, 32, 48, 44, 32, 48, 44, 32, 34, 69, 82, 67, 80, 86, 0, 0, 0,
201-
0, 0, 0, 0, 1, 0, 0, 0, 195, 191, 195, 191, 195, 191, 195, 191, 195, 191, 195, 191, 195,
202-
191, 195, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
203-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 194, 131, 0, 9, 29, 102, 29, 111, 29, 111, 119,
204-
0, 9, 29, 98, 29, 97, 29, 114, 120, 0, 18, 0, 34, 125, 44, 32, 114, 101, 95, 118, 101, 114,
205-
115, 105, 111, 110, 58, 32, 123, 34, 56, 46, 52, 52, 32, 50, 48, 50, 48, 45, 48, 50, 45, 49,
206-
50, 34, 44, 32, 58, 108, 105, 116, 116, 108, 101, 125, 44, 32, 115, 111, 117, 114, 99, 101,
207-
58, 32, 34, 102, 111, 111, 124, 98, 97, 114, 34, 125>>
198+
<<37, 82, 101, 103, 101, 120, 123, 34, 111, 112, 116, 115, 34, 58, 32, 60, 60, 62, 62, 44, 32,
199+
34, 114, 101, 95, 112, 97, 116, 116, 101, 114, 110, 34, 58, 32, 123, 58, 34, 114, 101, 95,
200+
112, 97, 116, 116, 101, 114, 110, 34, 44, 32, 48, 44, 32, 48, 44, 32, 48, 44, 32, 34, 69,
201+
82, 67, 80, 86, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 195, 191, 195, 191, 195, 191, 195, 191,
202+
195, 191, 195, 191, 195, 191, 195, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0,
203+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 194, 131, 0, 9, 29,
204+
102, 29, 111, 29, 111, 119, 0, 9, 29, 98, 29, 97, 29, 114, 120, 0, 18, 0, 34, 125, 44, 32,
205+
34, 114, 101, 95, 118, 101, 114, 115, 105, 111, 110, 34, 58, 32, 123, 34, 56, 46, 52, 52,
206+
32, 50, 48, 50, 48, 45, 48, 50, 45, 49, 50, 34, 44, 32, 58, 34, 108, 105, 116, 116, 108,
207+
101, 34, 125, 44, 32, 34, 115, 111, 117, 114, 99, 101, 34, 58, 32, 34, 102, 111, 111, 124,
208+
98, 97, 114, 34, 125>>
208209
end
209210
end

‎test/support/type_data.ex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ defmodule Gradient.TypeData do
1616
def value_test_data() do
1717
[
1818
{"integer value", {:integer, 0, 12}, "12"},
19-
{"atom value", {:atom, 0, :ok}, ":ok"},
19+
{"atom value", {:atom, 0, :ok}, ~s(:"ok")},
2020
{"boolean false", {:atom, 0, false}, "false"},
2121
{"boolean true", {:atom, 0, true}, "true"},
2222
{"nil", {:atom, 0, nil}, "nil"}
@@ -49,7 +49,7 @@ defmodule Gradient.TypeData do
4949
[
5050
{"any fun type", {:type, 0, :fun, []}, "fun()"},
5151
{"fun with any args returning a specific type",
52-
{:type, 0, :fun, [{:type, 0, :any}, {:atom, 0, :ok}]}, "(... -> :ok)"},
52+
{:type, 0, :fun, [{:type, 0, :any}, {:atom, 0, :ok}]}, ~s((... -> :"ok"\))},
5353
{"fun with specific arg types returning a specific type",
5454
{:type, 0, :fun, [{:type, 0, :product, [{:type, 0, :atom, []}]}, {:type, 0, :atom, []}]},
5555
"(atom() -> atom())"}
@@ -64,14 +64,14 @@ defmodule Gradient.TypeData do
6464
[
6565
{:type, 0, :map_field_assoc, [{:atom, 0, :value_a}, {:integer, 0, 5}]},
6666
{:type, 0, :map_field_exact, [{:atom, 0, :value_b}, {:atom, 0, :neo}]}
67-
]}, "%{optional(:value_a) => 5, required(:value_b) => :neo}"}
67+
]}, ~s(%{optional(:"value_a"\) => 5, required(:"value_b"\) => :"neo"})}
6868
]
6969
end
7070

7171
def tuple_types_test_data() do
7272
[
7373
{"any tuple type", {:type, 0, :tuple, :any}, "tuple()"},
74-
{"tuple {:ok, 8}", {:type, 0, :tuple, [{:atom, 0, :ok}, {:integer, 0, 8}]}, "{:ok, 8}"}
74+
{"tuple {:ok, 8}", {:type, 0, :tuple, [{:atom, 0, :ok}, {:integer, 0, 8}]}, ~s({:"ok", 8})}
7575
]
7676
end
7777

0 commit comments

Comments
 (0)