Merge pull request #36 from passsy/feature/check_args_in_asserts

Validate input arguments
passsy · Dec 23, 2018 · dac4d84 · dac4d84
2 parents 4c0ae8c + df0e94d
commit dac4d84
Show file tree

Hide file tree

Showing 25 changed files with 1,095 additions and 100 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ script:
   - pub run test test/dart_kollection_test.dart
   - pub global activate coverage
   - pub global run coverage:collect_coverage --port=8111 -o coverage.json --resume-isolates --wait-paused &
-  - dart --observe=8111 test/dart_kollection_test.dart
+  - dart --observe=8111 --enable-asserts test/dart_kollection_test.dart
   - pub global run coverage:format_coverage --packages=.packages --report-on lib --in coverage.json --out lcov.info --lcov
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/lib/src/collection/list.dart b/lib/src/collection/list.dart
@@ -34,12 +34,19 @@ class DartList<T>
 
   @override
   bool containsAll(KCollection<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     return elements.all((it) => _list.contains(it));
   }
 
   @override
   T get(int index) {
-    if (index == null) throw ArgumentError("index can't be null");
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
     if (index < 0 || index >= size) {
       throw IndexOutOfBoundsException("index: $index, size: $size");
     }
@@ -63,7 +70,10 @@ class DartList<T>
 
   @override
   KListIterator<T> listIterator([int index = 0]) {
-    if (index == null) throw ArgumentError("index can't be null");
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
     return InterOpKListIterator(_list, index);
   }
 
@@ -72,15 +82,17 @@ class DartList<T>
 
   @override
   KList<T> subList(int fromIndex, int toIndex) {
-    if (fromIndex == null) throw ArgumentError("fromIndex can't be null");
-    if (toIndex == null) throw ArgumentError("toIndex can't be null");
+    assert(() {
+      if (fromIndex == null) throw ArgumentError("fromIndex can't be null");
+      if (toIndex == null) throw ArgumentError("toIndex can't be null");
+      if (fromIndex > toIndex)
+        throw ArgumentError("fromIndex: $fromIndex > toIndex: $toIndex");
+      return true;
+    }());
     if (fromIndex < 0 || toIndex > size) {
       throw IndexOutOfBoundsException(
           "fromIndex: $fromIndex, toIndex: $toIndex, size: $size");
     }
-    if (fromIndex > toIndex) {
-      throw ArgumentError("fromIndex: $fromIndex > toIndex: $toIndex");
-    }
     return DartList(_list.sublist(fromIndex, toIndex));
   }
 

diff --git a/lib/src/collection/list_empty.dart b/lib/src/collection/list_empty.dart
@@ -17,18 +17,30 @@ class EmptyList<T>
   bool contains(T element) => false;
 
   @override
-  bool containsAll(KCollection<T> elements) => elements.isEmpty();
+  bool containsAll(KCollection<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
+    return elements.isEmpty();
+  }
 
   @override
   T get(int index) {
-    if (index == null) throw ArgumentError("index can't be null");
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
     throw IndexOutOfBoundsException(
         "Empty list doesn't contain element at index $index.");
   }
 
   @override
   T operator [](int index) {
-    if (index == null) throw ArgumentError("index can't be null");
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
     throw IndexOutOfBoundsException(
         "Empty list doesn't contain element at index $index.");
   }
@@ -47,7 +59,10 @@ class EmptyList<T>
 
   @override
   KListIterator<T> listIterator([int index = 0]) {
-    if (index == null) throw ArgumentError("index can't be null");
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
     return _EmptyIterator();
   }
 
@@ -56,8 +71,11 @@ class EmptyList<T>
 
   @override
   KList<T> subList(int fromIndex, int toIndex) {
-    if (fromIndex == null) throw ArgumentError("fromIndex can't be null");
-    if (toIndex == null) throw ArgumentError("toIndex can't be null");
+    assert(() {
+      if (fromIndex == null) throw ArgumentError("fromIndex can't be null");
+      if (toIndex == null) throw ArgumentError("toIndex can't be null");
+      return true;
+    }());
     if (fromIndex == 0 && toIndex == 0) return this;
     throw IndexOutOfBoundsException("fromIndex: $fromIndex, toIndex: $toIndex");
   }

diff --git a/lib/src/collection/list_mutable.dart b/lib/src/collection/list_mutable.dart
@@ -37,12 +37,19 @@ class DartMutableList<T>
 
   @override
   bool containsAll(KCollection<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     return elements.all((it) => _list.contains(it));
   }
 
   @override
   T get(int index) {
-    if (index == null) throw ArgumentError("index can't be null");
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
     if (index < 0 || index >= size) {
       throw IndexOutOfBoundsException("index: $index, size: $size");
     }
@@ -81,18 +88,31 @@ class DartMutableList<T>
 
   @override
   bool addAll(KIterable<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     _list.addAll(elements.iter);
     return true;
   }
 
   @override
   bool addAllAt(int index, KCollection<T> elements) {
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     _list.insertAll(index, elements.iter);
     return true;
   }
 
   @override
   void addAt(int index, T element) {
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
     _list.insert(index, element);
   }
 
@@ -103,10 +123,20 @@ class DartMutableList<T>
   bool remove(T element) => _list.remove(element);
 
   @override
-  T removeAt(int index) => _list.removeAt(index);
+  T removeAt(int index) {
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
+    return _list.removeAt(index);
+  }
 
   @override
   T set(int index, T element) {
+    assert(() {
+      if (index == null) throw ArgumentError("index can't be null");
+      return true;
+    }());
     final old = _list[index];
     _list[index] = element;
     return old;
@@ -117,6 +147,10 @@ class DartMutableList<T>
 
   @override
   bool removeAll(KIterable<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     var changed = false;
     for (var value in elements.iter) {
       changed |= _list.remove(value);
@@ -126,21 +160,28 @@ class DartMutableList<T>
 
   @override
   bool retainAll(KIterable<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     _list.removeWhere((it) => !elements.contains(it));
     return true;
   }
 
   @override
   KMutableList<T> subList(int fromIndex, int toIndex) {
-    if (fromIndex == null) throw ArgumentError("fromIndex can't be null");
-    if (toIndex == null) throw ArgumentError("toIndex can't be null");
+    assert(() {
+      if (fromIndex == null) throw ArgumentError("fromIndex can't be null");
+      if (toIndex == null) throw ArgumentError("toIndex can't be null");
+      if (fromIndex > toIndex) {
+        throw ArgumentError("fromIndex: $fromIndex > toIndex: $toIndex");
+      }
+      return true;
+    }());
     if (fromIndex < 0 || toIndex > size) {
       throw IndexOutOfBoundsException(
           "fromIndex: $fromIndex, toIndex: $toIndex, size: $size");
     }
-    if (fromIndex > toIndex) {
-      throw ArgumentError("fromIndex: $fromIndex > toIndex: $toIndex");
-    }
     return DartMutableList(_list.sublist(fromIndex, toIndex));
   }
 

diff --git a/lib/src/collection/map_mutable.dart b/lib/src/collection/map_mutable.dart
@@ -71,6 +71,10 @@ class DartMutableMap<K, V>
 
   @override
   void putAll(KMap<K, V> from) {
+    assert(() {
+      if (from == null) throw ArgumentError("from can't be null");
+      return true;
+    }());
     for (var entry in from.entries.iter) {
       _map[entry.key] = entry.value;
     }

diff --git a/lib/src/collection/set.dart b/lib/src/collection/set.dart
@@ -24,6 +24,10 @@ class DartSet<T>
 
   @override
   bool containsAll(KCollection<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     return elements.all((it) => _set.contains(it));
   }
 

diff --git a/lib/src/collection/set_empty.dart b/lib/src/collection/set_empty.dart
@@ -13,7 +13,13 @@ class EmptySet<T>
   bool contains(T element) => false;
 
   @override
-  bool containsAll(KCollection<T> elements) => elements.isEmpty();
+  bool containsAll(KCollection<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
+    return elements.isEmpty();
+  }
 
   @override
   bool isEmpty() => true;

diff --git a/lib/src/collection/set_mutable.dart b/lib/src/collection/set_mutable.dart
@@ -35,6 +35,10 @@ class DartMutableSet<T>
 
   @override
   bool containsAll(KCollection<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     return elements.all((it) => _set.contains(it));
   }
 
@@ -67,6 +71,10 @@ class DartMutableSet<T>
 
   @override
   bool addAll(KIterable<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     var oldSize = size;
     _set.addAll(elements.iter);
     return size != oldSize;
@@ -80,6 +88,10 @@ class DartMutableSet<T>
 
   @override
   bool removeAll(KIterable<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     final oldSize = size;
     for (var value in elements.iter) {
       _set.remove(value);
@@ -89,6 +101,10 @@ class DartMutableSet<T>
 
   @override
   bool retainAll(KIterable<T> elements) {
+    assert(() {
+      if (elements == null) throw ArgumentError("elements can't be null");
+      return true;
+    }());
     final oldSize = size;
     _set.removeWhere((it) => !elements.contains(it));
     return oldSize != size;