aboutsummaryrefslogtreecommitdiff
path: root/gen
diff options
context:
space:
mode:
authorLouis Pilfold <louis@lpil.uk>2019-09-17 21:16:54 +0100
committerLouis Pilfold <louis@lpil.uk>2019-09-17 22:20:26 +0100
commit6fe389492ce7d788c1177b3ea76717ee6c274347 (patch)
treeb1b5c5c4067186a4a86e9936467b1faad1c5e56f /gen
parent4dc0d1854fa7dfc0229e27b6b69848564185e43b (diff)
downloadgleam_stdlib-6fe389492ce7d788c1177b3ea76717ee6c274347.tar.gz
gleam_stdlib-6fe389492ce7d788c1177b3ea76717ee6c274347.zip
Removing is_error from tests
Diffstat (limited to 'gen')
-rw-r--r--gen/src/gleam@list.erl2
-rw-r--r--gen/test/gleam@atom_test.erl5
-rw-r--r--gen/test/gleam@float_test.erl6
-rw-r--r--gen/test/gleam@int_test.erl6
-rw-r--r--gen/test/gleam@list_test.erl34
-rw-r--r--gen/test/gleam@map_test.erl2
6 files changed, 34 insertions, 21 deletions
diff --git a/gen/src/gleam@list.erl b/gen/src/gleam@list.erl
index f5b8f6d..291bd7f 100644
--- a/gen/src/gleam@list.erl
+++ b/gen/src/gleam@list.erl
@@ -232,7 +232,7 @@ strict_zip(L1, L2) ->
{ok, zip(L1, L2)};
false ->
- {error, {}}
+ {error, length_mismatch}
end.
intersperse(List, Elem) ->
diff --git a/gen/test/gleam@atom_test.erl b/gen/test/gleam@atom_test.erl
index 84b361f..3c4355d 100644
--- a/gen/test/gleam@atom_test.erl
+++ b/gen/test/gleam@atom_test.erl
@@ -6,8 +6,9 @@
from_string_test() ->
gleam@expect:is_ok(gleam@atom:from_string(<<"ok">>)),
gleam@expect:is_ok(gleam@atom:from_string(<<"expect">>)),
- gleam@expect:is_error(
- gleam@atom:from_string(<<"this is not an atom we have seen before">>)
+ gleam@expect:equal(
+ gleam@atom:from_string(<<"this is not an atom we have seen before">>),
+ {error, atom_not_loaded}
).
create_from_string_test() ->
diff --git a/gen/test/gleam@float_test.erl b/gen/test/gleam@float_test.erl
index 403be9d..0f7e55b 100644
--- a/gen/test/gleam@float_test.erl
+++ b/gen/test/gleam@float_test.erl
@@ -7,9 +7,9 @@ parse_test() ->
gleam@expect:equal(gleam@float:parse(<<"1.23">>), {ok, 1.23}),
gleam@expect:equal(gleam@float:parse(<<"5.0">>), {ok, 5.0}),
gleam@expect:equal(gleam@float:parse(<<"0.123456789">>), {ok, 0.123456789}),
- gleam@expect:is_error(gleam@float:parse(<<"">>)),
- gleam@expect:is_error(gleam@float:parse(<<"what">>)),
- gleam@expect:is_error(gleam@float:parse(<<"1">>)).
+ gleam@expect:equal(gleam@float:parse(<<"">>), {error, nil}),
+ gleam@expect:equal(gleam@float:parse(<<"what">>), {error, nil}),
+ gleam@expect:equal(gleam@float:parse(<<"1">>), {error, nil}).
to_string_test() ->
gleam@expect:equal(gleam@float:to_string(123.0), <<"123.0">>),
diff --git a/gen/test/gleam@int_test.erl b/gen/test/gleam@int_test.erl
index 1f13f1a..7cee67a 100644
--- a/gen/test/gleam@int_test.erl
+++ b/gen/test/gleam@int_test.erl
@@ -12,9 +12,9 @@ parse() ->
gleam@expect:equal(gleam@int:parse(<<"123">>), {ok, 123}),
gleam@expect:equal(gleam@int:parse(<<"-123">>), {ok, -123}),
gleam@expect:equal(gleam@int:parse(<<"0123">>), {ok, 123}),
- gleam@expect:is_error(gleam@int:parse(<<"">>)),
- gleam@expect:is_error(gleam@int:parse(<<"what">>)),
- gleam@expect:is_error(gleam@int:parse(<<"1.23">>)).
+ gleam@expect:equal(gleam@int:parse(<<"">>), {error, nil}),
+ gleam@expect:equal(gleam@int:parse(<<"what">>), {error, nil}),
+ gleam@expect:equal(gleam@int:parse(<<"1.23">>), {error, nil}).
to_base_string() ->
gleam@expect:equal(gleam@int:to_base_string(100, 16), <<"64">>),
diff --git a/gen/test/gleam@list_test.erl b/gen/test/gleam@list_test.erl
index dcb4ceb..ae1f786 100644
--- a/gen/test/gleam@list_test.erl
+++ b/gen/test/gleam@list_test.erl
@@ -24,12 +24,12 @@ contains_test() ->
head_test() ->
gleam@expect:equal(gleam@list:head([0, 4, 5, 7]), {ok, 0}),
- gleam@expect:is_error(gleam@list:head([])).
+ gleam@expect:equal(gleam@list:head([]), {error, nil}).
tail_test() ->
gleam@expect:equal(gleam@list:tail([0, 4, 5, 7]), {ok, [4, 5, 7]}),
gleam@expect:equal(gleam@list:tail([0]), {ok, []}),
- gleam@expect:is_error(gleam@list:tail([])).
+ gleam@expect:equal(gleam@list:tail([]), {error, nil}).
filter_test() ->
gleam@expect:equal(gleam@list:filter([], fun(_) -> true end), []),
@@ -112,7 +112,7 @@ find_test() ->
end end,
gleam@expect:equal(gleam@list:find([1, 2, 3], F), {ok, 4}),
gleam@expect:equal(gleam@list:find([1, 3, 2], F), {ok, 4}),
- gleam@expect:is_error(gleam@list:find([1, 3], F)).
+ gleam@expect:equal(gleam@list:find([1, 3], F), {error, nil}).
all_test() ->
gleam@expect:equal(
@@ -147,14 +147,26 @@ zip_test() ->
gleam@expect:equal(gleam@list:zip([5, 6, 7], [1, 2]), [{5, 1}, {6, 2}]).
strict_zip_test() ->
- gleam@expect:is_error(gleam@list:strict_zip([], [1, 2, 3])),
- gleam@expect:is_error(gleam@list:strict_zip([1, 2], [])),
+ gleam@expect:equal(
+ gleam@list:strict_zip([], [1, 2, 3]),
+ {error, length_mismatch}
+ ),
+ gleam@expect:equal(
+ gleam@list:strict_zip([1, 2], []),
+ {error, length_mismatch}
+ ),
gleam@expect:equal(
gleam@list:strict_zip([1, 2, 3], [4, 5, 6]),
{ok, [{1, 4}, {2, 5}, {3, 6}]}
),
- gleam@expect:is_error(gleam@list:strict_zip([5, 6], [1, 2, 3])),
- gleam@expect:is_error(gleam@list:strict_zip([5, 6, 7], [1, 2])).
+ gleam@expect:equal(
+ gleam@list:strict_zip([5, 6], [1, 2, 3]),
+ {error, length_mismatch}
+ ),
+ gleam@expect:equal(
+ gleam@list:strict_zip([5, 6, 7], [1, 2]),
+ {error, length_mismatch}
+ ).
intersperse_test() ->
gleam@expect:equal(gleam@list:intersperse([1, 2, 3], 4), [1, 4, 2, 4, 3]),
@@ -162,9 +174,9 @@ intersperse_test() ->
at_test() ->
gleam@expect:equal(gleam@list:at([1, 2, 3], 2), {ok, 3}),
- gleam@expect:is_error(gleam@list:at([1, 2, 3], 5)),
- gleam@expect:is_error(gleam@list:at([], 0)),
- gleam@expect:is_error(gleam@list:at([1, 2, 3, 4, 5, 6], -1)).
+ gleam@expect:equal(gleam@list:at([1, 2, 3], 5), {error, nil}),
+ gleam@expect:equal(gleam@list:at([], 0), {error, nil}),
+ gleam@expect:equal(gleam@list:at([1, 2, 3, 4, 5, 6], -1), {error, nil}).
unique_test() ->
gleam@expect:equal(
@@ -270,4 +282,4 @@ key_find_test() ->
Proplist = [{0, <<"1">>}, {1, <<"2">>}],
gleam@expect:equal(gleam@list:key_find(Proplist, 0), {ok, <<"1">>}),
gleam@expect:equal(gleam@list:key_find(Proplist, 1), {ok, <<"2">>}),
- gleam@expect:is_error(gleam@list:key_find(Proplist, 2)).
+ gleam@expect:equal(gleam@list:key_find(Proplist, 2), {error, nil}).
diff --git a/gen/test/gleam@map_test.erl b/gen/test/gleam@map_test.erl
index 83a86f6..9ef0149 100644
--- a/gen/test/gleam@map_test.erl
+++ b/gen/test/gleam@map_test.erl
@@ -28,7 +28,7 @@ fetch_test() ->
M = gleam@map:from_list(Proplist),
gleam@expect:equal(gleam@map:fetch(M, 4), {ok, 0}),
gleam@expect:equal(gleam@map:fetch(M, 1), {ok, 1}),
- gleam@expect:is_error(gleam@map:fetch(M, 2)).
+ gleam@expect:equal(gleam@map:fetch(M, 2), {error, nil}).
put_test() ->
gleam@expect:equal(