More fix for #1094: co19_2 LibTest/collection/DoubleLinkedQueue tests corrected according to the Issue 27920 evaluation and current behavior.
diff --git a/LibTest/collection/DoubleLinkedQueue/retainWhere_A02_t02.dart b/LibTest/collection/DoubleLinkedQueue/retainWhere_A02_t02.dart
index f2dfac0..b1d2c96 100644
--- a/LibTest/collection/DoubleLinkedQueue/retainWhere_A02_t02.dart
+++ b/LibTest/collection/DoubleLinkedQueue/retainWhere_A02_t02.dart
@@ -10,8 +10,7 @@
///
/// @note See https://github.com/dart-lang/sdk/issues/27920. While spec reads
/// that [test] function must not modify the queue it is expensive to check it
-/// every time. So, let's test the current implementation. When element is
-/// removed by [retainWhere] it must still be in the queue
+/// every time. So, let's test the current implementation.
/// @author iarkh@unipro.ru
/// @issue 27920
@@ -62,7 +61,7 @@
main() {
List list = [1, 3, 3, 4, 6, 5];
- check(testRemove, list, [3, 3, 6, 5], true);
+ check(testRemove, list, [3, 3, 6, 5], false);
check(testRemove1, list, [4, 6, 5], true);
check(testRemoveUnexistent, list, [1, 3, 3, 4], false);
check(testRemoveFirst1, list, [], true);
diff --git a/LibTest/collection/DoubleLinkedQueue/retainWhere_A02_t03.dart b/LibTest/collection/DoubleLinkedQueue/retainWhere_A02_t03.dart
index 8d55a25..cd8743e 100644
--- a/LibTest/collection/DoubleLinkedQueue/retainWhere_A02_t03.dart
+++ b/LibTest/collection/DoubleLinkedQueue/retainWhere_A02_t03.dart
@@ -9,8 +9,7 @@
///
/// @note See https://github.com/dart-lang/sdk/issues/27920. While spec reads
/// that [test] function must not modify the queue it is expensive to check it
-/// every time. So, let's test the current implementation. When element is
-/// removed by [retainWhere] it must still be in the queue
+/// every time. So, let's test the current implementation.
/// @author iarkh@unipro.ru
/// @issue 27920
@@ -22,8 +21,6 @@
bool testClear1(var element) {
queue?.clear();
- print(element);
- print(element == 1);
return element == 1;
}
@@ -37,22 +34,13 @@
return true;
}
-check(bool test(var element), List list, List expected, bool expectError) {
+check(bool test(var element), List list, List expected) {
queue = new DoubleLinkedQueue.from(list);
- if (expectError) {
- Expect.throws(() {queue?.retainWhere(test);});
- } else {
- queue?.retainWhere(test);
- Expect.equals(expected.length, queue?.length);
- int i = 0;
- queue?.forEach((var element) {
- Expect.equals(expected[i++], element);
- });
- }
+ Expect.throws(() {queue?.retainWhere(test);});
}
main() {
- check(testClear1, list, [], false);
- check(testClear2, list, [], true);
- check(testClear3, list, [], true);
+ check(testClear1, list, []);
+ check(testClear2, list, []);
+ check(testClear3, list, []);
}