Added negative test for when the input does not contain

the total even though there are rows.
Gianfrancoalongi · Feb 19, 2012 · 5171d43 · 5171d43
1 parent d1f12c1
commit 5171d43
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/One/Solution/src/ros_parser.erl b/One/Solution/src/ros_parser.erl
@@ -6,16 +6,21 @@
 parse("")-> {error,no_total};
 
 parse(Input) -> 
-    [Total|Lines] = lists:reverse(string:tokens(Input,"\n")),    
+    [Total|Lines] = lists:reverse(string:tokens(Input,"\n")),
-    Entries = lists:sort([ parse_row(Line) || Line <- Lines]),
+    case (catch list_to_integer(Total)) of
-    {ok,#ros{total = list_to_integer(Total),
+	{'EXIT',_ } ->
-	     entries = Entries}}.
+	    {error,no_total};
+	IntTotal ->
+	    Entries = lists:sort([ parse_row(Line) || Line <- Lines]),
+	    {ok,#ros{total = IntTotal,
+		     entries = Entries}}
+    end.
 
 parse_row(Line) ->
     [Type,Sold,Projected] = string:tokens(Line,","),
     #entry{type = Type,
-	  sold = list_to_integer(Sold),
+	   sold = list_to_integer(Sold),
-	  projected = list_to_integer(Projected)}.
+	   projected = list_to_integer(Projected)}.
 
 
 
diff --git a/One/Solution/test/ros_parser_tests.erl b/One/Solution/test/ros_parser_tests.erl
@@ -18,4 +18,9 @@ ros_parse_basic_test() ->
 				   ],
 			total = 3}},
 		 ros_parser:parse(Input)).
+
+ros_parse_negative_no_total_but_rows_test() ->
+    Input = "a,1,1\nb,2,2",
+    ?assertMatch({error,no_total},ros_parser:parse(Input)).
+