cleanup, call-as-default

[scpubgit/DKit.git] / t / basic_rule.t

diff --git a/t/basic_rule.t b/t/basic_rule.t
index 01a5e99..6c78c96 100644 (file)
--- a/t/basic_rule.t
+++ b/t/basic_rule.t
@@ -42,7 +42,7 @@ is_deeply([ map $_->{S}{name}, $s->results ], [ sort @servers ]);
 $solver->add_rule(shell => [ 'S' ] => [ member_of => qw(S shells) ])
        ->add_rule(name => [ qw(T N) ],
                     [ constrain => [ qw(T N) ],
-                      sub { ::Dwarn(\@_); $_[0]->{name} eq $_[1] } ]
+                      sub { $_[0]->{name} eq $_[1] } ]
                  )
        ->add_rule(shell_installed_on => [ qw(Shell Srv) ],
                     [ constrain => [ qw(Shell Srv) ],
@@ -51,12 +51,15 @@ $solver->add_rule(shell => [ 'S' ] => [ member_of => qw(S shells) ])
 
 $s = $solver->query(
        [ qw(Shell Srv) ],
-       [ call => shell => 'Shell' ],
-       [ call => name => 'Shell', [ value => 'bash' ] ],
-       [ call => server => 'Srv' ],
-       [ call => shell_installed_on => qw(Shell Srv) ],
+       [ shell => 'Shell' ],
+       [ name => 'Shell', [ value => 'bash' ] ],
+       [ server => 'Srv' ],
+       [ shell_installed_on => qw(Shell Srv) ],
      );
 
-::Dwarn($s->results);
+is_deeply(
+  [ sort map $_->{Srv}{name}, $s->results ],
+  [ qw(joe.example.com kitty.scsys.co.uk) ]
+);
 
 done_testing;