Skip to content

Commit c0530cb

Browse files
author
Vyacheslav
committed
refact: dispose collection
1 parent 7db51fa commit c0530cb

File tree

2 files changed

+14
-84
lines changed

2 files changed

+14
-84
lines changed

‎Src/TestGenerator/GenerateQueuePrimitiveTest.cs‎

Lines changed: 13 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ in Func<T, string> toStr
265265
QueuePrimitiveStart<T>(in builder, in queueNamespace);
266266

267267
QueuePrimitiveDispose(in values, in builder, in queueNamespace);
268-
QueuePrimitiveNotDispose(in values, in builder);
268+
QueuePrimitiveNotDispose(in values, in builder, in queueNamespace);
269269
QueuePrimitiveReseize(in values, in builder, in queueNamespace, in toStr);
270270

271271
QueuePrimitivePush(in values, in builder, in queueNamespace, in toStr);
@@ -364,7 +364,8 @@ public void DisposeTest()
364364

365365
private void QueuePrimitiveNotDispose<T>(
366366
in List<T> values,
367-
in StringBuilder builder
367+
in StringBuilder builder,
368+
in string queueNamespace
368369
) where T : unmanaged
369370
{
370371
if (values.Count < 5)
@@ -381,7 +382,7 @@ public void NotDisposeTest()
381382
using (var memory = new StackMemoryCollections.Struct.StackMemory(sizeof({typeof(T).Name}) * {values.Count}))
382383
{{
383384
{{
384-
var queue = new StackMemoryCollections.Struct.QueueOf{typeof(T).Name}({values.Count}, &memory);
385+
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}({values.Count}, &memory);
385386
}}
386387
387388
Assert.That(new IntPtr(memory.Current), Is.EqualTo(new IntPtr(({typeof(T).Name}*)memory.Start + {values.Count})));
@@ -410,7 +411,7 @@ public void ReseizeTest()
410411
{{
411412
unsafe
412413
{{
413-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
414+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
414415
");
415416
for (int i = 0; i < 4; i++)
416417
{
@@ -437,13 +438,6 @@ public void ReseizeTest()
437438
");
438439
}
439440

440-
if(queueNamespace == "Struct")
441-
{
442-
builder.Append($@"
443-
queue.Dispose();
444-
");
445-
}
446-
447441
builder.Append($@"
448442
}}
449443
}}
@@ -762,7 +756,7 @@ public void ClearOwnTest()
762756
{{
763757
unsafe
764758
{{
765-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
759+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
766760
");
767761
for (int i = 0; i < 4; i++)
768762
{
@@ -778,14 +772,6 @@ public void ClearOwnTest()
778772
queue.Clear();
779773
Assert.That(queue.Size, Is.EqualTo((nuint)0));
780774
Assert.That(queue.Capacity, Is.EqualTo((nuint)4));
781-
");
782-
if (queueNamespace == "Struct")
783-
{
784-
builder.Append($@"
785-
queue.Dispose();
786-
");
787-
}
788-
builder.Append($@"
789775
}}
790776
}}
791777
");
@@ -950,7 +936,7 @@ public void TrimExcessOwnTest()
950936
{{
951937
unsafe
952938
{{
953-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
939+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
954940
");
955941
for (int i = 0; i < 4; i++)
956942
{
@@ -968,14 +954,6 @@ public void TrimExcessOwnTest()
968954
queue.TrimExcess();
969955
Assert.That(queue.Size, Is.EqualTo((nuint)5));
970956
Assert.That(queue.Capacity, Is.EqualTo((nuint)5));
971-
");
972-
if (queueNamespace == "Struct")
973-
{
974-
builder.Append($@"
975-
queue.Dispose();
976-
");
977-
}
978-
builder.Append($@"
979957
}}
980958
}}
981959
");
@@ -1012,18 +990,10 @@ public void ExpandCapacityTest()
1012990
1013991
unsafe
1014992
{{
1015-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
993+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
1016994
Assert.That(queue.Capacity, Is.EqualTo((nuint)4));
1017995
queue.ExpandCapacity(6);
1018996
Assert.That(queue.Capacity, Is.EqualTo((nuint)10));
1019-
");
1020-
if (queueNamespace == "Struct")
1021-
{
1022-
builder.Append($@"
1023-
queue.Dispose();
1024-
");
1025-
}
1026-
builder.Append($@"
1027997
}}
1028998
}}
1029999
");
@@ -1118,7 +1088,7 @@ public void ExpandCapacityHeadAfterTailOwnTest()
11181088
{{
11191089
unsafe
11201090
{{
1121-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
1091+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
11221092
");
11231093
for (int i = 0; i < 4; i++)
11241094
{
@@ -1161,14 +1131,6 @@ public void ExpandCapacityHeadAfterTailOwnTest()
11611131
builder.Append($@"
11621132
Assert.That(queue.Front(), Is.EqualTo({toStr(values[values.Count - 1])}));
11631133
queue.Pop();
1164-
");
1165-
if (queueNamespace == "Struct")
1166-
{
1167-
builder.Append($@"
1168-
queue.Dispose();
1169-
");
1170-
}
1171-
builder.Append($@"
11721134
Assert.That(queue.Size, Is.EqualTo((nuint)0));
11731135
}}
11741136
}}
@@ -1244,7 +1206,7 @@ public void ExpandCapacityHeadBeforeTailOwnTest()
12441206
{{
12451207
unsafe
12461208
{{
1247-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
1209+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
12481210
");
12491211
for (int i = 0; i < 4; i++)
12501212
{
@@ -1268,14 +1230,6 @@ public void ExpandCapacityHeadBeforeTailOwnTest()
12681230
builder.Append($@"
12691231
Assert.That(queue.Front(), Is.EqualTo({toStr(values[values.Count - 1])}));
12701232
queue.Pop();
1271-
");
1272-
if (queueNamespace == "Struct")
1273-
{
1274-
builder.Append($@"
1275-
queue.Dispose();
1276-
");
1277-
}
1278-
builder.Append($@"
12791233
Assert.That(queue.Size, Is.EqualTo((nuint)0));
12801234
}}
12811235
}}
@@ -1313,20 +1267,12 @@ public void ReducingCapacityTest()
13131267
13141268
unsafe
13151269
{{
1316-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
1270+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
13171271
queue.ExpandCapacity(6);
13181272
13191273
Assert.That(queue.Capacity, Is.EqualTo((nuint)10));
13201274
queue.ReducingCapacity(1);
13211275
Assert.That(queue.Capacity, Is.EqualTo((nuint)9));
1322-
");
1323-
if (queueNamespace == "Struct")
1324-
{
1325-
builder.Append($@"
1326-
queue.Dispose();
1327-
");
1328-
}
1329-
builder.Append($@"
13301276
}}
13311277
}}
13321278
");
@@ -1404,7 +1350,7 @@ public void ReducingCapacityHeadAfterTailOwnTest()
14041350
{{
14051351
unsafe
14061352
{{
1407-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
1353+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
14081354
");
14091355
for (int i = 0; i < 4; i++)
14101356
{
@@ -1438,14 +1384,6 @@ public void ReducingCapacityHeadAfterTailOwnTest()
14381384
Assert.That(queue.Back(), Is.EqualTo({toStr(values[values.Count - 1])}));
14391385
Assert.That(queue.Front(), Is.EqualTo({toStr(values[values.Count - 1])}));
14401386
queue.Pop();
1441-
");
1442-
if(queueNamespace == "Struct")
1443-
{
1444-
builder.Append($@"
1445-
queue.Dispose();
1446-
");
1447-
}
1448-
builder.Append($@"
14491387
Assert.That(queue.Size, Is.EqualTo((nuint)0));
14501388
}}
14511389
}}
@@ -1520,7 +1458,7 @@ public void ReducingCapacityHeadBeforeTailOwnTest()
15201458
{{
15211459
unsafe
15221460
{{
1523-
var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
1461+
using var queue = new StackMemoryCollections.{queueNamespace}.QueueOf{typeof(T).Name}();
15241462
");
15251463
for (int i = 0; i < 3; i++)
15261464
{
@@ -1544,14 +1482,6 @@ public void ReducingCapacityHeadBeforeTailOwnTest()
15441482
}
15451483
builder.Append($@"
15461484
Assert.That(queue.Size, Is.EqualTo((nuint)0));
1547-
");
1548-
if (queueNamespace == "Struct")
1549-
{
1550-
builder.Append($@"
1551-
queue.Dispose();
1552-
");
1553-
}
1554-
builder.Append($@"
15551485
}}
15561486
}}
15571487
");

‎Src/TestGenerator/GenerateStackPrimitiveTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ public void NotDisposeTest()
363363
using (var memory = new StackMemoryCollections.Struct.StackMemory(sizeof({typeof(T).Name}) * {values.Count}))
364364
{{
365365
{{
366-
var stack = new StackMemoryCollections.Struct.StackOf{typeof(T).Name}({values.Count}, &memory);
366+
var stack = new StackMemoryCollections.{stackNamespace}.StackOf{typeof(T).Name}({values.Count}, &memory);
367367
}}
368368
369369
Assert.That(new IntPtr(memory.Current), Is.EqualTo(new IntPtr(({typeof(T).Name}*)memory.Start + {values.Count})));

0 commit comments

Comments
 (0)