Test epocxy_ets_fsm:change_owner/2

Author: jaynel

src/epocxy_ets_fsm.erl

@@ -53,11 +53,11 @@
 -type ets_concurrency() :: none | read_only | write_only | read_and_write.
 -export_type([ets_concurrency/0]).
 
--spec start_link() -> {ok, pid()}.
--spec create_ets_table(ets_concurrency()) -> ets:tid().
--spec create_ets_table(atom(), ets_concurrency()) -> ets:tid().
--spec delete_ets_table(atom() | ets:tid()) -> ok.
--spec change_owner(atom() | ets:tid(), pid()) -> ok.
+-spec start_link       ()                          -> {ok, pid()}.
+-spec create_ets_table (ets_concurrency())         -> ets:tid().
+-spec create_ets_table (atom(), ets_concurrency()) -> ets:tid().
+-spec delete_ets_table (atom() | ets:tid())        -> ok.
+-spec change_owner     (atom() | ets:tid(), pid()) -> ok.
 
 start_link() ->
     gen_fsm:start_link({local, ?SERVER}, ?MODULE, {}, []).
@@ -76,7 +76,8 @@ delete_ets_table(Table_Id_Or_Name) ->
     ok.
 
 change_owner(Table_Id_Or_Name, New_Owner) ->
-    gen_fsm:sync_send_event(?SERVER, {change_owner, Table_Id_Or_Name, New_Owner}).
+    true = gen_fsm:sync_send_event(?SERVER, {change_owner, Table_Id_Or_Name, New_Owner}),
+    ok.
 
 make_options(none)           -> make_base_options([]);
 make_options(read_only)      -> make_base_options([{read_concurrency,  true}]);
@@ -92,13 +93,14 @@ make_base_options(Concurrency_Options) ->
 %%% gen_fsm callbacks
 %%%===================================================================
 
--type internal_state() :: #eef_state{}.
--type state_name()     :: 'READY'.
--type create_ets_cmd() :: {create_ets_table, proplists:proplist()}
-                        | {create_ets_table, Name::atom(), proplists:proplist()}.
--type delete_ets_cmd() :: {delete_ets_table, ets:tid() | atom()}.
--type stop_cmd()       :: stop.
-%% -type ready_cmds()     :: create_ets_cmd() | delete_ets_cmd() | stop_cmd().
+-type internal_state()   :: #eef_state{}.
+-type state_name()       :: 'READY'.
+-type create_ets_cmd()   :: {create_ets_table, proplists:proplist()}
+                          | {create_ets_table, Name::atom(), proplists:proplist()}.
+-type delete_ets_cmd()   :: {delete_ets_table, ets:tid() | atom()}.
+-type change_owner_cmd() :: {change_owner,     ets:tid() | atom(), pid()}.
+-type stop_cmd()         :: stop.
+%% -type ready_cmds()     :: create_ets_cmd() | delete_ets_cmd() | change_owner_cmd() | stop_cmd().
 
 -spec init({}) -> {ok, 'READY', internal_state()}.
 -spec terminate   (any(), state_name(), internal_state())        -> ok.
@@ -112,9 +114,10 @@ code_change (_OldVsn,  State_Name, #eef_state{} = State, _Extra) -> {ok, State_N
 
 %% The FSM has only the 'READY' state.
 -type from() :: {pid(), reference()}.
--spec 'READY'(create_ets_cmd(), from(), internal_state()) -> ets:tid();
-             (delete_ets_cmd(), from(), internal_state()) -> true;
-             (stop_cmd(),       from(), internal_state()) -> {stop, normal}.
+-spec 'READY'(create_ets_cmd(),   from(), internal_state()) -> ets:tid();
+             (delete_ets_cmd(),   from(), internal_state()) -> true;
+             (change_owner_cmd(), from(), internal_state()) -> true;
+             (stop_cmd(),         from(), internal_state()) -> {stop, normal}.
 
 -define(READY(__Cmd), 'READY'(__Cmd, _From, #eef_state{} = State)).
 -define(REPLY(__Reply), {reply, __Reply, 'READY', State}).

test/epocxy/epocxy_ets_fsm_SUITE.erl

@@ -14,14 +14,18 @@
 -auth('jay@duomark.com').
 -vsn('').
 
--export([all/0, init_per_suite/1, end_per_suite/1]).
--export([check_create/1]).
+-export([
+         all/0,
+         init_per_suite/1, end_per_suite/1
+        ]).
+
+-export([check_create/1, check_owner/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
 -spec all() -> [atom()].
 
-all() -> [check_create].
+all() -> [check_create, check_owner].
 
 -type config() :: proplists:proplist().
 -spec init_per_suite (config()) -> config().
@@ -33,15 +37,15 @@ end_per_suite  (Config)  -> Config.
 %% Test Module is ?TM
 -define(TM, epocxy_ets_fsm).
 
+
 %%%------------------------------------------------------------------------------
 %%% Unit tests for cxy_cache core
 %%%------------------------------------------------------------------------------
 
-
-%% Validate any atom can be used as a cache_name and info/1 will report properly.
+%% Validate ets tables are created with the proper attributes, and can be deleted.
 -spec check_create(config()) -> ok.
 check_create(_Config) ->
-    epocxy_sup:start_link(),
+    {ok, Sup_Pid} = epocxy_sup:start_link(),
 
     ct:log("Create and delete unnamed ets tables"),
     Fsm_Pid = whereis(?TM),
@@ -55,14 +59,9 @@ check_create(_Config) ->
                                              {t3, write_only}, {t4, read_and_write}]],
 
     ct:comment("Successfully tested creating and deleting ets tables"),
-    cleanup(whereis(epocxy_sup), Fsm_Pid),
+    cleanup(Sup_Pid, Fsm_Pid),
     ok.
 
-cleanup(Pid, Fsm_Pid) ->
-    supervisor:terminate_child(Pid, Fsm_Pid),
-    unlink(Pid),
-    exit(Pid, kill).
-
 validate_create_table(Fsm_Pid, Cxy_Type, Named) ->
     Tid = case Named of
               no_name -> ?TM:create_ets_table(Cxy_Type);
@@ -76,3 +75,22 @@ validate_create_table(Fsm_Pid, Cxy_Type, Named) ->
     end,
     ok = ?TM:delete_ets_table(Tid),
     ok.
+
+%% Validate the owner of an ets table can be changed.
+check_owner(_Config) ->
+    {ok, Sup_Pid} = epocxy_sup:start_link(),
+    Fsm_Pid       = whereis(?TM),
+
+    T1            = ?TM:create_ets_table(write_only),
+    Fsm_Pid       = ets:info(T1, owner),
+    Self          = self(),
+    ok            = ?TM:change_owner(T1, Self),
+    Self          = ets:info(T1, owner),
+
+    cleanup(Sup_Pid, Fsm_Pid),
+    ok.
+
+cleanup(Pid, Fsm_Pid) ->
+    supervisor:terminate_child(Pid, Fsm_Pid),
+    unlink(Pid),
+    exit(Pid, kill).