From 16b441f0e32c1f528f9240aae55ef32ce8892bac Mon Sep 17 00:00:00 2001 From: Eric Merritt Date: Mon, 14 Oct 2013 14:10:25 -0700 Subject: [PATCH] fix up tests to reflect the actual NOTEST variable DEV_ONLY --- src/ec_cmd_log.erl | 2 +- src/ec_cnv.erl | 6 +++--- src/ec_date.erl | 11 ++++++----- src/ec_file.erl | 2 +- src/ec_gb_trees.erl | 2 +- src/ec_lists.erl | 2 +- src/ec_semver.erl | 2 +- src/ec_talk.erl | 7 +++++-- test/ec_plists_tests.erl | 4 ++++ test/mock.erl | 10 ---------- 10 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 test/mock.erl diff --git a/src/ec_cmd_log.erl b/src/ec_cmd_log.erl index 0be4143..4038eee 100644 --- a/src/ec_cmd_log.erl +++ b/src/ec_cmd_log.erl @@ -227,7 +227,7 @@ colorize_(Color, Bold, Msg) when is_integer(Color), is_integer(Bold)-> %%% Test Functions %%%=================================================================== --ifndef(NOTEST). +-ifdef(DEV_ONLY). -include_lib("eunit/include/eunit.hrl"). should_test() -> diff --git a/src/ec_cnv.erl b/src/ec_cnv.erl index a063e2a..80b05e7 100644 --- a/src/ec_cnv.erl +++ b/src/ec_cnv.erl @@ -33,7 +33,7 @@ is_true/1, is_false/1]). --ifndef(NOTEST). +-ifdef(DEV_ONLY). -include_lib("proper/include/proper.hrl"). -endif. @@ -218,10 +218,10 @@ to_atom(X) -> to_atom(to_list(X)). %%%=================================================================== -%%% API +%%% Tests %%%=================================================================== --ifndef(NOTEST). +-ifdef(DEV_ONLY). -include_lib("eunit/include/eunit.hrl"). force_proper_test_() -> diff --git a/src/ec_date.erl b/src/ec_date.erl index 6408756..73eb15d 100644 --- a/src/ec_date.erl +++ b/src/ec_date.erl @@ -671,14 +671,14 @@ pad2(X) when is_float(X) -> ltoi(X) -> list_to_integer(X). -%% -%% TEST FUNCTIONS -%% -%% c(dh_date,[{d,'TEST'}]). -%%-define(NOTEST, 1). +%%%=================================================================== +%%% Tests +%%%=================================================================== +-ifdef(DEV_ONLY). -include_lib("eunit/include/eunit.hrl"). + -define(DATE, {{2001,3,10},{17,16,17}}). -define(DATEMS, {{2001,3,10},{17,16,17,123456}}). -define(DATE_NOON, {{2001,3,10},{12,0,0}}). @@ -938,3 +938,4 @@ zulu_test_() -> ?_assertEqual(format("Y-m-d\\TH:i:s",nparse("2001-03-10T15:16:17-04:00")), "2001-03-10T19:16:17") ]. +-endif. diff --git a/src/ec_file.erl b/src/ec_file.erl index 92430cd..499a406 100644 --- a/src/ec_file.erl +++ b/src/ec_file.erl @@ -298,7 +298,7 @@ sub_files(From) -> %%% Test Functions %%%=================================================================== --ifndef(NOTEST). +-ifdef(DEV_ONLY). -include_lib("eunit/include/eunit.hrl"). setup_test() -> diff --git a/src/ec_gb_trees.erl b/src/ec_gb_trees.erl index 811cd1b..50d9701 100644 --- a/src/ec_gb_trees.erl +++ b/src/ec_gb_trees.erl @@ -154,7 +154,7 @@ keys(Data) -> %%%=================================================================== --ifndef(NOTEST). +-ifdef(DEV_ONLY). -include_lib("eunit/include/eunit.hrl"). %% For me unit testing initially is about covering the obvious case. A diff --git a/src/ec_lists.erl b/src/ec_lists.erl index 689813e..fd8fa5f 100644 --- a/src/ec_lists.erl +++ b/src/ec_lists.erl @@ -68,7 +68,7 @@ fetch(Fun, List) when is_list(List), is_function(Fun) -> %%% Test Functions %%%=================================================================== --ifndef(NOTEST). +-ifdef(DEV_ONLY). -include_lib("eunit/include/eunit.hrl"). find1_test() -> diff --git a/src/ec_semver.erl b/src/ec_semver.erl index bf4e157..23ba311 100644 --- a/src/ec_semver.erl +++ b/src/ec_semver.erl @@ -314,7 +314,7 @@ internal_pes(Vsn, LVsn) -> %%% Test Functions %%%=================================================================== --ifndef(NOTEST). +-ifdef(DEV_ONLY). -include_lib("eunit/include/eunit.hrl"). eql_test() -> diff --git a/src/ec_talk.erl b/src/ec_talk.erl index 936f9ed..243f7b4 100644 --- a/src/ec_talk.erl +++ b/src/ec_talk.erl @@ -43,8 +43,6 @@ type/0, supported/0]). --include_lib("eunit/include/eunit.hrl"). - %%============================================================================ %% Types %%============================================================================ @@ -202,6 +200,9 @@ get_string(String) -> %%%==================================================================== %%% tests %%%==================================================================== +-ifdef(DEV_ONLY). +-include_lib("eunit/include/eunit.hrl"). + general_test_() -> [?_test(42 == get_integer("42")), ?_test(500211 == get_integer("500211")), @@ -216,3 +217,5 @@ general_test_() -> ?_test(false == get_boolean("False")), ?_test(false == get_boolean("No")), ?_test(false == get_boolean("no"))]. + +-endif. diff --git a/test/ec_plists_tests.erl b/test/ec_plists_tests.erl index 7acefe6..ff5d2e9 100644 --- a/test/ec_plists_tests.erl +++ b/test/ec_plists_tests.erl @@ -1,6 +1,8 @@ %%% @copyright Erlware, LLC. -module(ec_plists_tests). +-ifdef(DEV_ONLY). + -include_lib("eunit/include/eunit.hrl"). %%%=================================================================== @@ -73,3 +75,5 @@ ftmap_bad_test() -> lists:seq(1, 5)), ?assertMatch([{value, 1}, {error,{throw,test_exception}}, {value, 3}, {value, 4}, {value, 5}] , Results). + +-endif. diff --git a/test/mock.erl b/test/mock.erl deleted file mode 100644 index ad7c6bd..0000000 --- a/test/mock.erl +++ /dev/null @@ -1,10 +0,0 @@ --module(mock). - --export([new_dictionary/0]). - -new_dictionary() -> - meck:new(ec_dictionary_proper), - meck:expect(ec_dictionary_proper, dictionary, fun() -> - proper_types:union([ec_dict]) - end). -