Skip to content
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

Jump to bottom

Fixed bug where Shuffle on ObservableList would return null. #76

Merged
merged 1 commit into from
Feb 7, 2019
Merged

Fixed bug where Shuffle on ObservableList would return null. #76

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
4 changes: 2 additions & 2 deletions Assets/Plugins/CandyCoded/Scripts/CustomExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public static List<T> Shuffle<T>(this List<T> list, int seed)

var random = new System.Random(seed);

var shuffledList = new List<T>(list).OrderBy(c => random.Next()).ToList();
var shuffledList = new List<T>(list.OrderBy(_ => random.Next()));

return shuffledList;

Expand All @@ -342,7 +342,7 @@ public static List<T> Shuffle<T>(this List<T> list)

var random = new System.Random();

var shuffledList = new List<T>(list).OrderBy(c => random.Next()).ToList();
var shuffledList = new List<T>(list.OrderBy(_ => random.Next()));

return shuffledList;

Expand Down
4 changes: 2 additions & 2 deletions Assets/Plugins/CandyCoded/Scripts/ObservableList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public ObservableList<T> Shuffle(int seed)

var random = new System.Random(seed);

var shuffledList = new ObservableList<T>(_items).OrderBy(c => random.Next()) as ObservableList<T>;
var shuffledList = new ObservableList<T>(_items.OrderBy(_ => random.Next()));

return shuffledList;

Expand All @@ -362,7 +362,7 @@ public ObservableList<T> Shuffle()

var random = new System.Random();

var shuffledList = new ObservableList<T>(_items).OrderBy(c => random.Next()) as ObservableList<T>;
var shuffledList = new ObservableList<T>(_items.OrderBy(_ => random.Next()));

return shuffledList;

Expand Down
3 changes: 3 additions & 0 deletions Assets/Plugins/CandyCoded/Tests/Editor/CustomExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,9 @@ public void ListShuffleWithSeed()
var numberRangeShuffled1 = numberRange.Shuffle(10);
var numberRangeShuffled2 = numberRange.Shuffle(10);

Assert.AreNotEqual(null, numberRangeShuffled1);
Assert.AreNotEqual(null, numberRangeShuffled2);

Assert.AreNotEqual(numberRange, numberRangeShuffled1);
Assert.AreNotEqual(numberRange, numberRangeShuffled2);

Expand Down
3 changes: 3 additions & 0 deletions Assets/Plugins/CandyCoded/Tests/Editor/ObservableListTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,9 @@ public void ListShuffleWithSeed()
var numberRangeShuffled1 = numberRange.Shuffle(10);
var numberRangeShuffled2 = numberRange.Shuffle(10);

Assert.AreNotEqual(null, numberRangeShuffled1);
Assert.AreNotEqual(null, numberRangeShuffled2);

Assert.AreNotEqual(numberRange, numberRangeShuffled1);
Assert.AreNotEqual(numberRange, numberRangeShuffled2);

Expand Down