refactored. connect returns feature and tests added

inkrement · Dec 29, 2013 · d4ff876 · d4ff876
1 parent f51b33e
commit d4ff876
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/lib/Messenger/src/peers/jswebrtcpeer.dart b/lib/Messenger/src/peers/jswebrtcpeer.dart
@@ -44,7 +44,7 @@ class JsWebRtcPeer extends Peer{
   /**
    * connect to WebrtcPeer
    */
-  connect(JsWebRtcPeer o){
+  Future connect(JsWebRtcPeer o){
 
     /// add ice candidates
     rtcPeerConnection.onicecandidate = (event) {
@@ -71,7 +71,7 @@ class JsWebRtcPeer extends Peer{
       }
     };
 
-  /// add Datachannel
+  /// create datachannel
     
     try {
       dc = rtcPeerConnection.createDataChannel("sendDataChannel", js.map(dataChannelOptions));
@@ -94,13 +94,17 @@ class JsWebRtcPeer extends Peer{
 
           //test datachannel
           //dataChannel.send("test");
+          connection_completer.complete("wuhuu");
         });
-      }, (e)=>print(e), {});
-
-
+      }, (e){
+        connection_completer.completeError(e, e.stackTrace);
+      }, {});
+
     } catch (e) {
-      log.warning("could not create DataChannel: " + e.toString()); 
+      connection_completer.completeError(e, e.stackTrace);
     }
+
+    return connection_completer.future;
   }
 
 

diff --git a/lib/Messenger/src/peers/peer.dart b/lib/Messenger/src/peers/peer.dart
@@ -29,6 +29,10 @@ abstract class Peer{
   ///todo: generalize and add to connections to support multiple states
   StreamController<String> readyStateEvent;
 
+  ///completer for connection
+  ///TODO: use another generic type
+  var connection_completer = new Completer<String>();
+
   /**
    * constuctor
    */
@@ -69,7 +73,7 @@ abstract class Peer{
    * 
    * @param Peer other
    */
-  connect(Peer other);
+  Future connect(Peer other);
 
   /**
    * send Message to other peer

diff --git a/tests/jsrtcpeer.dart b/tests/jsrtcpeer.dart
@@ -35,26 +35,27 @@ void main() {
   });
 
   /**
-   * Test Connection
+   * Test connection
    */
   test('Webrtc connect',(){
     JsWebRtcPeer alice = new JsWebRtcPeer("alice");
     JsWebRtcPeer bob = new JsWebRtcPeer("bob");
 
-    alice.connect(bob);
+    expect(alice.connect(bob), completes);
   });
 
+
+
   /**
-   * test status opens
+   * test DataChannel's readyState opens
    */
-  test('webrtc datachannel open', (){
+  test('webrtc datachannel', (){
     JsWebRtcPeer alice = new JsWebRtcPeer("alice");
     JsWebRtcPeer bob = new JsWebRtcPeer("bob");
 
-    alice.readyStateEvent.stream.listen((String status){
-      if(status == "open")
-          expectAsync0((){});
-    });
+    _callback(String status) => expect(status, "open");
+
+    alice.readyStateEvent.stream.listen(expectAsync1(_callback));
 
     alice.connect(bob);