Bad code.

This commit is contained in:
Kallfaktorn 2011-02-22 16:44:39 +01:00
parent 059948d7c3
commit 3751ba8c95
3 changed files with 28 additions and 26 deletions

View file

@ -5,15 +5,15 @@
%%% @end %%% @end
-module(ggs_db). -module(ggs_db).
-import(mnesia).
-export([init/0,stop/0,setItem/4,getItem/3,removeItem/3,key/3,clear/2,clear/1,length/2]). -export([init/0,stop/0,setItem/4,getItem/3,removeItem/3,key/3,clear/2,clear/1,length/2]).
-include("ggs_db.hrl"). %-include("ggs_db.hrl").
-record(data, {key, value}).
%%----------------------------------------------------- %%-----------------------------------------------------
%% Creation %% Creation
%%----------------------------------------------------- %%-----------------------------------------------------
init() -> init() ->
mnesia:create_schema([node()]), % mnesia:create_schema([node()]),
mnesia:start(), mnesia:start(),
mnesia:create_table(data, [{attributes, record_info(fields, data)}]). mnesia:create_table(data, [{attributes, record_info(fields, data)}]).
@ -68,7 +68,8 @@ getItem(GameToken,Ns,Key) ->
[Data] = mnesia:read(data, {GameToken,Ns,Key}), [Data] = mnesia:read(data, {GameToken,Ns,Key}),
Data#data.value Data#data.value
end, end,
mnesia:transaction(Fun). {atomic, Ret} = mnesia:transaction(Fun),
Ret.
length(GameToken,Ns) -> length(GameToken,Ns) ->
Fun = fun() -> Fun = fun() ->

View file

@ -1,6 +1,5 @@
%% gamedb.hrl %% gamedb.hrl
-record(player, {id, name}).
-record(data, {key, value}). -record(data, {key, value}).

View file

@ -10,33 +10,35 @@
%Key should be a tuple of two elements %Key should be a tuple of two elements
getItem_setItem_test() -> getItem_setItem_test() ->
mnesia:start(),
ggs_db:init(), ggs_db:init(),
ggs_db:setItem("dbname","nsname","keyname","Hello"), ggs_db:setItem("dbname","nsname","keyname1","Hello"),
?assertMatch({atomic,"Hello"},ggs_db:getItem("dbname","nsname","keyname")). ggs_db:setItem("dbname","nsname","keyname2","Hello"),
ggs_db:setItem("dbname","nsname","keyname3","Hello"),
%system:wait(2000),
ggs_db:getItem("dbname","nsname","keyname").
length_test() -> %length_test() ->
ggs_db:setItem(1,1,2,"112"), % ggs_db:setItem(1,1,2,"112"),
ggs_db:setItem(1,2,2,"122"), % ggs_db:setItem(1,2,2,"122"),
ggs_db:setItem(1,1,3,"113"), % ggs_db:setItem(1,1,3,"113"),
ggs_db:setItem(1,1,4,"114"), % ggs_db:setItem(1,1,4,"114"),
?assertEqual(ggs_db:length(1,1), 3). % ?assertEqual(ggs_db:length(1,1), 3).
removeItem_test() -> %removeItem_test() ->
ggs_db:removeItem(1,1,4), % ggs_db:removeItem(1,1,4),
?assertNot(ggs_db:getItem(1,1,4) =:= {atomic,"114"}). % ?assertNot(ggs_db:getItem(1,1,4) =:= {atomic,"114"}).
key_test() -> %key_test() ->
?assert(ggs_db:key(1,1,2) =:= {1,1,3}). % ?assert(ggs_db:key(1,1,2) =:= {1,1,3}).
clear_test() -> %clear_test() ->
ggs_db:clear(1,1), % ggs_db:clear(1,1),
?assert(ggs_db:length(1,1) =:= 0). % ?assert(ggs_db:length(1,1) =:= 0).
clear_GameToken_test() -> %clear_GameToken_test() ->
ggs_db:clear(1), % ggs_db:clear(1),
?assert((ggs_db:length(1,1) + ggs_db:length(1,2)) =:= 0), % ?assert((ggs_db:length(1,1) + ggs_db:length(1,2)) =:= 0),
mnesia:stop(). % ggs_db:stop().
%tests() -> %tests() ->
% ggs_db_test(). % ggs_db_test().