X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=t%2Flogrouter.t;h=f4408a1d702d974151571ff4a85e15921a34dcea;hp=c1dcf865b49f9476f815731192bf0122c0a5517c;hb=572a9a00cec239943f92157ec39c44398aad137f;hpb=60029bf7dc4205cdc7d9e2f8bc2319eceb955555

diff --git a/t/logrouter.t b/t/logrouter.t
index c1dcf86..f4408a1 100644
--- a/t/logrouter.t
+++ b/t/logrouter.t
@@ -8,10 +8,11 @@ use Object::Remote::Logging::Router;
 
 my $controller_name = 'Test::Log::Controller';
 my $generator = sub { "Generator output" };
-my $metadata = {
-  controller => $controller_name, package => __PACKAGE__, level => 'test1',
-  caller_level => 0,
-};
+my %metadata = (
+  exporter => $controller_name, 
+  caller_package => __PACKAGE__,  caller_level => 0,
+  message_level => 'test1', message_sub => $generator, message_args => [],
+);
 
 my $router = Object::Remote::Logging::Router->new;
 $router->_remote_metadata({ router => undef, connection_id => 'TestConnectionId' });
@@ -28,16 +29,18 @@ ok(scalar(@{$router->_connections} == 1), 'There is a single connection');
 
 $logger->reset;
 my $linenum = __LINE__ + 1;
-$router->handle_log_request($metadata, $generator);
+$router->handle_log_request(%metadata);
 is($logger->feedback_output, "test1: Generator output\n", 'Rendered log message is correct');
 ok($logger->feedback_input->[2]->{timestamp} > 0, 'Timestamp value is present');
 delete $logger->feedback_input->[2]->{timestamp};
+is(ref $logger->feedback_input->[2]->{message_sub}, 'CODE', 'message sub did exist');
+delete $logger->feedback_input->[2]->{message_sub};
 is_deeply($logger->feedback_input, [
   'test1', [ 'Generator output' ], {
-    controller => 'Test::Log::Controller', level => 'test1',
-    hostname => hostname(), pid => $$, package => __PACKAGE__,
+    exporter => 'Test::Log::Controller', message_level => 'test1',
+    hostname => hostname(), pid => $$, caller_package => __PACKAGE__,
     line => $linenum, method => undef, filename => __FILE__,
-    object_remote => {
+    message_args => [], object_remote => {
       connection_id => 'TestConnectionId', router => undef,
     },
   },
@@ -45,7 +48,7 @@ is_deeply($logger->feedback_input, [
 
 $logger->reset;
 undef($selector);
-$router->handle_log_request($metadata, $generator);
+$router->handle_log_request(%metadata);
 ok(scalar(@{$router->_connections}) == 0, 'Selector has been disconnected');
 ok(! defined $logger->feedback_output, 'Logger has no output feedback');
 ok(! defined $logger->feedback_input, 'Logger has no input feedback');
@@ -53,7 +56,7 @@ ok(! defined $logger->feedback_input, 'Logger has no input feedback');
 $router->connect($logger);
 ok(scalar(@{$router->_connections} == 1), 'There is a single connection');
 undef($logger);
-$router->handle_log_request($metadata, $generator);
+$router->handle_log_request(%metadata);
 ok(scalar(@{$router->_connections} == 1), 'Connection is still active');
 
 done_testing;