[dss-commits] digitalSTROM Server branch, master, updated. fe55c9789c580a7d3077c439ac8be2c562844274

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".

The branch, master has been updated
       via  fe55c9789c580a7d3077c439ac8be2c562844274 (commit)
      from  6e44bb48556a813d63d603e08423614dc32e50ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fe55c9789c580a7d3077c439ac8be2c562844274
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date:   Tue Jan 12 12:59:32 2010 +0100

    JSSocketTests running again

-----------------------------------------------------------------------

Changes:
diff --git a/core/scripting/jssocket.cpp b/core/scripting/jssocket.cpp
index 1a7ceb7..538235b 100644
--- a/core/scripting/jssocket.cpp
+++ b/core/scripting/jssocket.cpp
@@ -85,6 +85,7 @@ namespace dss {
     }
     
     void sendTo(const std::string& _host, int _port, const std::string& _data) {
+      Logger::getInstance()->log("sendTo");
       m_Data = _data;
       tcp::resolver resolver(m_IOService);
       tcp::resolver::query query(_host, intToString(_port));
@@ -184,15 +185,14 @@ namespace dss {
         int port = ctx->convertTo<int>(argv[1]);
         std::string data = ctx->convertTo<std::string>(argv[2]);
 
+        boost::shared_ptr<SocketHelperSendOneShot> helper(new SocketHelperSendOneShot(*ext));
+        ext->addSocketHelper(helper);
+
+        helper->sendTo(host, port, data);
+
         if(!BoostIORunner::getInstance().isRunning()) {
           BoostIORunner::getInstance().run();
         }
-	
-	boost::shared_ptr<SocketHelperSendOneShot> helper(new SocketHelperSendOneShot(*ext));
-	ext->addSocketHelper(helper);
-
-	helper->sendTo(host, port, data);
-
         *rval = JSVAL_TRUE;
         return JS_TRUE;
       } catch(const ScriptException& e) {
diff --git a/tests/jssockettests.cpp b/tests/jssockettests.cpp
index 78cbadc..f19e10c 100644
--- a/tests/jssockettests.cpp
+++ b/tests/jssockettests.cpp
@@ -41,7 +41,8 @@ BOOST_AUTO_TEST_SUITE(SocketJS)
 class TestListener : public Thread {
 public:
   TestListener(int _port) 
-  : m_IOService(),
+  : Thread("TestListener"),
+    m_IOService(),
     m_Endpoint(tcp::v4(), _port),
     m_Acceptor(m_IOService, m_Endpoint)
   {
@@ -50,9 +51,7 @@ public:
   }
   
   virtual void execute() {
-    while(!m_Terminated) {
-      m_IOService.run();
-    }
+    m_IOService.run();
   }
   
   std::string m_DataReceived;  
@@ -75,7 +74,6 @@ private:
   tcp::acceptor m_Acceptor;
 };
 
-/*
 BOOST_AUTO_TEST_CASE(testBasics) {
   boost::scoped_ptr<ScriptEnvironment> env(new ScriptEnvironment());
   env->initialize();
@@ -84,15 +82,11 @@ BOOST_AUTO_TEST_CASE(testBasics) {
   
   TestListener listener(1234);
   listener.run();
-  sleepMS(500);
 
   boost::scoped_ptr<ScriptContext> ctx(env->getContext());
   ctx->evaluate<void>("TcpSocket.sendTo('127.0.0.1', 1234, 'hello');");
-  sleepMS(1500);
+  sleepMS(250);
   BOOST_CHECK_EQUAL(listener.m_DataReceived, "hello");
-  listener.m_IOService.stop();
-  listener.terminate();
-  sleepMS(500);
 }
-*/
+
 BOOST_AUTO_TEST_SUITE_END()


hooks/post-receive
-- 
digitalSTROM Server