Browse Source

test(emqx_license): no need to meck public key for tests

Zaiming (Stone) Shi 4 years atrás
parent
commit
0f09e7bbd2

+ 1 - 8
lib-ee/emqx_license/src/emqx_license_parser.erl

@@ -40,11 +40,6 @@
          max_connections/1
         ]).
 
--ifdef(TEST).
--export([public_key/0
-        ]).
--endif.
-
 %%--------------------------------------------------------------------
 %% Behaviour
 %%--------------------------------------------------------------------
@@ -67,7 +62,7 @@
 
 -spec parse(string() | binary()) -> {ok, license()} | {error, term()}.
 parse(Content) ->
-    DecodedKey = base64:decode(public_key()),
+    DecodedKey = base64:decode(?PUBKEY),
     parse(Content, DecodedKey).
 
 parse(Content, Key) ->
@@ -110,5 +105,3 @@ do_parse(Content, Key, [Module | Modules], Errors) ->
         _Class : Error ->
             do_parse(Content, Key, Modules, [{Module, Error} | Errors])
     end.
-
-public_key() -> ?PUBKEY.

+ 0 - 3
lib-ee/emqx_license/test/emqx_license_SUITE.erl

@@ -27,13 +27,10 @@ end_per_suite(_) ->
 
 init_per_testcase(Case, Config) ->
     {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
-    meck:new(emqx_license_parser, [passthrough]),
-    meck:expect(emqx_license_parser, public_key, fun public_key/0),
     set_invalid_license_file(Case),
     Config.
 
 end_per_testcase(Case, _Config) ->
-    meck:unload(emqx_license_parser),
     restore_valid_license_file(Case),
     ok.
 

+ 0 - 11
lib-ee/emqx_license/test/emqx_license_cli_SUITE.erl

@@ -25,12 +25,9 @@ end_per_suite(_) ->
 
 init_per_testcase(_Case, Config) ->
     {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
-    meck:new(emqx_license_parser, [passthrough]),
-    meck:expect(emqx_license_parser, public_key, fun public_key/0),
     Config.
 
 end_per_testcase(_Case, _Config) ->
-    meck:unload(emqx_license_parser),
     ok.
 
 set_special_configs(emqx_license) ->
@@ -62,11 +59,3 @@ t_update(_Config) ->
     _ = emqx_license_cli:license(["reload"]),
     _ = emqx_license_cli:license(["update", "Invalid License Value"]).
 
-%%------------------------------------------------------------------------------
-%% Helpers
-%%------------------------------------------------------------------------------
-
-public_key() -> <<"MEgCQQChzN6lCUdt4sYPQmWBYA3b8Zk87Jfk+1A1zcTd+lCU0Tf
-                  vXhSHgEWz18No4lL2v1n+70CoYpc2fzfhNJitgnV9AgMBAAE=">>.
-
-digest() -> <<"3jHg0zCb4NL5v8eIoKn+CNDMq8A04mXEOefqlUBSSVs=">>.

+ 1 - 2
lib-ee/emqx_license/test/emqx_license_test_lib.erl

@@ -33,8 +33,7 @@ test_key(Filename) ->
     Path = filename:join([Dir, "data", Filename]),
     {ok, KeyData} = file:read_file(Path),
     [PemEntry] = public_key:pem_decode(KeyData),
-    Key = public_key:pem_entry_decode(PemEntry),
-    Key.
+    public_key:pem_entry_decode(PemEntry).
 
 make_license(Values) ->
     Key = private_key(),