Skip to content

Commit de3b063

Browse files
committed
Remove check make tests beter
1 parent 4ab3240 commit de3b063

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

shared/Microsoft.Extensions.Buffers.MemoryPool.Sources/MemoryPoolBlock.Release.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ internal MemoryPoolBlock(SlabMemoryPool pool, MemoryPoolSlab slab, int offset, i
5353

5454
public void Dispose()
5555
{
56-
if (!Slab.IsActive) MemoryPoolThrowHelper.ThrowObjectDisposedException(MemoryPoolThrowHelper.ExceptionArgument.MemoryPoolBlock);
5756
Pool.Return(this);
5857
}
5958

test/Microsoft.Extensions.Internal.Test/MemoryPoolTests.Debug.cs

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ public void DisposeWithActiveBlocksThrows()
2626
{
2727
var memoryPool = new SlabMemoryPool();
2828
var block = memoryPool.Rent();
29-
var exception = Assert.Throws<InvalidOperationException>(() => memoryPool.Dispose());
30-
Assert.Equal("Memory pool with active blocks is being disposed, 30 of 31 returned", exception.Message);
29+
ExpectDisposeException(memoryPool);
3130

32-
exception = Assert.Throws<InvalidOperationException>(() => block.Dispose());
31+
var exception = Assert.Throws<InvalidOperationException>(() => block.Dispose());
3332
Assert.Equal("Block is being returned to disposed pool", exception.Message);
3433
}
3534

@@ -39,10 +38,9 @@ public void GetMemoryOfDisposedThrows()
3938
var memoryPool = new SlabMemoryPool();
4039
var block = memoryPool.Rent();
4140

42-
var exception = Assert.Throws<InvalidOperationException>(() => memoryPool.Dispose());
43-
Assert.Equal("Memory pool with active blocks is being disposed, 30 of 31 returned", exception.Message);
41+
ExpectDisposeException(memoryPool);
4442

45-
exception = Assert.Throws<ObjectDisposedException>(() => block.Memory);
43+
var exception = Assert.Throws<ObjectDisposedException>(() => block.Memory);
4644
Assert.Equal("Cannot access a disposed object.\r\nObject name: 'MemoryPoolBlock'.", exception.Message);
4745
}
4846

@@ -52,10 +50,10 @@ public void GetMemoryPinOfDisposedThrows()
5250
var memoryPool = new SlabMemoryPool();
5351
var block = memoryPool.Rent();
5452
var memory = block.Memory;
55-
var exception = Assert.Throws<InvalidOperationException>(() => memoryPool.Dispose());
56-
Assert.Equal("Memory pool with active blocks is being disposed, 30 of 31 returned", exception.Message);
5753

58-
exception = Assert.Throws<ObjectDisposedException>(() => memory.Pin());
54+
ExpectDisposeException(memoryPool);
55+
56+
var exception = Assert.Throws<ObjectDisposedException>(() => memory.Pin());
5957
Assert.Equal("Cannot access a disposed object.\r\nObject name: 'MemoryPoolBlock'.", exception.Message);
6058
}
6159

@@ -65,8 +63,8 @@ public void GetMemorySpanOfDisposedThrows()
6563
var memoryPool = new SlabMemoryPool();
6664
var block = memoryPool.Rent();
6765
var memory = block.Memory;
68-
var exception = Assert.Throws<InvalidOperationException>(() => memoryPool.Dispose());
69-
Assert.Equal("Memory pool with active blocks is being disposed, 30 of 31 returned", exception.Message);
66+
67+
ExpectDisposeException(memoryPool);
7068

7169
var threw = false;
7270
try
@@ -87,12 +85,18 @@ public void GetMemoryTryGetArrayOfDisposedThrows()
8785
var memoryPool = new SlabMemoryPool();
8886
var block = memoryPool.Rent();
8987
var memory = block.Memory;
90-
var exception = Assert.Throws<InvalidOperationException>(() => memoryPool.Dispose());
91-
Assert.Equal("Memory pool with active blocks is being disposed, 30 of 31 returned", exception.Message);
9288

93-
exception = Assert.Throws<ObjectDisposedException>(() => MemoryMarshal.TryGetArray<byte>(memory, out _));
89+
ExpectDisposeException(memoryPool);
90+
91+
var exception = Assert.Throws<ObjectDisposedException>(() => MemoryMarshal.TryGetArray<byte>(memory, out _));
9492
Assert.Equal("Cannot access a disposed object.\r\nObject name: 'MemoryPoolBlock'.", exception.Message);
9593
}
94+
95+
private static void ExpectDisposeException(SlabMemoryPool memoryPool)
96+
{
97+
var exception = Assert.Throws<InvalidOperationException>(() => memoryPool.Dispose());
98+
Assert.Equal("Memory pool with active blocks is being disposed, 30 of 31 returned", exception.Message);
99+
}
96100
}
97101
}
98102

0 commit comments

Comments
 (0)