@@ -21,9 +21,7 @@ mod dynamic_storage {
21
21
use iceoryx2_bb_testing:: { assert_that, test_requires} ;
22
22
use iceoryx2_cal:: dynamic_storage:: * ;
23
23
use iceoryx2_cal:: named_concept:: * ;
24
- use std:: process:: Termination ;
25
24
use std:: sync:: atomic:: { AtomicI64 , Ordering } ;
26
- use std:: sync:: Barrier ;
27
25
28
26
fn generate_name ( ) -> FileName {
29
27
let mut file = FileName :: new ( b"test_" ) . unwrap ( ) ;
@@ -55,7 +53,7 @@ mod dynamic_storage {
55
53
unsafe impl Sync for TestData { }
56
54
57
55
#[ test]
58
- fn create_and_read_works < Sut : DynamicStorage < TestData > > ( ) {
56
+ fn create_and_read_works < Sut : DynamicStorage < TestData > , WrongTypeSut : DynamicStorage < u64 > > ( ) {
59
57
let storage_name = generate_name ( ) ;
60
58
61
59
let sut = Sut :: Builder :: new ( & storage_name)
@@ -78,7 +76,7 @@ mod dynamic_storage {
78
76
}
79
77
80
78
#[ test]
81
- fn open_non_existing_fails < Sut : DynamicStorage < TestData > > ( ) {
79
+ fn open_non_existing_fails < Sut : DynamicStorage < TestData > , WrongTypeSut : DynamicStorage < u64 > > ( ) {
82
80
let storage_name = generate_name ( ) ;
83
81
let sut = Sut :: Builder :: new ( & storage_name) . open ( ) ;
84
82
@@ -87,7 +85,10 @@ mod dynamic_storage {
87
85
}
88
86
89
87
#[ test]
90
- fn when_storage_goes_out_of_scope_storage_is_removed < Sut : DynamicStorage < TestData > > ( ) {
88
+ fn when_storage_goes_out_of_scope_storage_is_removed <
89
+ Sut : DynamicStorage < TestData > ,
90
+ WrongTypeSut : DynamicStorage < u64 > ,
91
+ > ( ) {
91
92
let storage_name = generate_name ( ) ;
92
93
93
94
let sut = Sut :: Builder :: new ( & storage_name) . create ( TestData :: new ( 123 ) ) ;
@@ -100,7 +101,10 @@ mod dynamic_storage {
100
101
}
101
102
102
103
#[ test]
103
- fn cannot_create_same_storage_twice < Sut : DynamicStorage < TestData > > ( ) {
104
+ fn cannot_create_same_storage_twice <
105
+ Sut : DynamicStorage < TestData > ,
106
+ WrongTypeSut : DynamicStorage < u64 > ,
107
+ > ( ) {
104
108
let storage_name = generate_name ( ) ;
105
109
106
110
let _sut1 = Sut :: Builder :: new ( & storage_name) . create ( TestData :: new ( 123 ) ) ;
@@ -114,7 +118,10 @@ mod dynamic_storage {
114
118
}
115
119
116
120
#[ test]
117
- fn after_storage_is_opened_creator_can_be_dropped < Sut : DynamicStorage < TestData > > ( ) {
121
+ fn after_storage_is_opened_creator_can_be_dropped <
122
+ Sut : DynamicStorage < TestData > ,
123
+ WrongTypeSut : DynamicStorage < u64 > ,
124
+ > ( ) {
118
125
test_requires ! ( Sut :: does_support_persistency( ) ) ;
119
126
120
127
let storage_name = generate_name ( ) ;
@@ -144,7 +151,10 @@ mod dynamic_storage {
144
151
}
145
152
146
153
#[ test]
147
- fn create_and_multiple_openers_works < Sut : DynamicStorage < TestData > > ( ) {
154
+ fn create_and_multiple_openers_works <
155
+ Sut : DynamicStorage < TestData > ,
156
+ WrongTypeSut : DynamicStorage < u64 > ,
157
+ > ( ) {
148
158
const NUMBER_OF_OPENERS : u64 = 64 ;
149
159
let storage_name = generate_name ( ) ;
150
160
@@ -173,7 +183,7 @@ mod dynamic_storage {
173
183
}
174
184
175
185
#[ test]
176
- fn release_ownership_works < Sut : DynamicStorage < TestData > > ( ) {
186
+ fn release_ownership_works < Sut : DynamicStorage < TestData > , WrongTypeSut : DynamicStorage < u64 > > ( ) {
177
187
test_requires ! ( Sut :: does_support_persistency( ) ) ;
178
188
let storage_name = generate_name ( ) ;
179
189
@@ -198,7 +208,10 @@ mod dynamic_storage {
198
208
}
199
209
200
210
#[ test]
201
- fn create_non_owning_storage_works < Sut : DynamicStorage < TestData > > ( ) {
211
+ fn create_non_owning_storage_works <
212
+ Sut : DynamicStorage < TestData > ,
213
+ WrongTypeSut : DynamicStorage < u64 > ,
214
+ > ( ) {
202
215
test_requires ! ( Sut :: does_support_persistency( ) ) ;
203
216
let storage_name = generate_name ( ) ;
204
217
@@ -223,7 +236,7 @@ mod dynamic_storage {
223
236
}
224
237
225
238
#[ test]
226
- fn acquire_ownership_works < Sut : DynamicStorage < TestData > > ( ) {
239
+ fn acquire_ownership_works < Sut : DynamicStorage < TestData > , WrongTypeSut : DynamicStorage < u64 > > ( ) {
227
240
test_requires ! ( Sut :: does_support_persistency( ) ) ;
228
241
let storage_name = generate_name ( ) ;
229
242
@@ -240,7 +253,7 @@ mod dynamic_storage {
240
253
}
241
254
242
255
#[ test]
243
- fn does_exist_works < Sut : DynamicStorage < TestData > > ( ) {
256
+ fn does_exist_works < Sut : DynamicStorage < TestData > , WrongTypeSut : DynamicStorage < u64 > > ( ) {
244
257
let storage_name = generate_name ( ) ;
245
258
246
259
assert_that ! ( Sut :: does_exist( & storage_name) , eq Ok ( false ) ) ;
@@ -261,7 +274,7 @@ mod dynamic_storage {
261
274
}
262
275
263
276
#[ test]
264
- fn has_ownership_works < Sut : DynamicStorage < TestData > > ( ) {
277
+ fn has_ownership_works < Sut : DynamicStorage < TestData > , WrongTypeSut : DynamicStorage < u64 > > ( ) {
265
278
let storage_name = generate_name ( ) ;
266
279
267
280
let sut = Sut :: Builder :: new ( & storage_name)
@@ -281,7 +294,10 @@ mod dynamic_storage {
281
294
}
282
295
283
296
#[ test]
284
- fn create_and_initialize_works < Sut : DynamicStorage < TestData > > ( ) {
297
+ fn create_and_initialize_works <
298
+ Sut : DynamicStorage < TestData > ,
299
+ WrongTypeSut : DynamicStorage < u64 > ,
300
+ > ( ) {
285
301
let storage_name = generate_name ( ) ;
286
302
287
303
let sut = Sut :: Builder :: new ( & storage_name)
@@ -328,7 +344,10 @@ mod dynamic_storage {
328
344
}
329
345
330
346
#[ test]
331
- fn create_fails_when_initialization_fails < Sut : DynamicStorage < TestData > > ( ) {
347
+ fn create_fails_when_initialization_fails <
348
+ Sut : DynamicStorage < TestData > ,
349
+ WrongTypeSut : DynamicStorage < u64 > ,
350
+ > ( ) {
332
351
let storage_name = generate_name ( ) ;
333
352
334
353
let sut = Sut :: Builder :: new ( & storage_name)
@@ -347,7 +366,7 @@ mod dynamic_storage {
347
366
}
348
367
349
368
#[ test]
350
- fn list_storages_works < Sut : DynamicStorage < TestData > > ( ) {
369
+ fn list_storages_works < Sut : DynamicStorage < TestData > , WrongTypeSut : DynamicStorage < u64 > > ( ) {
351
370
let mut sut_names = vec ! [ ] ;
352
371
let mut suts = vec ! [ ] ;
353
372
const LIMIT : usize = 5 ;
@@ -392,7 +411,10 @@ mod dynamic_storage {
392
411
}
393
412
394
413
#[ test]
395
- fn custom_suffix_keeps_storages_separated < Sut : DynamicStorage < TestData > > ( ) {
414
+ fn custom_suffix_keeps_storages_separated <
415
+ Sut : DynamicStorage < TestData > ,
416
+ WrongTypeSut : DynamicStorage < u64 > ,
417
+ > ( ) {
396
418
let config_1 = <Sut as NamedConceptMgmt >:: Configuration :: default ( )
397
419
. suffix ( unsafe { FileName :: new_unchecked ( b".s1" ) } ) ;
398
420
let config_2 = <Sut as NamedConceptMgmt >:: Configuration :: default ( )
@@ -443,15 +465,18 @@ mod dynamic_storage {
443
465
}
444
466
445
467
#[ test]
446
- fn defaults_for_configuration_are_set_correctly < Sut : DynamicStorage < TestData > > ( ) {
468
+ fn defaults_for_configuration_are_set_correctly <
469
+ Sut : DynamicStorage < TestData > ,
470
+ WrongTypeSut : DynamicStorage < u64 > ,
471
+ > ( ) {
447
472
let config = <Sut as NamedConceptMgmt >:: Configuration :: default ( ) ;
448
473
assert_that ! ( * config. get_suffix( ) , eq Sut :: default_suffix( ) ) ;
449
474
assert_that ! ( * config. get_path_hint( ) , eq Sut :: default_path_hint( ) ) ;
450
475
assert_that ! ( * config. get_prefix( ) , eq Sut :: default_prefix( ) ) ;
451
476
}
452
477
453
478
#[ test]
454
- fn open_or_create_works < Sut : DynamicStorage < TestData > > ( ) {
479
+ fn open_or_create_works < Sut : DynamicStorage < TestData > , WrongTypeSut : DynamicStorage < u64 > > ( ) {
455
480
let sut_name = generate_name ( ) ;
456
481
457
482
assert_that ! ( Sut :: does_exist( & sut_name) , eq Ok ( false ) ) ;
@@ -468,7 +493,10 @@ mod dynamic_storage {
468
493
}
469
494
470
495
#[ test]
471
- fn when_storage_is_removed_it_calls_drop < Sut : DynamicStorage < TestData > > ( ) {
496
+ fn when_storage_is_removed_it_calls_drop <
497
+ Sut : DynamicStorage < TestData > ,
498
+ WrongTypeSut : DynamicStorage < u64 > ,
499
+ > ( ) {
472
500
let storage_name = generate_name ( ) ;
473
501
474
502
LifetimeTracker :: start_tracking ( ) ;
@@ -484,7 +512,10 @@ mod dynamic_storage {
484
512
}
485
513
486
514
#[ test]
487
- fn when_storage_is_persistent_it_does_not_call_drop < Sut : DynamicStorage < TestData > > ( ) {
515
+ fn when_storage_is_persistent_it_does_not_call_drop <
516
+ Sut : DynamicStorage < TestData > ,
517
+ WrongTypeSut : DynamicStorage < u64 > ,
518
+ > ( ) {
488
519
if Sut :: does_support_persistency ( ) {
489
520
let storage_name = generate_name ( ) ;
490
521
@@ -502,7 +533,10 @@ mod dynamic_storage {
502
533
}
503
534
504
535
#[ test]
505
- fn explicit_remove_of_persistent_storage_calls_drop < Sut : DynamicStorage < TestData > > ( ) {
536
+ fn explicit_remove_of_persistent_storage_calls_drop <
537
+ Sut : DynamicStorage < TestData > ,
538
+ WrongTypeSut : DynamicStorage < u64 > ,
539
+ > ( ) {
506
540
let storage_name = generate_name ( ) ;
507
541
508
542
LifetimeTracker :: start_tracking ( ) ;
@@ -522,6 +556,7 @@ mod dynamic_storage {
522
556
#[ test]
523
557
fn remove_storage_with_unfinished_initialization_does_not_call_drop <
524
558
Sut : DynamicStorage < TestData > + ' static ,
559
+ WrongTypeSut : DynamicStorage < u64 > ,
525
560
> ( ) {
526
561
if std:: any:: TypeId :: of :: < Sut > ( )
527
562
// skip process local test since the process locality ensures that an initializer
@@ -545,13 +580,31 @@ mod dynamic_storage {
545
580
}
546
581
547
582
#[ test]
548
- fn opening_dynamic_storage_with_wrong_type_fails < Sut : DynamicStorage < TestData > > ( ) { }
583
+ fn dynamic_storage_with_wrong_type_does_not_exist <
584
+ Sut : DynamicStorage < TestData > ,
585
+ WrongTypeSut : DynamicStorage < u64 > ,
586
+ > ( ) {
587
+ }
588
+
589
+ #[ test]
590
+ fn opening_dynamic_storage_with_wrong_type_fails <
591
+ Sut : DynamicStorage < TestData > ,
592
+ WrongTypeSut : DynamicStorage < u64 > ,
593
+ > ( ) {
594
+ }
549
595
550
- fn removing_dynamic_storage_with_wrong_type_fails < Sut : DynamicStorage < TestData > > ( ) { }
596
+ #[ test]
597
+ fn removing_dynamic_storage_with_wrong_type_fails <
598
+ Sut : DynamicStorage < TestData > ,
599
+ WrongTypeSut : DynamicStorage < u64 > ,
600
+ > ( ) {
601
+ }
551
602
552
- #[ instantiate_tests( <iceoryx2_cal:: dynamic_storage:: posix_shared_memory:: Storage <TestData >>) ]
603
+ #[ instantiate_tests( <iceoryx2_cal:: dynamic_storage:: posix_shared_memory:: Storage <TestData >,
604
+ iceoryx2_cal:: dynamic_storage:: posix_shared_memory:: Storage <u64 >>) ]
553
605
mod posix_shared_memory { }
554
606
555
- #[ instantiate_tests( <iceoryx2_cal:: dynamic_storage:: process_local:: Storage <TestData >>) ]
607
+ #[ instantiate_tests( <iceoryx2_cal:: dynamic_storage:: process_local:: Storage <TestData >,
608
+ iceoryx2_cal:: dynamic_storage:: process_local:: Storage <u64 >>) ]
556
609
mod process_local { }
557
610
}
0 commit comments