Skip to content

Make RemoveAt follow the IList contract #1291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alaricd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make RemoveAt follow the IList contract #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/FirebirdSql.Data.FirebirdClient.Tests/FbParameterCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,30 @@ namespace FirebirdSql.Data.FirebirdClient.Tests;
[NoServerCategory]
public class FbParameterCollectionTests
{
[TestCase(-1)]
[TestCase(0)]
[TestCase(1)]
public void RemoveAtInvalidIndexThrowsArgumentOutOfRangeTest(int index)
{
// IList.RemoveAt: ArgumentOutOfRangeException when "index is not a valid index in the IList".
var command = new FbCommand();
if (index == 1)
{
command.Parameters.Add("@p1", 1);
}

var ex = Assert.Throws<ArgumentOutOfRangeException>(() => command.Parameters.RemoveAt(index));
Assert.AreEqual("index", ex.ParamName);
Assert.AreEqual(index == 1 ? 1 : 0, command.Parameters.Count);
}

[Test]
public void RemoveAtUnknownNameThrowsIndexOutOfRangeTest()
{
var command = new FbCommand();
Assert.Throws<IndexOutOfRangeException>(() => command.Parameters.RemoveAt("@missing"));
}

[Test]
public void AddTest()
{
Expand Down
13 changes: 10 additions & 3 deletions src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbParameterCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,10 @@ public override void Remove(object value)

public override void RemoveAt(int index)
{
if (index < 0 || index > Count)
// IList.RemoveAt: ArgumentOutOfRangeException when "index is not a valid index in the IList".
if (index < 0 || index >= Count)
{
throw new IndexOutOfRangeException("The specified index does not exist.");
throw new ArgumentOutOfRangeException(nameof(index), index, "The specified index does not exist.");
}

var parameter = this[index];
Expand All @@ -266,7 +267,13 @@ public override void RemoveAt(int index)

public override void RemoveAt(string parameterName)
{
RemoveAt(IndexOf(parameterName));
var index = IndexOf(parameterName);
if (index < 0)
{
throw new IndexOutOfRangeException("The specified index does not exist.");
}

RemoveAt(index);
}

public void CopyTo(FbParameter[] array, int index)
Expand Down