From 2cf430f404771255feead27873e48542829ea185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Mon, 10 Jul 2017 12:58:12 +0200
Subject: Switch from Triq to Proper

---
 src/cow_date.erl    | 14 +++++++-------
 src/cow_hpack.erl   |  2 +-
 src/cow_http_hd.erl | 23 +++++++++++------------
 3 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/cow_date.erl b/src/cow_date.erl
index 803448b..c0710f8 100644
--- a/src/cow_date.erl
+++ b/src/cow_date.erl
@@ -20,7 +20,7 @@
 -export([rfc7231/1]).
 
 -ifdef(TEST).
--include_lib("triq/include/triq.hrl").
+-include_lib("proper/include/proper.hrl").
 -endif.
 
 %% @doc Parse the HTTP date (IMF-fixdate, rfc850, asctime).
@@ -143,12 +143,12 @@ asctime_day(D1, D2) -> (D1 - $0) * 10 + (D2 - $0).
 -ifdef(TEST).
 day_name() -> oneof(["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]).
 day_name_l() -> oneof(["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]).
-year() -> int(1951, 2050).
-month() -> int(1, 12).
-day() -> int(1, 31).
-hour() -> int(23).
-minute() -> int(59).
-second() -> int(60).
+year() -> integer(1951, 2050).
+month() -> integer(1, 12).
+day() -> integer(1, 31).
+hour() -> integer(0, 23).
+minute() -> integer(0, 59).
+second() -> integer(0, 60).
 
 fixdate_gen() ->
 	?LET({DayName, Y, Mo, D, H, Mi, S},
diff --git a/src/cow_hpack.erl b/src/cow_hpack.erl
index a3c1c9b..694acfb 100644
--- a/src/cow_hpack.erl
+++ b/src/cow_hpack.erl
@@ -42,7 +42,7 @@
 -export_type([opts/0]).
 
 -ifdef(TEST).
--include_lib("triq/include/triq.hrl").
+-include_lib("proper/include/proper.hrl").
 -endif.
 
 %% State initialization.
diff --git a/src/cow_http_hd.erl b/src/cow_http_hd.erl
index 600f21a..08c392b 100644
--- a/src/cow_http_hd.erl
+++ b/src/cow_http_hd.erl
@@ -135,7 +135,7 @@
 -include("cow_parse.hrl").
 
 -ifdef(TEST).
--include_lib("triq/include/triq.hrl").
+-include_lib("proper/include/proper.hrl").
 
 vector(Min, Max, Dom) -> ?LET(N, choose(Min, Max), vector(N, Dom)).
 small_list(Dom) -> vector(0, 10, Dom).
@@ -162,13 +162,13 @@ token() ->
 		list_to_binary(T)).
 
 abnf_char() ->
-	int(1, 127).
+	integer(1, 127).
 
 vchar() ->
-	int(33, 126).
+	integer(33, 126).
 
 obs_text() ->
-	int(128, 255).
+	integer(128, 255).
 
 qdtext() ->
 	frequency([
@@ -200,7 +200,7 @@ parameter() ->
 
 weight() ->
 	frequency([
-		{90, int(0, 1000)},
+		{90, integer(0, 1000)},
 		{10, undefined}
 	]).
 
@@ -1759,7 +1759,7 @@ etag(<< C, R/bits >>, Strength, Tag) when ?IS_ETAGC(C) ->
 
 -ifdef(TEST).
 etagc() ->
-	?SUCHTHAT(C, int(16#21, 16#ff), C =/= 16#22 andalso C =/= 16#7f).
+	?SUCHTHAT(C, integer(16#21, 16#ff), C =/= 16#22 andalso C =/= 16#7f).
 
 etag() ->
 	?LET({Strength, Tag},
@@ -1920,7 +1920,7 @@ host() -> vector(1, 255, elements(host_chars())).
 
 host_port() ->
 	?LET({Host, Port},
-		{host(), oneof([undefined, int(1, 65535)])},
+		{host(), oneof([undefined, integer(1, 65535)])},
 		begin
 			HostBin = list_to_binary(Host),
 			{{?LOWER(HostBin), Port},
@@ -2242,7 +2242,7 @@ scheme() -> oneof([<<"http">>, <<"https">>]).
 
 scheme_host_port() ->
 	?LET({Scheme, Host, Port},
-		{scheme(), host(), int(1, 65535)},
+		{scheme(), host(), integer(1, 65535)},
 		begin
 			HostBin = list_to_binary(Host),
 			{[{Scheme, ?LOWER(HostBin), Port}],
@@ -2693,7 +2693,7 @@ parse_sec_websocket_version_req(SecWebSocketVersion) when byte_size(SecWebSocket
 -ifdef(TEST).
 prop_parse_sec_websocket_version_req() ->
 	?FORALL(Version,
-		int(0, 255),
+		integer(0, 255),
 		Version =:= parse_sec_websocket_version_req(integer_to_binary(Version))).
 
 parse_sec_websocket_version_req_test_() ->
@@ -2744,7 +2744,7 @@ ws_version_list_sep(<< $,, R/bits >>, Acc) -> ws_version_list(R, Acc).
 -ifdef(TEST).
 sec_websocket_version_resp() ->
 	?LET(L,
-		non_empty(list({ows(), ows(), int(0, 255)})),
+		non_empty(list({ows(), ows(), integer(0, 255)})),
 		begin
 			<< _, SecWebSocketVersion/binary >> = iolist_to_binary(
 				[[OWS1, $,, OWS2, integer_to_binary(V)] || {OWS1, OWS2, V} <- L]),
@@ -2834,7 +2834,7 @@ te() ->
 			L2 = case Trail of
 				no_trailers -> L;
 				trailers ->
-					Rand = random:uniform(length(L) + 1) - 1,
+					Rand = rand:uniform(length(L) + 1) - 1,
 					{Before, After} = lists:split(Rand, L),
 					Before ++ [{<<"trailers">>, undefined}|After]
 			end,
@@ -2847,7 +2847,6 @@ te() ->
 	).
 
 prop_parse_te() ->
-	random:seed(os:timestamp()),
 	?FORALL({Trail, L, TE},
 		te(),
 		begin
-- 
cgit v1.2.3