Fixes #474. Use type dynamic to avoid errors
diff --git a/LibTest/isolate/ReceivePort/IsolateStream.dart b/LibTest/isolate/ReceivePort/IsolateStream.dart
index 143c06c..b060f8a 100644
--- a/LibTest/isolate/ReceivePort/IsolateStream.dart
+++ b/LibTest/isolate/ReceivePort/IsolateStream.dart
@@ -7,81 +7,73 @@
import "dart:isolate";
void iMain(List data) {
- SendPort replyPort=data[0];
- SendPort replyPort2=data[1];
+ SendPort replyPort = data[0];
+ SendPort replyPort2 = data[1];
ReceivePort receivePort = new ReceivePort();
ReceivePort receivePort2 = new ReceivePort();
replyPort2.send([receivePort.sendPort, receivePort2.sendPort]);
- receivePort.listen((var element){
- // print(" replyPort.send($element)");
- replyPort.send(element);
- }
- );
- receivePort2.listen((var element){
- // print(" receivePort.close()");
- replyPort2.send(null);
- receivePort.close();
- receivePort2.close();
- }
- );
+ receivePort.listen((var element) {
+ replyPort.send(element);
+ });
+ receivePort2.listen((var element) {
+ replyPort2.send(null);
+ receivePort.close();
+ receivePort2.close();
+ });
}
ReceivePort fromFuture(Future content) {
var element;
- bool completed=false;
+ bool completed = false;
SendPort sendPort;
SendPort sendPort2;
void sendElement() {
- if (sendPort!=null && completed) {
- // print("sendPort.send($element)");
- sendPort.send(element);
- // print("sendPort2.send(null)");
- sendPort2.send(null);
- }
+ if (sendPort != null && completed) {
+ sendPort.send(element);
+ sendPort2.send(null);
+ }
}
+
content.then((value) {
- element=value; completed=true;
- sendElement();
+ element = value;
+ completed = true;
+ sendElement();
});
ReceivePort receivePort = new ReceivePort();
ReceivePort receivePort2 = new ReceivePort();
Isolate.spawn(iMain, [receivePort.sendPort, receivePort2.sendPort]);
- receivePort2.listen((portList){
- if (portList!=null) {
- sendPort=portList[0];
- sendPort2=portList[1];
+ receivePort2.listen((portList) {
+ if (portList != null) {
+ sendPort = portList[0];
+ sendPort2 = portList[1];
sendElement();
} else {
- // print("receivePort.close()");
receivePort.close();
receivePort2.close();
}
- });
+ });
return receivePort;
}
ReceivePort fromIterable(Iterable content, {onDone(): null}) {
ReceivePort receivePort = new ReceivePort();
ReceivePort receivePort2 = new ReceivePort();
- receivePort2.listen((portList){
- if (portList!=null) {
- SendPort sendPort=portList[0];
- SendPort sendPort2=portList[1];
+ receivePort2.listen((portList) {
+ if (portList != null) {
+ SendPort sendPort = portList[0];
+ SendPort sendPort2 = portList[1];
for (var element in content) {
- // print("sendPort.send($element)");
sendPort.send(element);
}
- // print("sendPort2.send(null)");
sendPort2.send(null);
} else {
- // print("receivePort.close()");
receivePort.close();
receivePort2.close();
- if (onDone!=null){
+ if (onDone != null) {
onDone();
}
}
});
Isolate.spawn(iMain, [receivePort.sendPort, receivePort2.sendPort]);
return receivePort;
-}
\ No newline at end of file
+}
diff --git a/LibTest/isolate/ReceivePort/firstWhere_A01_t01.dart b/LibTest/isolate/ReceivePort/firstWhere_A01_t01.dart
index eae8775..79c006e 100644
--- a/LibTest/isolate/ReceivePort/firstWhere_A01_t01.dart
+++ b/LibTest/isolate/ReceivePort/firstWhere_A01_t01.dart
@@ -42,8 +42,8 @@
void check1(Iterable data, bool test(var element), var expected) {
Stream s = IsolateStream.fromIterable(data);
asyncStart();
- Future<int> f = s.firstWhere(test);
- f.then((int actual){
+ Future f = s.firstWhere(test);
+ f.then((actual){
Expect.equals(expected, actual);
asyncEnd();
});
@@ -52,13 +52,13 @@
void check2(Iterable data, bool test(var element), var expected) {
Stream s = new Stream.fromIterable(data);
asyncStart();
- Future<int> f = s.firstWhere(
+ Future f = s.firstWhere(
test,
orElse:(){
Expect.fail("should not be called");
}
);
- f.then((int actual){
+ f.then((actual){
Expect.equals(expected, actual);
asyncEnd();
});
diff --git a/LibTest/isolate/ReceivePort/firstWhere_A02_t01.dart b/LibTest/isolate/ReceivePort/firstWhere_A02_t01.dart
index 4e8a571..b1a0cb0 100644
--- a/LibTest/isolate/ReceivePort/firstWhere_A02_t01.dart
+++ b/LibTest/isolate/ReceivePort/firstWhere_A02_t01.dart
@@ -43,8 +43,8 @@
check(Iterable data, bool test(var element), int expected) {
Stream s = IsolateStream.fromIterable(data);
asyncStart();
- Future<int> f = s.firstWhere(test, orElse: () => expected);
- f.then((int actual) {
+ Future f = s.firstWhere(test, orElse: () => expected);
+ f.then((actual) {
Expect.equals(expected, actual);
asyncEnd();
});
diff --git a/LibTest/isolate/ReceivePort/lastWhere_A01_t01.dart b/LibTest/isolate/ReceivePort/lastWhere_A01_t01.dart
index 630c487..d80f468 100644
--- a/LibTest/isolate/ReceivePort/lastWhere_A01_t01.dart
+++ b/LibTest/isolate/ReceivePort/lastWhere_A01_t01.dart
@@ -24,40 +24,40 @@
import "dart:async";
import "../../../Utils/expect.dart";
-void check1(Iterable data, bool test(int element), var expected) {
- Stream<int> s = new Stream.fromIterable(data);
+void check1(Iterable data, bool test(element), var expected) {
+ Stream s = new Stream.fromIterable(data);
asyncStart();
- Future<int> f = s.lastWhere(test);
- f.then((int actual) {
+ Future f = s.lastWhere(test);
+ f.then((actual) {
Expect.equals(expected, actual);
asyncEnd();
});
}
-void check2(Iterable data, bool test(int element), var expected) {
- Stream<int> s = new Stream.fromIterable(data);
+void check2(Iterable data, bool test(element), var expected) {
+ Stream s = new Stream.fromIterable(data);
asyncStart();
- Future<int> f = s.lastWhere(test, orElse: () {
+ Future f = s.lastWhere(test, orElse: () {
Expect.fail("should not be called");
});
- f.then((int actual) {
+ f.then((actual) {
Expect.equals(expected, actual);
asyncEnd();
});
}
-void check(Iterable data, bool test(int element), var expected) {
+void check(Iterable data, bool test(element), var expected) {
check1(data, test, expected);
check2(data, test, expected);
}
main() {
- check([1, 2, 3], (int element) => true, 3);
- check([1, 2, 3], (int element) => element != null, 3);
- check([1, 2, 3, null], (int element) => element == null, null);
- check([1, 2, 3], (int element) => element > 0, 3);
+ check([1, 2, 3], (element) => true, 3);
+ check([1, 2, 3], (element) => element != null, 3);
+ check([1, 2, 3, null], (element) => element == null, null);
+ check([1, 2, 3], (element) => element > 0, 3);
check(new Iterable.generate(10, (int index) => index * 5),
- (int element) => element != 30, 45);
+ (element) => element != 30, 45);
check(new Iterable.generate(10, (int index) => index * 5),
- (int element) => element == 30, 30);
+ (element) => element == 30, 30);
}
diff --git a/LibTest/isolate/ReceivePort/transform_A01_t01.dart b/LibTest/isolate/ReceivePort/transform_A01_t01.dart
index 350271a..17d7f6f 100644
--- a/LibTest/isolate/ReceivePort/transform_A01_t01.dart
+++ b/LibTest/isolate/ReceivePort/transform_A01_t01.dart
@@ -7,16 +7,17 @@
* @assertion Stream transform(StreamTransformer<T, dynamic> streamTransformer)
* Chains this stream as the input of the provided StreamTransformer.
* Returns the result of streamTransformer.bind itself.
- * @description Checks that the new stream sends the same error and done events as this stream.
+ * @description Checks that the new stream sends the same error and done events
+ * as this stream.
* @author kaigorodov
*/
import "dart:async";
import "../../../Utils/expect.dart";
import "IsolateStream.dart" as IsolateStream;
-StreamTransformer<int, int> createMyTransformer() {
+StreamTransformer createMyTransformer() {
return new StreamTransformer.fromHandlers (
- handleData: (int event, EventSink<int> sink) {
+ handleData: (event, EventSink sink) {
sink.add(event);
}
);
@@ -24,10 +25,10 @@
void check(Iterable data) {
Stream s = IsolateStream.fromIterable(data)
- .map( (x) => x % 2 == 0 ? x : throw new ArgumentError(x) ).asBroadcastStream();
+ .map( (x) => x % 2 == 0 ? x : throw new ArgumentError(x)).asBroadcastStream();
Stream s2 = s.transform(createMyTransformer());
- Sync2 sync=new Sync2((err1, err2) {
+ Sync2 sync = new Sync2((err1, err2) {
Expect.listEquals(err1, err2);
});
diff --git a/LibTest/isolate/ReceivePort/transform_A01_t02.dart b/LibTest/isolate/ReceivePort/transform_A01_t02.dart
index 6fb4528..9bcf3e1 100644
--- a/LibTest/isolate/ReceivePort/transform_A01_t02.dart
+++ b/LibTest/isolate/ReceivePort/transform_A01_t02.dart
@@ -15,19 +15,18 @@
import "../../../Utils/expect.dart";
import "IsolateStream.dart" as IsolateStream;
-var input=[1,2,3,4,5];
-var expected=[1,2,3,6,5,10];
+var input = [1, 2, 3, 4, 5];
+var expected = [1, 2, 3, 6, 5, 10];
// transform: skip evens, produce number and its double
-StreamTransformer<int, int> createMyTransformer() {
- return new StreamTransformer.fromHandlers (
- handleData: (int event, EventSink<int> sink) {
- if (event.isOdd) {
- sink.add(event);
- sink.add(event*2);
- }
+StreamTransformer createMyTransformer() {
+ return new StreamTransformer.fromHandlers(
+ handleData: (event, EventSink sink) {
+ if (event.isOdd) {
+ sink.add(event);
+ sink.add(event * 2);
}
- );
+ });
}
main() {
@@ -38,7 +37,7 @@
s.listen((x) {
actual.add(x);
- }, onDone:() {
+ }, onDone: () {
Expect.listEquals(expected, actual);
asyncEnd();
});
