Bug 13940 : (QA followup) Add test for ModOAISet

[koha.git] / t / db_dependent / Context.t

diff --git a/t/db_dependent/Context.t b/t/db_dependent/Context.t
index 5105e84..feb2a43 100755 (executable)
--- a/t/db_dependent/Context.t
+++ b/t/db_dependent/Context.t
@@ -10,25 +10,28 @@ use vars qw($debug $koha $dbh $config $ret);
 
 BEGIN {
                $debug = $ENV{DEBUG} || 0;
-               diag("Note: The overall number of tests may vary by configuration.");
-               diag("First we need to check your environmental variables");
+        # Note: The overall number of tests may vary by configuration.
+        # First we need to check your environmental variables
                for (qw(KOHA_CONF PERL5LIB)) {
                        ok($ret = $ENV{$_}, "ENV{$_} = $ret");
                }
                use_ok('C4::Context');
-               use_ok('C4::Utils', qw/ :all /);
 }
 
 ok($koha = C4::Context->new,  'C4::Context->new');
 ok($dbh = C4::Context->dbh(), 'Getting dbh from C4::Context');
 ok($ret = C4::Context->KOHAVERSION, '  (function)  KOHAVERSION = ' . ($ret||''));
 ok($ret =       $koha->KOHAVERSION, '       $koha->KOHAVERSION = ' . ($ret||''));
+ok(
+    TransformVersionToNum( C4::Context->final_linear_version ) <=
+      TransformVersionToNum( C4::Context->KOHAVERSION ),
+    'Final linear version is less than or equal to kohaversion.pl'
+);
 my @keys = keys %$koha;
-diag("Number of keys in \%\$koha: " . scalar @keys); 
-our $width = 0;
+my $width = 0;
 if (ok(@keys)) { 
-       $width = maxwidth(@keys);
-       $debug and diag "widest key is $width";
+    $width = (sort {$a <=> $b} map {length} @keys)[-1];
+    $debug and diag "widest key is $width";
 }
 foreach (sort @keys) {
        ok(exists $koha->{$_}, 
@@ -36,18 +39,9 @@ foreach (sort @keys) {
                . ((defined $koha->{$_}) ? "and is defined." : "but is not defined.")
        );
 }
-diag "Examining defined key values.";
-foreach (grep {defined $koha->{$_}} sort @keys) {
-       print "\n";
-       hashdump('$koha->{' . sprintf('%' . $width . 's', $_)  . '}', $koha->{$_});
-}
 ok($config = $koha->{config}, 'Getting $koha->{config} ');
 
-diag "Testing syspref caching.";
-
-my $dbh = C4::Context->dbh;
-$dbh->disconnect;
-
+# Testing syspref caching
 my $module = new Test::MockModule('C4::Context');
 $module->mock(
     '_new_dbh',
@@ -59,7 +53,7 @@ $module->mock(
 );
 
 my $history;
-$dbh = C4::Context->dbh;
+$dbh = C4::Context->dbh({ new => 1 });
 
 $dbh->{mock_add_resultset} = [ ['value'], ['thing1'] ];
 $dbh->{mock_add_resultset} = [ ['value'], ['thing2'] ];
@@ -102,6 +96,23 @@ is(C4::Context->preference("SillyPreference"), 'thing4', "Retrieved syspref (val
 $history = $dbh->{mock_all_history};
 is(scalar(@{$history}), 0, 'Did not retrieve syspref from database');
 
+my $oConnection = C4::Context->Zconn('biblioserver', 0);
+isnt($oConnection->option('async'), 1, "ZOOM connection is synchronous");
+$oConnection = C4::Context->Zconn('biblioserver', 1);
+is($oConnection->option('async'), 1, "ZOOM connection is asynchronous");
+
 done_testing();
 
+sub TransformVersionToNum {
+    my $version = shift;
+
+    # remove the 3 last . to have a Perl number
+    $version =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;
+
+    # three X's at the end indicate that you are testing patch with dbrev
+    # change it into 999
+    # prevents error on a < comparison between strings (should be: lt)
+    $version =~ s/XXX$/999/;
+    return $version;
+}
 1;