You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by pa...@apache.org on 2005/05/07 08:19:40 UTC

svn commit: r169048 - in /spamassassin/trunk/t: body_mod.t missing_hb_separator.t rule_names.t rule_tests.t uri.t uri_text.t

Author: parker
Date: Fri May  6 23:19:39 2005
New Revision: 169048

URL: http://svn.apache.org/viewcvs?rev=169048&view=rev
Log:
Start using create_saobj call to create saobject correctly

Modified:
    spamassassin/trunk/t/body_mod.t
    spamassassin/trunk/t/missing_hb_separator.t
    spamassassin/trunk/t/rule_names.t
    spamassassin/trunk/t/rule_tests.t
    spamassassin/trunk/t/uri.t
    spamassassin/trunk/t/uri_text.t

Modified: spamassassin/trunk/t/body_mod.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/body_mod.t?rev=169048&r1=169047&r2=169048&view=diff
==============================================================================
--- spamassassin/trunk/t/body_mod.t (original)
+++ spamassassin/trunk/t/body_mod.t Fri May  6 23:19:39 2005
@@ -24,13 +24,8 @@
 # ---------------------------------------------------------------------------
 
 # initialize SpamAssassin
-my $sa = Mail::SpamAssassin->new({
-    rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
-    local_tests_only    => 1,
-    debug             => 0,
-    dont_copy_prefs   => 1,
-});
+my $sa = create_saobj({'dont_copy_prefs' => 1});
+
 $sa->init(0); # parse rules
 
 open (IN, "<data/spam/006");

Modified: spamassassin/trunk/t/missing_hb_separator.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/missing_hb_separator.t?rev=169048&r1=169047&r2=169048&view=diff
==============================================================================
--- spamassassin/trunk/t/missing_hb_separator.t (original)
+++ spamassassin/trunk/t/missing_hb_separator.t Fri May  6 23:19:39 2005
@@ -23,14 +23,8 @@
 plan tests => 12;
 
 # initialize SpamAssassin
-my $sa = Mail::SpamAssassin->new({
-    rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
-    userprefs_filename  => "$prefix/masses/spamassassin/user_prefs",
-    local_tests_only    => 1,
-    debug             => 0,
-    dont_copy_prefs   => 1,
-});
+my $sa = create_saobj({'dont_copy_prefs' => 1});
+
 $sa->init(0); # parse rules
 
 my @msg;

Modified: spamassassin/trunk/t/rule_names.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/rule_names.t?rev=169048&r1=169047&r2=169048&view=diff
==============================================================================
--- spamassassin/trunk/t/rule_names.t (original)
+++ spamassassin/trunk/t/rule_names.t Fri May  6 23:19:39 2005
@@ -23,14 +23,8 @@
 use vars qw(%patterns %anti_patterns);
 
 # initialize SpamAssassin
-my $sa = Mail::SpamAssassin->new({
-    rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
-    userprefs_filename  => "$prefix/masses/spamassassin/user_prefs",
-    local_tests_only    => 1,
-    debug             => 0,
-    dont_copy_prefs   => 1,
-});
+my $sa = create_saobj({'dont_copy_prefs' => 1});
+
 $sa->init(0); # parse rules
 
 # get rule names

Modified: spamassassin/trunk/t/rule_tests.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/rule_tests.t?rev=169048&r1=169047&r2=169048&view=diff
==============================================================================
--- spamassassin/trunk/t/rule_tests.t (original)
+++ spamassassin/trunk/t/rule_tests.t Fri May  6 23:19:39 2005
@@ -17,6 +17,7 @@
 
 use strict;
 use Test;
+use SATest;
 use Mail::SpamAssassin;
 use vars qw($num_tests);
 
@@ -24,14 +25,7 @@
 
 $Mail::SpamAssassin::Conf::COLLECT_REGRESSION_TESTS = 1;
 
-my $sa = Mail::SpamAssassin->new({
-    rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
-    userprefs_filename  => "$prefix/masses/spamassassin/user_prefs",
-    local_tests_only    => 1,
-    debug             => 0,
-    dont_copy_prefs   => 1,
-});
+my $sa = create_saobj({'dont_copy_prefs' => 1});
 
 $sa->init(0); # parse rules
 

Modified: spamassassin/trunk/t/uri.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/uri.t?rev=169048&r1=169047&r2=169048&view=diff
==============================================================================
--- spamassassin/trunk/t/uri.t (original)
+++ spamassassin/trunk/t/uri.t Fri May  6 23:19:39 2005
@@ -17,6 +17,7 @@
 
 use strict;
 use Test;
+use SATest;
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::HTML;
 use Mail::SpamAssassin::Util;
@@ -26,13 +27,8 @@
 ##############################################
 
 # initialize SpamAssassin
-my $sa = Mail::SpamAssassin->new({
-    rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
-    local_tests_only    => 1,
-    debug             => 0,
-    dont_copy_prefs   => 1,
-});
+my $sa = create_saobj({'dont_copy_prefs' => 1});
+
 $sa->init(0); # parse rules
 
 open (IN, "<data/spam/009");

Modified: spamassassin/trunk/t/uri_text.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/uri_text.t?rev=169048&r1=169047&r2=169048&view=diff
==============================================================================
--- spamassassin/trunk/t/uri_text.t (original)
+++ spamassassin/trunk/t/uri_text.t Fri May  6 23:19:39 2005
@@ -28,14 +28,8 @@
 plan tests => 2;
 
 # initialize SpamAssassin
-my $sa = Mail::SpamAssassin->new({
-    rules_filename => "$prefix/t/log/test_rules_copy",
-    site_rules_filename => "$prefix/t/log/test_default.cf",
-    userprefs_filename  => "$prefix/masses/spamassassin/user_prefs",
-    local_tests_only    => 1,
-    debug             => 0,
-    dont_copy_prefs   => 1,
-});
+my $sa = create_saobj({'dont_copy_prefs' => 1});
+
 $sa->init(0); # parse rules
 
 # load tests and write mail