Skip to content

[Mono.Android] JavaList.Add should allow duplicates. #9751

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

Merged
merged 3 commits into from
Feb 7, 2025
Merged

[Mono.Android] JavaList.Add should allow duplicates. #9751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fae7cd1
[Mono.Android] `JavaList.Add` should allow duplicates.
jpobst Feb 4, 2025
916b9c9
Fix `Add (int, Object)`
jpobst Feb 5, 2025
373f7ab
Add should append, not prepend.
jpobst Feb 6, 2025
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
7 changes: 3 additions & 4 deletions src/Mono.Android/Android.Runtime/JavaList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,14 +546,13 @@ public static IntPtr ToLocalJniHandle (IList? items)
//
public virtual bool Add (Java.Lang.Object? item)
{
return Add (0, item);
Add ((object?) item);
return true;
}

public virtual bool Add (int index, Java.Lang.Object? item)
{
if (Contains (item))
return false;
Add ((object?) item);
Insert (index, (object?) item);
return true;
}

Expand Down
32 changes: 32 additions & 0 deletions tests/Mono.Android-Tests/Java.Interop/JavaListTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,38 @@ namespace Java.InteropTests
[SetUp]
public void Setup () => list = new T ();

[Test]
public void Add ()
{
list.Add ("foo");
Assert.AreEqual ("foo", list [0]);

// Ensure duplicates are allowed.
list.Add ("foo");
Assert.AreEqual (2, list.Count);
Assert.AreEqual ("foo", list [1]);
}

[Test]
public void AddWithIndex ()
{
list.Add ("Apple");
list.Add ("Banana");
list.Add ("Cherry");

// Ensure index is respected.
list.Add (3, "Grape");
list.Add (2, "Blueberry");
list.Add (4, "Fig");

Assert.AreEqual ("Apple", list [0]);
Copy link
Contributor

@jonpryor jonpryor Feb 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new test is failing on CI:

Expected is <System.String>, actual is <Java.Lang.ICharSequenceInvoker>
Values differ at index [0]
Expected: 'A'
But was:  'C'

The SubList() test is also failing:

Expected is <System.String>, actual is <Java.Lang.ICharSequenceInvoker>
Values differ at index [0]
Expected: 'f'
But was:  'b'

Very odd. :-(

Copy link
Contributor Author

@jpobst jpobst Feb 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

Assert.AreEqual ("Banana", list [1]);
Assert.AreEqual ("Blueberry", list [2]);
Assert.AreEqual ("Cherry", list [3]);
Assert.AreEqual ("Fig", list [4]);
Assert.AreEqual ("Grape", list [5]);
}

[Test]
public void Count ()
{
Expand Down