Expanded test_xmpp -- currently failing tests but it's got the setup now for timing out and failing if the expected message is not received.

services/sync/tests/unit/test_xmpp.js

@@ -3,23 +3,80 @@ var Cu = Components.utils;
 Cu.import( "resource://weave/xmpp/xmppClient.js" );
 
 var serverUrl = "http://127.0.0.1:5280/http-poll";
-var jabberName = "alice";
 var jabberDomain = "jonathan-dicarlos-macbook-pro.local";
-var jabberPassword = "iamalice";
+
+var timer = Cc["@mozilla.org/timer;1"].createInstance( Ci.nsITimer );
+var threadManager = Cc["@mozilla.org/thread-manager;1"].getService();
 
 function run_test() {
   /* First, just see if we can connect: */
   var transport = new HTTPPollingTransport( serverUrl,
 					    false,
-					    10000 );
+					    4000 );
   var auth = new PlainAuthenticator();
-  var client = new XmppClient( jabberName, jabberDomain, jabberPassword,
+  var alice = new XmppClient( "alice", jabberDomain, "iamalice",
 			       transport, auth );
-		
+
-  client.connect( jabberDomain );
+  /*		
-  client.waitForConnection();
+  alice.connect( jabberDomain );
-  do_check_neq( client._connectionStatus, client.FAILED );
+  alice.waitForConnection();
-  if ( client._connectionStatus != client.FAILED ) {
+  do_check_neq( alice._connectionStatus, alice.FAILED );
-    client.disconnect();
+  if ( alice._connectionStatus != alice.FAILED ) {
+    alice.disconnect();
   };
+  //A flaw here: once alice disconnects, she can't connect again?
+  */
+
+  
+  // The talking-to-myself test:
+  var testIsOver = false;
+  var sometext = "bla bla how you doin bla";
+  var transport2 = new HTTPPollingTransport( serverUrl, false, 4000 );
+  var auth2 = new PlainAuthenticator();
+  var bob = new XmppClient( "bob", jabberDomain, "iambob", transport2, auth2 );
+
+  // Timer that will make the test fail if message is not received after
+  // a certain amount of time
+  var timerResponder = {
+  notify: function( timer ) {
+      testIsOver = true;
+      do_throw( "Timed out waiting for message." );
+    }
+  };
+  timer.initWithCallback( timerResponder, 10000, timer.TYPE_ONE_SHOT );
+
+  
+  // Handler that listens for the incoming message:
+  var aliceMessageHandler = {
+  handle: function( msgText, from ) {
+      dump( "Alice got a message.\n" );
+      do_check_eq( msgText, sometext );
+      do_check_eq( from, "bob@" + jabberDomain );
+      timer.cancel();
+      testIsOver = true;
+    }
+  };
+  alice.registerMessageHandler( aliceMessageHandler );
+
+  // Start both clients
+  bob.connect( jabberDomain );
+  bob.waitForConnection();
+  do_check_neq( bob._connectionStatus, bob.FAILED );
+  alice.connect( jabberDomain );
+  alice.waitForConnection();
+  do_check_neq( alice._connectionStatus, alice.FAILED );
+
+  dump( "Is test over? " + testIsOver + "\n" );
+  // Send the message
+  bob.sendMessage( "alice@" + jabberDomain, sometext );
+  dump( "Is test over? " + testIsOver + "\n" );
+  // Wait until either the message is received, or the timeout expires.
+  var currentThread = threadManager.currentThread;
+  while( !testIsOver ) {
+    currentThread.processNextEvent( true );
+  }
+  dump( "I'm past the while loop!\n " );
+
+  alice.disconnect();
+  bob.disconnect();
 };