@@ -133,10 +133,6 @@ mod tests {
133133 use std:: ptr:: null_mut;
134134 use valkey_module:: { MockContext , RedisModuleClientInfo } ;
135135
136- fn null_valkey_string ( ) -> ValkeyString {
137- ValkeyString :: from_redis_module_string ( null_mut ( ) , null_mut ( ) )
138- }
139-
140136 fn module_client_info ( id : u64 ) -> RedisModuleClientInfo {
141137 RedisModuleClientInfo {
142138 version : 1 ,
@@ -189,7 +185,8 @@ mod tests {
189185 #[ test]
190186 fn test_set_client_name_wrong_arity ( ) {
191187 let ctx = MockContext :: new ( ) ;
192- let err = set_client_name ( & ctx, vec ! [ null_valkey_string( ) ] ) . unwrap_err ( ) ;
188+ let err = set_client_name ( & ctx, vec ! [ ValkeyString :: create_for_test( "client.set_name" ) ] )
189+ . unwrap_err ( ) ;
193190 assert ! ( matches!( err, ValkeyError :: WrongArity ) ) ;
194191 }
195192
@@ -199,13 +196,25 @@ mod tests {
199196 ctx. expect_log_notice ( ) . times ( 1 ) . return_const ( ( ) ) ;
200197 ctx. expect_set_client_name_by_id ( )
201198 . times ( 1 )
202- . returning ( |_, _| Status :: Ok ) ;
199+ . returning ( |_, client_name| {
200+ assert_eq ! ( client_name. try_as_str( ) . unwrap( ) , "my-client" ) ;
201+ Status :: Ok
202+ } ) ;
203203 ctx. expect_set_client_name ( )
204204 . times ( 1 )
205- . returning ( |_| Status :: Ok ) ;
205+ . returning ( |client_name| {
206+ assert_eq ! ( client_name. try_as_str( ) . unwrap( ) , "my-client" ) ;
207+ Status :: Ok
208+ } ) ;
206209
207- let reply =
208- set_client_name ( & ctx, vec ! [ null_valkey_string( ) , null_valkey_string( ) ] ) . unwrap ( ) ;
210+ let reply = set_client_name (
211+ & ctx,
212+ vec ! [
213+ ValkeyString :: create_for_test( "client.set_name" ) ,
214+ ValkeyString :: create_for_test( "my-client" ) ,
215+ ] ,
216+ )
217+ . unwrap ( ) ;
209218 assert_eq ! ( reply, ValkeyValue :: Integer ( Status :: Ok as i64 ) ) ;
210219 }
211220
@@ -252,7 +261,7 @@ mod tests {
252261 #[ test]
253262 fn test_deauth_client_by_id_wrong_arity ( ) {
254263 let ctx = MockContext :: new ( ) ;
255- let err = deauth_client_by_id ( & ctx, vec ! [ null_valkey_string ( ) ] ) . unwrap_err ( ) ;
264+ let err = deauth_client_by_id ( & ctx, vec ! [ ValkeyString :: create_for_test ( "" ) ] ) . unwrap_err ( ) ;
256265 assert ! ( matches!( err, ValkeyError :: WrongArity ) ) ;
257266 }
258267
@@ -265,7 +274,7 @@ mod tests {
265274 #[ test]
266275 fn test_config_get_wrong_arity ( ) {
267276 let ctx = MockContext :: new ( ) ;
268- let err = config_get ( & ctx, vec ! [ null_valkey_string ( ) ] ) . unwrap_err ( ) ;
277+ let err = config_get ( & ctx, vec ! [ ValkeyString :: create_for_test ( "" ) ] ) . unwrap_err ( ) ;
269278 assert ! ( matches!( err, ValkeyError :: WrongArity ) ) ;
270279 }
271280
0 commit comments