Skip to content

Commit e720f38

Browse files
authored
Merge pull request #46 from esl/remove-leading-slash
Get rid of leading slash in paths for load function
2 parents e35fd23 + 66b398a commit e720f38

File tree

4 files changed

+39
-40
lines changed

4 files changed

+39
-40
lines changed

test/gradient/ast_specifier_test.exs

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ defmodule Gradient.AstSpecifierTest do
1919
end
2020

2121
test "integer" do
22-
{tokens, ast} = load("/basic/Elixir.Basic.Int.beam", "/basic/int.ex")
22+
{tokens, ast} = load("basic/Elixir.Basic.Int.beam", "basic/int.ex")
2323

2424
[block, inline | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
2525

@@ -29,7 +29,7 @@ defmodule Gradient.AstSpecifierTest do
2929
end
3030

3131
test "float" do
32-
{tokens, ast} = load("/basic/Elixir.Basic.Float.beam", "/basic/float.ex")
32+
{tokens, ast} = load("basic/Elixir.Basic.Float.beam", "basic/float.ex")
3333

3434
[block, inline | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
3535
assert {:function, 2, :float, 0, [{:clause, 2, [], [], [{:float, 2, 0.12}]}]} = inline
@@ -38,7 +38,7 @@ defmodule Gradient.AstSpecifierTest do
3838
end
3939

4040
test "atom" do
41-
{tokens, ast} = load("/basic/Elixir.Basic.Atom.beam", "/basic/atom.ex")
41+
{tokens, ast} = load("basic/Elixir.Basic.Atom.beam", "basic/atom.ex")
4242

4343
[block, inline | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
4444

@@ -48,7 +48,7 @@ defmodule Gradient.AstSpecifierTest do
4848
end
4949

5050
test "char" do
51-
{tokens, ast} = load("/basic/Elixir.Basic.Char.beam", "/basic/char.ex")
51+
{tokens, ast} = load("basic/Elixir.Basic.Char.beam", "basic/char.ex")
5252

5353
[block, inline | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
5454

@@ -58,7 +58,7 @@ defmodule Gradient.AstSpecifierTest do
5858
end
5959

6060
test "charlist" do
61-
{tokens, ast} = load("/basic/Elixir.Basic.Charlist.beam", "/basic/charlist.ex")
61+
{tokens, ast} = load("basic/Elixir.Basic.Charlist.beam", "basic/charlist.ex")
6262

6363
[block, inline | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
6464

@@ -83,7 +83,7 @@ defmodule Gradient.AstSpecifierTest do
8383
end
8484

8585
test "string" do
86-
{tokens, ast} = load("/basic/Elixir.Basic.String.beam", "/basic/string.ex")
86+
{tokens, ast} = load("basic/Elixir.Basic.String.beam", "basic/string.ex")
8787

8888
[block, inline | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
8989

@@ -101,7 +101,7 @@ defmodule Gradient.AstSpecifierTest do
101101
end
102102

103103
test "tuple" do
104-
{tokens, ast} = load("/Elixir.Tuple.beam", "/tuple.ex")
104+
{tokens, ast} = load("Elixir.Tuple.beam", "tuple.ex")
105105

106106
[tuple_in_str2, tuple_in_str, tuple_in_list, _list_in_tuple, tuple | _] =
107107
AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
@@ -209,7 +209,7 @@ defmodule Gradient.AstSpecifierTest do
209209
end
210210

211211
test "binary" do
212-
{tokens, ast} = load("/basic/Elixir.Basic.Binary.beam", "/basic/binary.ex")
212+
{tokens, ast} = load("basic/Elixir.Basic.Binary.beam", "basic/binary.ex")
213213

214214
[complex2, complex, bin_block, bin | _] =
215215
AstSpecifier.run_mappers(ast, tokens)
@@ -279,7 +279,7 @@ defmodule Gradient.AstSpecifierTest do
279279
end
280280

281281
test "case conditional" do
282-
{tokens, ast} = load("/conditional/Elixir.Conditional.Case.beam", "/conditional/case.ex")
282+
{tokens, ast} = load("conditional/Elixir.Conditional.Case.beam", "conditional/case.ex")
283283

284284
[block, inline | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
285285

@@ -309,7 +309,7 @@ defmodule Gradient.AstSpecifierTest do
309309
end
310310

311311
test "if conditional" do
312-
{tokens, ast} = load("/conditional/Elixir.Conditional.If.beam", "/conditional/if.ex")
312+
{tokens, ast} = load("conditional/Elixir.Conditional.If.beam", "conditional/if.ex")
313313

314314
[block, inline, if_ | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
315315

@@ -360,8 +360,7 @@ defmodule Gradient.AstSpecifierTest do
360360
end
361361

362362
test "unless conditional" do
363-
{tokens, ast} =
364-
load("/conditional/Elixir.Conditional.Unless.beam", "/conditional/unless.ex")
363+
{tokens, ast} = load("conditional/Elixir.Conditional.Unless.beam", "conditional/unless.ex")
365364

366365
[block | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
367366

@@ -386,7 +385,7 @@ defmodule Gradient.AstSpecifierTest do
386385
end
387386

388387
test "cond conditional" do
389-
{tokens, ast} = load("/conditional/Elixir.Conditional.Cond.beam", "/conditional/cond.ex")
388+
{tokens, ast} = load("conditional/Elixir.Conditional.Cond.beam", "conditional/cond.ex")
390389

391390
[block, inline | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
392391

@@ -457,7 +456,7 @@ defmodule Gradient.AstSpecifierTest do
457456
end
458457

459458
test "with conditional" do
460-
{tokens, ast} = load("/conditional/Elixir.Conditional.With.beam", "/conditional/with.ex")
459+
{tokens, ast} = load("conditional/Elixir.Conditional.With.beam", "conditional/with.ex")
461460

462461
[block | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
463462

@@ -489,8 +488,8 @@ defmodule Gradient.AstSpecifierTest do
489488

490489
@tag :skip
491490
test "basic function return" do
492-
ex_file = "/basic.ex"
493-
beam_file = "/Elixir.Basic.beam"
491+
ex_file = "basic.ex"
492+
beam_file = "Elixir.Basic.beam"
494493
{tokens, ast} = load(beam_file, ex_file)
495494

496495
specified_ast = AstSpecifier.run_mappers(ast, tokens)
@@ -535,7 +534,7 @@ defmodule Gradient.AstSpecifierTest do
535534
end
536535

537536
test "function call" do
538-
{tokens, ast} = load("/Elixir.Call.beam", "/call.ex")
537+
{tokens, ast} = load("Elixir.Call.beam", "call.ex")
539538

540539
[call, _ | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
541540

@@ -555,7 +554,7 @@ defmodule Gradient.AstSpecifierTest do
555554
end
556555

557556
test "pipe" do
558-
{tokens, ast} = load("/Elixir.Pipe.beam", "/pipe_op.ex")
557+
{tokens, ast} = load("Elixir.Pipe.beam", "pipe_op.ex")
559558

560559
[block | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
561560

@@ -587,7 +586,7 @@ defmodule Gradient.AstSpecifierTest do
587586
end
588587

589588
test "guards" do
590-
{tokens, ast} = load("/conditional/Elixir.Conditional.Guard.beam", "/conditional/guards.ex")
589+
{tokens, ast} = load("conditional/Elixir.Conditional.Guard.beam", "conditional/guards.ex")
591590

592591
[guarded_case, guarded_fun | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
593592

@@ -627,7 +626,7 @@ defmodule Gradient.AstSpecifierTest do
627626
end
628627

629628
test "range" do
630-
{tokens, ast} = load("/Elixir.RangeEx.beam", "/range.ex")
629+
{tokens, ast} = load("Elixir.RangeEx.beam", "range.ex")
631630

632631
[to_list, match_range, rev_range_step, range_step, range | _] =
633632
AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
@@ -708,7 +707,7 @@ defmodule Gradient.AstSpecifierTest do
708707
end
709708

710709
test "list comprehension" do
711-
{tokens, ast} = load("/Elixir.ListComprehension.beam", "/list_comprehension.ex")
710+
{tokens, ast} = load("Elixir.ListComprehension.beam", "list_comprehension.ex")
712711

713712
[block | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
714713

@@ -758,7 +757,7 @@ defmodule Gradient.AstSpecifierTest do
758757
end
759758

760759
test "list" do
761-
{tokens, ast} = load("/Elixir.ListEx.beam", "/list.ex")
760+
{tokens, ast} = load("Elixir.ListEx.beam", "list.ex")
762761

763762
[ht2, ht, list, _wrap | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
764763

@@ -798,7 +797,7 @@ defmodule Gradient.AstSpecifierTest do
798797
end
799798

800799
test "try" do
801-
{tokens, ast} = load("/Elixir.Try.beam", "/try.ex")
800+
{tokens, ast} = load("Elixir.Try.beam", "try.ex")
802801

803802
[body_after, try_after, try_else, try_rescue | _] =
804803
AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
@@ -981,7 +980,7 @@ defmodule Gradient.AstSpecifierTest do
981980
end
982981

983982
test "map" do
984-
{tokens, ast} = load("/Elixir.MapEx.beam", "/map.ex")
983+
{tokens, ast} = load("Elixir.MapEx.beam", "map.ex")
985984

986985
[pattern_matching_str, pattern_matching, test_map_str, test_map, empty_map | _] =
987986
AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
@@ -1045,7 +1044,7 @@ defmodule Gradient.AstSpecifierTest do
10451044
end
10461045

10471046
test "struct" do
1048-
{tokens, ast} = load("/struct/Elixir.StructEx.beam", "/struct/struct.ex")
1047+
{tokens, ast} = load("struct/Elixir.StructEx.beam", "struct/struct.ex")
10491048

10501049
[get2, get, update, empty, struct | _] =
10511050
AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
@@ -1162,7 +1161,7 @@ defmodule Gradient.AstSpecifierTest do
11621161
end
11631162

11641163
test "record" do
1165-
{tokens, ast} = load("/record/Elixir.RecordEx.beam", "/record/record.ex")
1164+
{tokens, ast} = load("record/Elixir.RecordEx.beam", "record/record.ex")
11661165

11671166
[update, init, empty, macro3, macro2, macro1 | _] =
11681167
AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
@@ -1245,7 +1244,7 @@ defmodule Gradient.AstSpecifierTest do
12451244
end
12461245

12471246
test "receive" do
1248-
{tokens, ast} = load("/Elixir.Receive.beam", "/receive.ex")
1247+
{tokens, ast} = load("Elixir.Receive.beam", "receive.ex")
12491248

12501249
[recv, recv2 | _] = AstSpecifier.run_mappers(ast, tokens) |> Enum.reverse()
12511250

@@ -1367,7 +1366,7 @@ defmodule Gradient.AstSpecifierTest do
13671366
end
13681367

13691368
test "typespec" do
1370-
{tokens, ast} = load("/Elixir.Typespec.beam", "/typespec.ex")
1369+
{tokens, ast} = load("Elixir.Typespec.beam", "typespec.ex")
13711370

13721371
result =
13731372
AstSpecifier.run_mappers(ast, tokens)

test/gradient/elixir_fmt_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ defmodule Gradient.ElixirFmtTest do
294294

295295
@spec load_record_type_example(map()) :: map()
296296
defp load_record_type_example(config) do
297-
{_tokens, ast} = load("/type/Elixir.RecordEx.beam", "/type/record.ex")
297+
{_tokens, ast} = load("type/Elixir.RecordEx.beam", "type/record.ex")
298298

299299
{errors, forms} = type_check_file(ast, [])
300300

@@ -311,7 +311,7 @@ defmodule Gradient.ElixirFmtTest do
311311

312312
@spec load_wrong_ret_error_examples(map()) :: map()
313313
defp load_wrong_ret_error_examples(config) do
314-
{_tokens, ast} = load("/type/Elixir.WrongRet.beam", "/type/wrong_ret.ex")
314+
{_tokens, ast} = load("type/Elixir.WrongRet.beam", "type/wrong_ret.ex")
315315

316316
{errors, forms} = type_check_file(ast, [])
317317
names = get_function_names_from_ast(forms)

test/gradient/tokens_test.exs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ defmodule Gradient.TokensTest do
4747

4848
describe "get_conditional/1" do
4949
test "case" do
50-
{tokens, _ast} = load("/conditional/Elixir.Conditional.Case.beam", "/conditional/case.ex")
50+
{tokens, _ast} = load("conditional/Elixir.Conditional.Case.beam", "conditional/case.ex")
5151
tokens = Tokens.drop_tokens_to_line(tokens, 2)
5252
opts = [end_line: -1]
5353
assert {:case, _} = Tokens.get_conditional(tokens, 4, opts)
@@ -57,7 +57,7 @@ defmodule Gradient.TokensTest do
5757
end
5858

5959
test "if" do
60-
{tokens, _ast} = load("/conditional/Elixir.Conditional.If.beam", "/conditional/if.ex")
60+
{tokens, _ast} = load("conditional/Elixir.Conditional.If.beam", "conditional/if.ex")
6161
tokens = Tokens.drop_tokens_to_line(tokens, 2)
6262
opts = [end_line: -1]
6363
assert {:if, _} = Tokens.get_conditional(tokens, 4, opts)
@@ -68,15 +68,15 @@ defmodule Gradient.TokensTest do
6868

6969
test "unless" do
7070
{tokens, _ast} =
71-
load("/conditional/Elixir.Conditional.Unless.beam", "/conditional/unless.ex")
71+
load("conditional/Elixir.Conditional.Unless.beam", "conditional/unless.ex")
7272

7373
tokens = Tokens.drop_tokens_to_line(tokens, 2)
7474
opts = [end_line: -1]
7575
assert {:unless, _} = Tokens.get_conditional(tokens, 3, opts)
7676
end
7777

7878
test "cond" do
79-
{tokens, _ast} = load("/conditional/Elixir.Conditional.Cond.beam", "/conditional/cond.ex")
79+
{tokens, _ast} = load("conditional/Elixir.Conditional.Cond.beam", "conditional/cond.ex")
8080

8181
tokens = Tokens.drop_tokens_to_line(tokens, 2)
8282
opts = [end_line: -1]
@@ -87,7 +87,7 @@ defmodule Gradient.TokensTest do
8787
end
8888

8989
test "with" do
90-
{tokens, _ast} = load("/conditional/Elixir.Conditional.With.beam", "/conditional/with.ex")
90+
{tokens, _ast} = load("conditional/Elixir.Conditional.With.beam", "conditional/with.ex")
9191

9292
tokens = Tokens.drop_tokens_to_line(tokens, 6)
9393
opts = [end_line: -1]

test/support/helpers.ex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defmodule Gradient.TestHelpers do
22
alias Gradient.Types, as: T
33

4-
@examples_path "test/examples"
4+
@examples_path "test/examples/"
55

66
@spec load(String.t(), String.t()) :: {T.tokens(), T.forms()}
77
def load(beam_file, ex_file) do
@@ -25,8 +25,8 @@ defmodule Gradient.TestHelpers do
2525

2626
@spec example_data() :: {T.tokens(), T.forms()}
2727
def example_data() do
28-
beam_path = (@examples_path <> "/Elixir.SimpleApp.beam") |> String.to_charlist()
29-
file_path = @examples_path <> "/simple_app.ex"
28+
beam_path = (@examples_path <> "Elixir.SimpleApp.beam") |> String.to_charlist()
29+
file_path = @examples_path <> "simple_app.ex"
3030

3131
code =
3232
File.read!(file_path)
@@ -45,7 +45,7 @@ defmodule Gradient.TestHelpers do
4545

4646
@spec example_tokens() :: T.tokens()
4747
def example_tokens() do
48-
file_path = @examples_path <> "/conditional/cond.ex"
48+
file_path = @examples_path <> "conditional/cond.ex"
4949

5050
code =
5151
File.read!(file_path)
@@ -60,7 +60,7 @@ defmodule Gradient.TestHelpers do
6060

6161
@spec example_string_tokens() :: T.tokens()
6262
def example_string_tokens() do
63-
file_path = @examples_path <> "/string_example.ex"
63+
file_path = @examples_path <> "string_example.ex"
6464

6565
code =
6666
File.read!(file_path)

0 commit comments

Comments
 (0)