umgeher/erlware_commons
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #139 from tsloughter/alpha-pes

Browse source 
fix ec_semver:pes test to not ignore alpha versions
This commit is contained in:
Tristan Sloughter 2018-10-13 11:50:25 -06:00 • committed by GitHub
commit a8b46e0770
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ec_semver.erl
View file

@ -287,24 +287,24 @@ normalize(Other = {{_, _, _, _}, {_,_}}) ->
%% the internal implementation of the of the pessimistic run. The %% the internal implementation of the of the pessimistic run. The
%% external just ensures that versions are parsed. %% external just ensures that versions are parsed.
-spec internal_pes(semver(), semver()) -> boolean(). -spec internal_pes(semver(), semver()) -> boolean().
internal_pes(VsnA, {{LM, LMI}, _}) internal_pes(VsnA, {{LM, LMI}, Alpha})
when erlang:is_integer(LM), when erlang:is_integer(LM),
erlang:is_integer(LMI) -> erlang:is_integer(LMI) ->
gte(VsnA, {{LM, LMI, 0}, {[], []}}) andalso gte(VsnA, {{LM, LMI, 0}, Alpha}) andalso
lt(VsnA, {{LM + 1, 0, 0, 0}, {[], []}}); lt(VsnA, {{LM + 1, 0, 0, 0}, {[], []}});
internal_pes(VsnA, {{LM, LMI, LP}, _}) internal_pes(VsnA, {{LM, LMI, LP}, Alpha})
when erlang:is_integer(LM), when erlang:is_integer(LM),
erlang:is_integer(LMI), erlang:is_integer(LMI),
erlang:is_integer(LP) -> erlang:is_integer(LP) ->
gte(VsnA, {{LM, LMI, LP}, {[], []}}) gte(VsnA, {{LM, LMI, LP}, Alpha})
andalso andalso
lt(VsnA, {{LM, LMI + 1, 0, 0}, {[], []}}); lt(VsnA, {{LM, LMI + 1, 0, 0}, {[], []}});
internal_pes(VsnA, {{LM, LMI, LP, LMP}, _}) internal_pes(VsnA, {{LM, LMI, LP, LMP}, Alpha})
when erlang:is_integer(LM), when erlang:is_integer(LM),
erlang:is_integer(LMI), erlang:is_integer(LMI),
erlang:is_integer(LP), erlang:is_integer(LP),
erlang:is_integer(LMP) -> erlang:is_integer(LMP) ->
gte(VsnA, {{LM, LMI, LP, LMP}, {[], []}}) gte(VsnA, {{LM, LMI, LP, LMP}, Alpha})
andalso andalso
lt(VsnA, {{LM, LMI, LP + 1, 0}, {[], []}}); lt(VsnA, {{LM, LMI, LP + 1, 0}, {[], []}});
internal_pes(Vsn, LVsn) -> internal_pes(Vsn, LVsn) ->
@ -671,6 +671,10 @@ between_test() ->
?assertMatch(true, not between("aaa", "ddd", "zzz")). ?assertMatch(true, not between("aaa", "ddd", "zzz")).
pes_test() -> pes_test() ->
?assertMatch(true, pes("1.0.0-rc.0", "1.0.0-rc.0")),
?assertMatch(true, pes("1.0.0-rc.1", "1.0.0-rc.0")),
?assertMatch(true, pes("1.0.0", "1.0.0-rc.0")),
?assertMatch(false, pes("1.0.0-rc.0", "1.0.0-rc.1")),
?assertMatch(true, pes("2.6.0", "2.6")), ?assertMatch(true, pes("2.6.0", "2.6")),
?assertMatch(true, pes("2.7", "2.6")), ?assertMatch(true, pes("2.7", "2.6")),
?assertMatch(true, pes("2.8", "2.6")), ?assertMatch(true, pes("2.8", "2.6")),