Remove Log::Log4perl initialization from test scripts

When the DEBUG environment variable is defined, print logs to STDERR.
perl-workflow · Aug 1, 2021 · 4361763 · 4361763
1 parent e7ae110
commit 4361763
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 72 deletions.
diff --git a/t/05_condition_nested.t b/t/05_condition_nested.t
@@ -5,29 +5,14 @@ use warnings;
 use lib qw(t);
 
 use Test::More;
+use Log::Any qw( $log );
 
 my $debug = $ENV{TEST_DEBUG};
 
 # base name used to find config files
 my $cfgbase = $0;
 $cfgbase =~ s/\.t$/.d/;
 
-my $LOG_FILE  = 'workflow_tests.log';
-my $CONF_FILE = $cfgbase . '/log4perl.conf';
-
-require Log::Log4perl;
-if ($debug) {
-    if ( -f $LOG_FILE ) {
-        unlink($LOG_FILE);
-    }
-    Log::Log4perl::init($CONF_FILE);
-}
-else {
-    no warnings 'once';
-    Log::Log4perl::easy_init($Log::Log4perl::OFF);
-}
-
-
 
 
 require Workflow::Factory;
@@ -80,7 +65,7 @@ is( $workflow->state, 'INITIALIZED', 'initialized state' );
 $workflow->execute_action('test_greedy_or');
 is( $workflow->state, 'TEST_GREEDY_OR', 'wfcond state after test_greedy_or' );
 
-Log::Log4perl::get_logger()->error('START OFFENDING TEST');
+$log->error('START OFFENDING TEST');
 $workflow->execute_action('greedy_or_1');
 is( $workflow->state, 'INITIALIZED', 'wfcond state after greedy_or_1' )
     or $workflow->execute_action('ack_subtest_fail');

diff --git a/t/TestUtil.pm b/t/TestUtil.pm
@@ -3,13 +3,16 @@ package TestUtil;
 use strict;
 use vars qw($VERSION);
 use DateTime;
+use Log::Any::Adapter;
 use Test::More;
 use List::MoreUtils qw(all);
 
 $VERSION = '0.02';
 
-my $LOG_FILE  = 't/workflow_tests.log';
-my $CONF_FILE = 't/log4perl.conf';
+
+if ($ENV{DEBUG}) {
+    Log::Any::Adapter->set('Stderr');
+}
 
 ########################################
 # TICKET INFO
@@ -110,21 +113,6 @@ sub init_mock_persister {
 
 
 
-# Initialize the logger and other resources; called when module
-# required by test
-
-sub init {
-    if ( -f $LOG_FILE ) {
-        unlink( $LOG_FILE );
-    }
-
-    require Log::Log4perl;
-    Log::Log4perl::init( $CONF_FILE );
-
-}
-
-init();
-
 # Used with state tests with various configs.
 sub run_state_tests{
   my $factory = shift;

diff --git a/t/condition.t b/t/condition.t
@@ -7,8 +7,6 @@ use Test::More  tests => 11;
 use Test::Exception;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require_ok( 'Workflow::Condition' );

diff --git a/t/condition_evaluate.t b/t/condition_evaluate.t
@@ -7,8 +7,6 @@ use TestUtil;
 use Test::More  tests => 1;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 my $wf;

diff --git a/t/config.t b/t/config.t
@@ -7,8 +7,6 @@ use Test::More  tests => 50;
 use Test::Exception;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 my ($parser);

diff --git a/t/context-persists.t b/t/context-persists.t
@@ -11,7 +11,6 @@ use Env qw($TEST_VERBOSE);
 use lib qw(t);
 use TestUtil;
 
-#use Log::Log4perl ":easy";    # makes workflow happy
 
 use Workflow::Factory qw(FACTORY);
 

diff --git a/t/context.t b/t/context.t
@@ -7,8 +7,6 @@ use Test::More  tests => 9;
 use Test::Exception;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require_ok( 'Workflow::Context' );

diff --git a/t/exception.t b/t/exception.t
@@ -7,8 +7,6 @@ use Test::More;
 use Test::Exception;
 use English qw(-no_match_vars);
 
-use Log::Log4perl qw(:easy);
-Log::Log4perl->easy_init($OFF);
 
 use_ok( 'Workflow::Exception', qw(workflow_error validation_error configuration_error persist_error) );
 

diff --git a/t/factory.t b/t/factory.t
@@ -7,8 +7,6 @@ use Test::More  tests => 7;
 use Test::Exception;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require_ok( 'Workflow::Factory' );

diff --git a/t/factory_subclass.t b/t/factory_subclass.t
@@ -6,8 +6,6 @@ use TestUtil;
 use Test::More  tests => 5;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require_ok( 'FactorySubclass' );

diff --git a/t/history.t b/t/history.t
@@ -6,8 +6,6 @@ use TestUtil;
 use Test::More  tests => 18;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require_ok( 'Workflow::History' );

diff --git a/t/log4perl.conf b/t/log4perl.conf
diff --git a/t/persister.t b/t/persister.t
@@ -7,8 +7,6 @@ use Test::Exception;
 use Test::More  tests => 18;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require_ok( 'Workflow::Persister' );

diff --git a/t/persister_auto_generate_id.t b/t/persister_auto_generate_id.t
@@ -8,8 +8,6 @@ use Test::Exception;
 use Mock::MonkeyPatch;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require Workflow::Factory;

diff --git a/t/persister_dbi_inherit.t b/t/persister_dbi_inherit.t
@@ -4,8 +4,6 @@ use strict;
 use lib qw(t);
 use Test::More;
 
-use Log::Log4perl qw(:easy);
-Log::Log4perl->easy_init($OFF);
 
 eval "require DBI";
 if ( $@ ) {

diff --git a/t/persister_dbi_sqlite.t b/t/persister_dbi_sqlite.t
@@ -5,7 +5,6 @@ use lib qw(t);
 use TestUtil;
 use constant NUM_TESTS => 15;
 use Test::More;
-use Log::Log4perl     qw( get_logger );
 use TestDBUtil;
 
 eval "require DBI";

diff --git a/t/persister_sequence_id.t b/t/persister_sequence_id.t
@@ -8,8 +8,6 @@ use Test::Exception;
 use Mock::MonkeyPatch;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require Workflow::Factory;

diff --git a/t/validator.t b/t/validator.t
@@ -7,8 +7,6 @@ use Test::More  tests => 2;
 use Test::Exception;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require_ok( 'Workflow::Validator' );

diff --git a/t/validator_has_required_field.t b/t/validator_has_required_field.t
@@ -6,8 +6,6 @@ use TestUtil;
 use Test::More  tests => 1;
 
 no warnings 'once';
-require Log::Log4perl;
-Log::Log4perl::easy_init($Log::Log4perl::OFF);
 
 
 require_ok( 'Workflow::Validator::HasRequiredField' );
diff --git a/t/validator_matches_date_format.t b/t/validator_matches_date_format.t
@@ -6,8 +6,6 @@ use Test::Exception;
 use DateTime;
 use Test::More;
 
-use Log::Log4perl qw(:easy);
-Log::Log4perl->easy_init($OFF);
 
 
 require_ok( 'Workflow::Validator::MatchesDateFormat');