@@ -43,93 +43,82 @@ defmodule RabbitMQ.MessageDeduplicationPlugin.Cache.Test do
4343 % { cache: cache , cache_ttl: cache_ttl , cache_simple: cache_simple }
4444 end
4545
46- test "basic insertion and lookup " ,
46+ test "basic insertion" ,
4747 % { cache: cache , cache_ttl: _ , cache_simple: _ } do
48- assert MessageCache . member? ( cache , "foo" ) == false
49-
50- MessageCache . put ( cache , "foo" )
51- assert MessageCache . member? ( cache , "foo" ) == true
48+ :ok = MessageCache . insert ( cache , "foo" )
49+ { :error , :already_exists } = MessageCache . insert ( cache , "foo" )
5250 end
5351
5452 test "TTL at insertion" ,
5553 % { cache: cache , cache_ttl: _ , cache_simple: _ } do
56- assert MessageCache . member? ( cache , "foo" ) == false
57-
58- MessageCache . put ( cache , "foo" , Timer . seconds ( 1 ) )
59- assert MessageCache . member? ( cache , "foo" ) == true
54+ :ok = MessageCache . insert ( cache , "foo" , Timer . seconds ( 1 ) )
55+ { :error , :already_exists } = MessageCache . insert ( cache , "foo" )
6056
6157 1 |> Timer . seconds ( ) |> Timer . sleep ( )
6258
63- assert MessageCache . member? ( cache , "foo" ) == false
59+ :ok = MessageCache . insert ( cache , "foo" )
6460 end
6561
6662 test "TTL at table creation" ,
6763 % { cache: _ , cache_ttl: cache , cache_simple: _ } do
68- assert MessageCache . member? ( cache , "foo" ) == false
69-
70- MessageCache . put ( cache , "foo" )
71- assert MessageCache . member? ( cache , "foo" ) == true
64+ :ok = MessageCache . insert ( cache , "foo" )
65+ { :error , :already_exists } = MessageCache . insert ( cache , "foo" )
7266
7367 1 |> Timer . seconds ( ) |> Timer . sleep ( )
7468
75- assert MessageCache . member? ( cache , "foo" ) == false
69+ :ok = MessageCache . insert ( cache , "foo" )
7670 end
7771
7872 test "entries are deleted after TTL" ,
7973 % { cache: cache , cache_ttl: _ , cache_simple: _ } do
80- assert MessageCache . member? ( cache , "foo" ) == false
81-
82- MessageCache . put ( cache , "foo" , Timer . seconds ( 1 ) )
83- assert MessageCache . member? ( cache , "foo" ) == true
74+ :ok = MessageCache . insert ( cache , "foo" , Timer . seconds ( 1 ) )
75+ { :error , :already_exists } = MessageCache . insert ( cache , "foo" )
8476
8577 Timer . sleep ( 3200 )
8678
87- assert Mnesia . transaction ( fn -> Mnesia . all_keys ( cache ) end ) == { :atomic , [ ] }
79+ { :atomic , [ ] } = Mnesia . transaction ( fn -> Mnesia . all_keys ( cache ) end )
8880 end
8981
9082 test "entries are deleted if cache is full" ,
9183 % { cache: cache , cache_ttl: _ , cache_simple: _ } do
92- assert MessageCache . member? ( cache , "foo" ) == false
93- assert MessageCache . member? ( cache , "bar" ) == false
94-
95- MessageCache . put ( cache , "foo" )
96- assert MessageCache . member? ( cache , "foo" ) == true
97- MessageCache . put ( cache , "bar" )
98- assert MessageCache . member? ( cache , "bar" ) == true
84+ :ok = MessageCache . insert ( cache , "foo" )
85+ { :error , :already_exists } = MessageCache . insert ( cache , "foo" )
86+ :ok = MessageCache . insert ( cache , "bar" )
87+ { :error , :already_exists } = MessageCache . insert ( cache , "bar" )
9988
100- assert MessageCache . member? ( cache , "foo" ) == false
89+ :ok = MessageCache . insert ( cache , "foo" )
10190 end
10291
10392 test "cache entry deletion" , % { cache: cache , cache_ttl: _ , cache_simple: _ } do
104- MessageCache . put ( cache , "foo" )
105- assert MessageCache . member? ( cache , "foo" ) == true
93+ :ok = MessageCache . insert ( cache , "foo" )
94+ { :error , :already_exists } = MessageCache . insert ( cache , "foo" )
10695
10796 MessageCache . delete ( cache , "foo" )
10897
109- assert MessageCache . member? ( cache , "foo" ) == false
98+ :ok = MessageCache . insert ( cache , "foo" )
11099 end
111100
112101 test "cache information" ,
113102 % { cache: cache , cache_ttl: _ , cache_simple: _ } do
114- MessageCache . put ( cache , "foo" )
103+ :ok = MessageCache . insert ( cache , "foo" )
115104
116105 [ size: 1 , bytes: _ , entries: 1 ] = MessageCache . info ( cache )
117106 end
118107
119108 test "simple cache information" ,
120109 % { cache: _ , cache_ttl: _ , cache_simple: cache_simple } do
121- MessageCache . put ( cache_simple , "foo" )
110+ :ok = MessageCache . insert ( cache_simple , "foo" )
122111
123112 [ bytes: _ , entries: 1 ] = MessageCache . info ( cache_simple )
124113 end
125114
126115 test "flush the cache" , % { cache: cache , cache_ttl: _ , cache_simple: _ } do
127- MessageCache . put ( cache , "foo" )
128- assert MessageCache . member? ( cache , "foo" ) == true
116+ :ok = MessageCache . insert ( cache , "foo" )
117+ { :error , :already_exists } = MessageCache . insert ( cache , "foo" )
129118
130119 :ok = MessageCache . flush ( cache )
131120
132- assert MessageCache . member? ( cache , "foo" ) == false
121+ :ok = MessageCache . insert ( cache , "foo" )
133122 end
134123
135124 test "drop the cache" , % { cache: cache , cache_ttl: _ , cache_simple: _ } do
0 commit comments