From 3685bd8fe69412e4e9190c902a51477ea6c6cb7b Mon Sep 17 00:00:00 2001 From: Tim Yates Date: Thu, 25 Apr 2013 10:31:08 +0100 Subject: [PATCH] Updated to latest SNAPSHOT --- .../integration_tests/javascript/test_client.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/test/resources/integration_tests/javascript/test_client.js b/src/test/resources/integration_tests/javascript/test_client.js index c310c2e..b03e5c9 100644 --- a/src/test/resources/integration_tests/javascript/test_client.js +++ b/src/test/resources/integration_tests/javascript/test_client.js @@ -14,8 +14,10 @@ * limitations under the License. */ -load("vertx.js"); -load("vertx_tests.js"); +var container = require( "container" ) ; +var vertx = require( "vertx" ) ; +var vertxTests = require( "vertx_tests" ) ; +var vassert = require( "vertx_assert" ) ; var eb = vertx.eventBus; @@ -26,15 +28,19 @@ var readyAddress = persistorConfig.address + '.ready' var readyHandler = function( msg ) { if( msg.status === 'ok' ) { - initTests( script ) ; eb.unregisterHandler( readyAddress, readyHandler ) ; + vertxTests.startTests( script ) ; } } ; // This will get called by the jdbc-persistor when it has installed the work-queue eb.registerHandler( readyAddress, readyHandler ) ; -vertx.deployModule(java.lang.System.getProperty( 'vertx.modulename' ), persistorConfig, 1, function() {} ) ; +container.deployModule( java.lang.System.getProperty( 'vertx.modulename' ), persistorConfig, 1, function(err, deployID) { + if (err != null) { + err.printStackTrace(); + } +} ) ; function checkStatus() { eb.send( 'test.persistor', {