From d880e6e385ac49ecfe67449a25c1fd95b4e1f882 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 23 Oct 2012 09:49:06 -0500 Subject: fix bug in goal parsing and handling Signed-off-by: Jordan Wilberding --- test/rclt_command_SUITE.erl | 8 ++++---- test/rclt_goal.erl | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'test') diff --git a/test/rclt_command_SUITE.erl b/test/rclt_command_SUITE.erl index fa4fc23..46449e9 100644 --- a/test/rclt_command_SUITE.erl +++ b/test/rclt_command_SUITE.erl @@ -65,11 +65,11 @@ normal_passing_case(Config) -> rcl_state:lib_dirs(State)), ?assertMatch(Outdir, rcl_state:output_dir(State)), - ?assertMatch([{<<"app1">>,{{33,33},{[],[<<"build4">>]}},lte}, - {<<"app2">>, + ?assertMatch([{app1,{{33,33},{[],[<<"build4">>]}},lte}, + {app2, {{33,22},{[],[]}}, - {{45,22},{[],[<<"build">>,21]}}, - between}], rcl_state:goals(State)). + {{45,22},{[],[<<"build">>,21]}}, between}], + rcl_state:goals(State)). lib_fail_case(Config) -> diff --git a/test/rclt_goal.erl b/test/rclt_goal.erl index 9fd31ae..9bf6028 100644 --- a/test/rclt_goal.erl +++ b/test/rclt_goal.erl @@ -23,35 +23,35 @@ -include_lib("eunit/include/eunit.hrl"). parse_test() -> - ?assertMatch({ok, <<"getopt">>}, + ?assertMatch({ok, getopt}, rcl_goal:parse("getopt")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, '='}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, '='}}, rcl_goal:parse("getopt=0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, '='}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, '='}}, rcl_goal:parse("getopt:0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, '='}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, '='}}, rcl_goal:parse("getopt-0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, gte}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, gte}}, rcl_goal:parse("getopt >= 0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, gte}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, gte}}, rcl_goal:parse("getopt:gte:0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, gt}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, gt}}, rcl_goal:parse("getopt>0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, gt}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, gt}}, rcl_goal:parse("getopt:gt:0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, lte}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, lte}}, rcl_goal:parse("getopt<= 0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, lte}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, lte}}, rcl_goal:parse("getopt:lte:0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, lt}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, lt}}, rcl_goal:parse("getopt<0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, pes}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, pes}}, rcl_goal:parse("getopt ~>0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, pes}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, pes}}, rcl_goal:parse("getopt: pes:0.5.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, {{0,6,1},{[],[]}}, between}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, {{0,6,1},{[],[]}}, between}}, rcl_goal:parse("getopt:btwn:0.5.1,0.6.1")), - ?assertMatch({ok, {<<"getopt">>, {{0,5,1},{[],[]}}, {{0,6,1},{[],[]}}, between}}, + ?assertMatch({ok, {getopt, {{0,5,1},{[],[]}}, {{0,6,1},{[],[]}}, between}}, rcl_goal:parse("getopt:between :0.5.1,0.6.1")). fail_test() -> -- cgit v1.2.3