Merge pull request #24 from passsy/feature/indexed_setter_operator

Bugfix KList.last() which returned first()
passsy · Dec 14, 2018 · c646537 · c646537
2 parents 9329221 + 6f533b9
commit c646537
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/lib/src/extension/iterable_extension_mixin.dart b/lib/src/extension/iterable_extension_mixin.dart
@@ -591,7 +591,7 @@ abstract class KIterableExtensionsMixin<T>
     if (predicate == null) {
       if (this is KList) {
         var list = (this as KList);
-        return list.isEmpty() ? null : list.get(0);
+        return list.isEmpty() ? null : list.get(list.lastIndex);
       } else {
         final i = iterator();
         if (!i.hasNext()) {

diff --git a/lib/src/extension/list_extension_mixin.dart b/lib/src/extension/list_extension_mixin.dart
@@ -88,6 +88,7 @@ abstract class KListExtensionsMixin<T> implements KListExtension<T>, KList<T> {
   @override
   T last([bool Function(T) predicate]) {
     if (predicate == null) {
+      if (isEmpty()) throw NoSuchElementException("List is empty.");
       return get(lastIndex);
     } else {
       final i = listIterator(size);

diff --git a/test/collection/iterable_extensions_test.dart b/test/collection/iterable_extensions_test.dart
@@ -318,6 +318,50 @@ void testIterable(KIterable<T> Function<T>() emptyIterable,
     });
   });
 
+  group("last", () {
+    if (ordered) {
+      test("get last element", () {
+        expect(iterableOf(["a", "b"]).last(), "b");
+      });
+    } else {
+      test("get random last element", () {
+        var result = iterableOf(["a", "b"]).last();
+        expect(result == "a" || result == "b", true);
+      });
+    }
+
+    test("last throws for no elements", () {
+      expect(() => emptyIterable().last(),
+          throwsA(TypeMatcher<NoSuchElementException>()));
+    });
+
+    test("finds nothing throws", () {
+      expect(() => iterableOf<String>(["a"]).last((it) => it == "b"),
+          throwsA(TypeMatcher<NoSuchElementException>()));
+    });
+  });
+
+  group("lastOrNull", () {
+    if (ordered) {
+      test("get lastOrNull element", () {
+        expect(iterableOf(["a", "b"]).lastOrNull(), "b");
+      });
+    } else {
+      test("get random last element", () {
+        var result = iterableOf(["a", "b"]).lastOrNull();
+        expect(result == "a" || result == "b", true);
+      });
+    }
+
+    test("lastOrNull returns null for empty", () {
+      expect(emptyIterable().lastOrNull(), isNull);
+    });
+
+    test("finds nothing throws", () {
+      expect(iterableOf<String>(["a"]).lastOrNull((it) => it == "b"), isNull);
+    });
+  });
+
   group("map", () {
     test("map int to string", () {
       final iterable = iterableOf([1, 2, 3]);