[COMMIT LOGREPORT] service/all/lib/tests FilterExprTest.pm,1.9,1.10 DlfCategoriserTest.pm,1.3,1.4 DlfAnalyserProcessTest.pm,1.8,1.9

[Francis J. Lacoste]

Update of /cvsroot/logreport/service/all/lib/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7365/all/lib/tests

Modified Files:
	FilterExprTest.pm DlfCategoriserTest.pm 
	DlfAnalyserProcessTest.pm 
Log Message:
- Use DlfSource filter expression to prevent ambiguous error in analyser process.


Index: FilterExprTest.pm
===================================================================
RCS file: /cvsroot/logreport/service/all/lib/tests/FilterExprTest.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FilterExprTest.pm	27 May 2004 15:15:29 -0000	1.9
+++ FilterExprTest.pm	13 Jun 2005 16:10:44 -0000	1.10
@@ -381,6 +381,11 @@
          [ 'value' => '$transfer-complete' ],
          '"transfer-complete" IS NOT NULL AND "transfer-complete" != 0 AND LENGTH("transfer-complete") > 0',
          [] ],
+       [ 'DlfSource',
+         'Lire::FilterExpr::DlfSource',
+         [ 'value' => 'job-2003-05-04' ],
+         'dlf_test.dlf_source = ?',
+         [ 'job-2003-05-04' ] ],
        [ 'Not_expr',
          'Lire::FilterExpr::Not',
          [ 'expr' => $eq_expr ],

Index: DlfCategoriserTest.pm
===================================================================
RCS file: /cvsroot/logreport/service/all/lib/tests/DlfCategoriserTest.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DlfCategoriserTest.pm	7 Jun 2004 17:02:02 -0000	1.3
+++ DlfCategoriserTest.pm	13 Jun 2005 16:10:44 -0000	1.4
@@ -174,7 +174,7 @@
     Lire::PluginManager->register_plugin( $categoriser );
     return
       new Class::Inner( 'parent' => 'Lire::DlfAnalyserProcess',
-                        'args' => [ $self->{'store'}, $categoriser->name(), 
+                        'args' => [ $self->{'store'}, $categoriser->name(),
                                     $self->{'config'}, 'my_source' ],
                         'methods' =>
                         {

Index: DlfAnalyserProcessTest.pm
===================================================================
RCS file: /cvsroot/logreport/service/all/lib/tests/DlfAnalyserProcessTest.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DlfAnalyserProcessTest.pm	2 Jul 2004 18:01:11 -0000	1.8
+++ DlfAnalyserProcessTest.pm	13 Jun 2005 16:10:44 -0000	1.9
@@ -104,9 +104,8 @@
 
     my $process = $self->{'process'};
     my $filter = $process->source_filter();
-    $self->assert_isa( 'Lire::FilterExpr::Eq', $filter );
-    $self->assert_str_equals( '$dlf_source', $filter->arg1() );
-    $self->assert_str_equals( 'my_source', $filter->arg2() );
+    $self->assert_isa( 'Lire::FilterExpr::DlfSource', $filter );
+    $self->assert_str_equals( 'my_source', $filter->value() );
 
     $process->{'_dlf_source'} = undef;
     $self->assert_null( undef, $process->source_filter() );

-- 
To UNSUBSCRIBE, email to commit-request at logreport.org with a subject of 
"unsubscribe". Trouble? Send an email with subject "help" to 
commit-request at logreport.org