@@ -130,13 +130,8 @@ valkey_module! {
130130#[ cfg( test) ]
131131mod tests {
132132 use super :: * ;
133- use std:: ptr:: null_mut;
134133 use valkey_module:: { MockContext , RedisModuleClientInfo } ;
135134
136- fn null_valkey_string ( ) -> ValkeyString {
137- ValkeyString :: from_redis_module_string ( null_mut ( ) , null_mut ( ) )
138- }
139-
140135 fn module_client_info ( id : u64 ) -> RedisModuleClientInfo {
141136 RedisModuleClientInfo {
142137 version : 1 ,
@@ -189,7 +184,8 @@ mod tests {
189184 #[ test]
190185 fn test_set_client_name_wrong_arity ( ) {
191186 let ctx = MockContext :: new ( ) ;
192- let err = set_client_name ( & ctx, vec ! [ null_valkey_string( ) ] ) . unwrap_err ( ) ;
187+ let err = set_client_name ( & ctx, vec ! [ ValkeyString :: create_for_test( "client.set_name" ) ] )
188+ . unwrap_err ( ) ;
193189 assert ! ( matches!( err, ValkeyError :: WrongArity ) ) ;
194190 }
195191
@@ -199,13 +195,25 @@ mod tests {
199195 ctx. expect_log_notice ( ) . times ( 1 ) . return_const ( ( ) ) ;
200196 ctx. expect_set_client_name_by_id ( )
201197 . times ( 1 )
202- . returning ( |_, _| Status :: Ok ) ;
198+ . returning ( |_, client_name| {
199+ assert_eq ! ( client_name. try_as_str( ) . unwrap( ) , "my-client" ) ;
200+ Status :: Ok
201+ } ) ;
203202 ctx. expect_set_client_name ( )
204203 . times ( 1 )
205- . returning ( |_| Status :: Ok ) ;
204+ . returning ( |client_name| {
205+ assert_eq ! ( client_name. try_as_str( ) . unwrap( ) , "my-client" ) ;
206+ Status :: Ok
207+ } ) ;
206208
207- let reply =
208- set_client_name ( & ctx, vec ! [ null_valkey_string( ) , null_valkey_string( ) ] ) . unwrap ( ) ;
209+ let reply = set_client_name (
210+ & ctx,
211+ vec ! [
212+ ValkeyString :: create_for_test( "client.set_name" ) ,
213+ ValkeyString :: create_for_test( "my-client" ) ,
214+ ] ,
215+ )
216+ . unwrap ( ) ;
209217 assert_eq ! ( reply, ValkeyValue :: Integer ( Status :: Ok as i64 ) ) ;
210218 }
211219
@@ -252,7 +260,7 @@ mod tests {
252260 #[ test]
253261 fn test_deauth_client_by_id_wrong_arity ( ) {
254262 let ctx = MockContext :: new ( ) ;
255- let err = deauth_client_by_id ( & ctx, vec ! [ null_valkey_string ( ) ] ) . unwrap_err ( ) ;
263+ let err = deauth_client_by_id ( & ctx, vec ! [ ValkeyString :: create_for_test ( "" ) ] ) . unwrap_err ( ) ;
256264 assert ! ( matches!( err, ValkeyError :: WrongArity ) ) ;
257265 }
258266
@@ -265,7 +273,7 @@ mod tests {
265273 #[ test]
266274 fn test_config_get_wrong_arity ( ) {
267275 let ctx = MockContext :: new ( ) ;
268- let err = config_get ( & ctx, vec ! [ null_valkey_string ( ) ] ) . unwrap_err ( ) ;
276+ let err = config_get ( & ctx, vec ! [ ValkeyString :: create_for_test ( "" ) ] ) . unwrap_err ( ) ;
269277 assert ! ( matches!( err, ValkeyError :: WrongArity ) ) ;
270278 }
271279
0 commit comments