View | Details | Raw Unified | Return to bug 24062
Collapse All | Expand All

(-)a/t/db_dependent/TestBuilder.t (-1 / +12 lines)
Lines 339-350 subtest 'Date handling' => sub { Link Here
339
};
339
};
340
340
341
subtest 'Default values' => sub {
341
subtest 'Default values' => sub {
342
    plan tests => 2;
342
    plan tests => 3;
343
343
    $builder = t::lib::TestBuilder->new;
344
    $builder = t::lib::TestBuilder->new;
344
    my $item = $builder->build( { source => 'Item' } );
345
    my $item = $builder->build( { source => 'Item' } );
345
    is( $item->{more_subfields_xml}, undef, 'This xml field should be undef' );
346
    is( $item->{more_subfields_xml}, undef, 'This xml field should be undef' );
346
    $item = $builder->build( { source => 'Item', value => { more_subfields_xml => 'some xml' } } );
347
    $item = $builder->build( { source => 'Item', value => { more_subfields_xml => 'some xml' } } );
347
    is( $item->{more_subfields_xml}, 'some xml', 'Default should not overwrite assigned value' );
348
    is( $item->{more_subfields_xml}, 'some xml', 'Default should not overwrite assigned value' );
349
350
    subtest 'generated dynamically (coderef)' => sub {
351
        plan tests => 2;
352
        my $patron = $builder->build_object({ class => 'Koha::Patrons' });
353
        like( $patron->category->category_type, qr{^(A|C|S|I|P|)$}, );
354
355
        my $patron_category_X = $builder->build_object({ class => 'Koha::Patron::Categories', value => { category_type => 'X' } });
356
        $patron = $builder->build_object({ class => 'Koha::Patrons', value => {categorycode => $patron_category_X->categorycode} });
357
        is( $patron->category->category_type, 'X', );
358
    };
348
};
359
};
349
360
350
subtest 'build_object() tests' => sub {
361
subtest 'build_object() tests' => sub {
(-)a/t/lib/TestBuilder.pm (-2 / +5 lines)
Lines 401-407 sub _buildColumnValue { Link Here
401
        }
401
        }
402
        push @$retvalue, $value->{$col_name};
402
        push @$retvalue, $value->{$col_name};
403
    } elsif( exists $self->{default_values}{$source}{$col_name} ) {
403
    } elsif( exists $self->{default_values}{$source}{$col_name} ) {
404
        push @$retvalue, $self->{default_values}{$source}{$col_name};
404
        my $v = $self->{default_values}{$source}{$col_name};
405
        $v = &$v() if ref($v) eq 'CODE';
406
        push @$retvalue, $v;
405
    } else {
407
    } else {
406
        my $data_type = $col_info->{data_type};
408
        my $data_type = $col_info->{data_type};
407
        $data_type =~ s| |_|;
409
        $data_type =~ s| |_|;
Lines 550-555 sub _gen_default_values { Link Here
550
        Category => {
552
        Category => {
551
            enrolmentfee => 0,
553
            enrolmentfee => 0,
552
            reservefee   => 0,
554
            reservefee   => 0,
555
            # Not X, used for statistics
556
            category_type => sub { return [ qw( A C S I P ) ]->[int(rand(5))] },
553
        },
557
        },
554
        Itemtype => {
558
        Itemtype => {
555
            rentalcharge => 0,
559
            rentalcharge => 0,
556
- 

Return to bug 24062