Bugzilla – Attachment 10815 Details for
Bug 8353
Add test to compare system preferences in db to syspref.sql
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8353 follow-up: Perltidy new test
Bug-8353-follow-up-Perltidy-new-test.patch (text/plain), 3.91 KB, created by
Jared Camins-Esakov
on 2012-07-13 12:12:23 UTC
(
hide
)
Description:
Bug 8353 follow-up: Perltidy new test
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-07-13 12:12:23 UTC
Size:
3.91 KB
patch
obsolete
>From 65bb5864b525d5553cd682a66b4d2e2e54dbcea0 Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >Date: Fri, 13 Jul 2012 08:14:11 -0400 >Subject: [PATCH] Bug 8353 follow-up: Perltidy new test >Content-Type: text/plain; charset="UTF-8" > >Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> >--- > t/db_dependent/check_sysprefs.t | 65 +++++++++++++++++---------------------- > 1 files changed, 28 insertions(+), 37 deletions(-) > >diff --git a/t/db_dependent/check_sysprefs.t b/t/db_dependent/check_sysprefs.t >index 6c8540e..f7fc914 100755 >--- a/t/db_dependent/check_sysprefs.t >+++ b/t/db_dependent/check_sysprefs.t >@@ -23,32 +23,26 @@ use warnings; > use Getopt::Long; > use C4::Context; > >- > # When this option is set, no tests are performed. > # The missing sysprefs are displayed as sql inserts instead. > our $showsql = 0; >-GetOptions ('showsql' => \$showsql); >- >+GetOptions( 'showsql' => \$showsql ); > > use Test::More qw(no_plan); >-our $dbh = C4::Context->dbh; >-my $root_dir = C4::Context->config( 'intranetdir' ) . '/installer/data/mysql'; >+our $dbh = C4::Context->dbh; >+my $root_dir = C4::Context->config('intranetdir') . '/installer/data/mysql'; > my $base_syspref_file = "sysprefs.sql"; > >- > open( my $ref_fh, "<$root_dir/$base_syspref_file" ); >-my $ref_syspref = get_syspref_from_file( $ref_fh ); >+my $ref_syspref = get_syspref_from_file($ref_fh); > my @ref_sysprefs = sort { lc $a cmp lc $b } keys %$ref_syspref; >-if (!$showsql) { >- cmp_ok( >- $#ref_sysprefs, '>=', 0, >- "Found " . ($#ref_sysprefs + 1) . " sysprefs" >- ); >+if ( !$showsql ) { >+ cmp_ok( $#ref_sysprefs, '>=', 0, >+ "Found " . ( $#ref_sysprefs + 1 ) . " sysprefs" ); > } > > check_db($ref_syspref); > >- > # > # Get sysprefs from SQL file populating sysprefs table with INSERT statement. > # >@@ -60,10 +54,10 @@ check_db($ref_syspref); > sub get_syspref_from_file { > my $fh = shift; > my %syspref; >- while ( <$fh> ) { >- next if /^--/; # Comment line >+ while (<$fh>) { >+ next if /^--/; # Comment line > my $query = $_; >- if ($_ =~ /\([\s]*\'([\w\-:]+)\'/) { >+ if ( $_ =~ /\([\s]*\'([\w\-:]+)\'/ ) { > my $variable = $1; > if ($variable) { > $syspref{$variable} = $query; >@@ -73,42 +67,39 @@ sub get_syspref_from_file { > return \%syspref; > } > >- > sub check_db { > my $sysprefs = shift; > > # Checking the number of sysprefs in the database > my $query = "SELECT COUNT(*) FROM systempreferences"; >- my $sth = $dbh->prepare($query); >+ my $sth = $dbh->prepare($query); > $sth->execute; >- my $res = $sth->fetchrow_arrayref; >+ my $res = $sth->fetchrow_arrayref; > my $dbcount = $res->[0]; >- if (!$showsql) { >- cmp_ok ( >- $dbcount, ">=", scalar(keys %$sysprefs), "There are at least as many sysprefs in the database as in the sysprefs.sql" >- ); >+ if ( !$showsql ) { >+ cmp_ok( $dbcount, ">=", scalar( keys %$sysprefs ), >+"There are at least as many sysprefs in the database as in the sysprefs.sql" >+ ); > } > > # Checking for missing sysprefs in the database > $query = "SELECT COUNT(*) FROM systempreferences WHERE variable=?"; >- $sth = $dbh->prepare($query); >- foreach (keys %$sysprefs) { >+ $sth = $dbh->prepare($query); >+ foreach ( keys %$sysprefs ) { > $sth->execute($_); >- my $res = $sth->fetchrow_arrayref; >- my $count = $res->[0]; >- if (!$showsql) { >- is( >- $count, 1, "Syspref $_ exists in the database" >- ); >- } else { >- if ($count != 1) { >- print $sysprefs->{$_}; >- } >- } >+ my $res = $sth->fetchrow_arrayref; >+ my $count = $res->[0]; >+ if ( !$showsql ) { >+ is( $count, 1, "Syspref $_ exists in the database" ); >+ } >+ else { >+ if ( $count != 1 ) { >+ print $sysprefs->{$_}; >+ } >+ } > } > } > >- > =head1 NAME > > syspref.t >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8353
:
10628
|
10748
|
10813
|
10814
| 10815 |
10816