summaryrefslogtreecommitdiff
path: root/test/rebar_utils_SUITE.erl
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-12-06 19:05:50 -0600
committerTristan Sloughter <t@crashfast.com>2015-12-06 19:05:50 -0600
commitb1da2ec0674df89599564252734bd4d794436425 (patch)
tree3c442a1fcd68b6ece3ca1784495564195ea1770d /test/rebar_utils_SUITE.erl
parentd76b25e62dd3a0c575cc2b4353aad3dbbb934c0a (diff)
parent769e14c54253a881992dcfcc2ac0ee3367b9a667 (diff)
Merge pull request #965 from ferd/tsloughter-tup_umerge
fix tupple merging for realsies.
Diffstat (limited to 'test/rebar_utils_SUITE.erl')
-rw-r--r--test/rebar_utils_SUITE.erl7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/rebar_utils_SUITE.erl b/test/rebar_utils_SUITE.erl
index 42a9551..b32992d 100644
--- a/test/rebar_utils_SUITE.erl
+++ b/test/rebar_utils_SUITE.erl
@@ -259,6 +259,13 @@ tup_merge(_Config) ->
)
),
?assertEqual(
+ [{l, a}, {r, a, b}, {s, a}, {s, b}],
+ rebar_utils:tup_umerge(
+ rebar_utils:tup_sort([{r, a, b}, {s, a}, {l, a}]),
+ rebar_utils:tup_sort([{s, b}])
+ )
+ ),
+ ?assertEqual(
[{a,b,b},{a,b},a,{a,a},{a,a,a},{b,b},{b,b,b},b,{b,a,a},{b,a},{z,b},{z,b,b},z,{z,a},{z,a,a}],
rebar_utils:tup_umerge(
rebar_utils:tup_sort([{a,b,b},{b,b},{a,b},{b,b,b},{z,b},{z,b,b},a,b,z]),