Changeset 2562

Show
Ignore:
Timestamp:
06/12/08 05:12:23 (20 months ago)
Author:
bchoate
Message:

Test suite cleanup. Use MT::Test to force t/ based configuration file for all tests. Fixed several tests that had incorrect expected values.

Location:
branches/release-40/t
Files:
17 modified

Legend:

Unmodified
Added
Removed

  • branches/release-40/t/04-config.t

    r1100 r2562  
    77use lib 'extlib'; 
    88use lib 't/lib'; 
     9 
     10use MT::Test; 
    911 
    1012use Cwd; 

  • branches/release-40/t/07-builder.t

    r1100 r2562  
    55use lib 't/lib'; 
    66use lib 'extlib'; 
     7 
     8use MT::Test; 
    79 
    810use Test::More tests => 116; 

  • branches/release-40/t/08-util.t

    r1098 r2562  
    44use Test; 
    55use MT; 
     6use MT::Test; 
    67use MT::Util qw( encode_html decode_html wday_from_ts format_ts dirify 
    78                 convert_high_ascii encode_xml decode_xml substr_wref 

  • branches/release-40/t/09-image.t

    r1927 r2562  
    88use lib 'extlib'; 
    99 
     10use MT::Test; 
    1011use Test::More; 
    1112use File::Spec; 
    … …  
    4849        my $img = MT::Image->new( Filename => $img_file ); 
    4950SKIP : { 
    50         skip("no $driver image", 17) unless $img; 
     51        skip("no $driver image", 18) unless $img; 
    5152        isa_ok($img, 'MT::Image::' . $driver, "driver $driver with image $img_file is an MT::Image::$driver"); 
    5253#        diag( MT::Image->errstr ) if MT::Image->errstr; 

  • branches/release-40/t/10-filemgr.t

    r1098 r2562  
    77 
    88use MT; 
     9use MT::Test; 
    910use MT::FileMgr; 
    1011 

  • branches/release-40/t/11-sanitize.t

    r1100 r2562  
    1010 
    1111use MT; 
     12use MT::Test; 
    1213use MT::Sanitize; 
    1314 

  • branches/release-40/t/12-dsa.t

    r1100 r2562  
    1111 
    1212use MT; 
     13use MT::Test; 
    1314use MT::Builder; 
    1415use MT::Util qw(dsa_verify perl_sha1_digest_hex dec2bin); 

  • branches/release-40/t/13-dirify.t

    r2106 r2562  
    99 
    1010use MT; 
     11use MT::Test; 
    1112use MT::Util; 
    1213 

  • branches/release-40/t/14-archive.t

    r1100 r2562  
    55use Cwd; 
    66use MT; 
     7use MT::Test; 
    78use strict; 
    89 

  • branches/release-40/t/20-setup.t

    r2247 r2562  
    1212 
    1313use MT; 
     14use MT::Test; 
    1415use MT::Author; 
    1516use MT::Blog; 

  • branches/release-40/t/21-callbacks.t

    r2069 r2562  
    66use Test::More tests => 5; 
    77use CGI; 
    8 use DB_File; 
    98 
    109use lib 'extlib'; 
    … …  
    1312 
    1413use MT; 
     14use MT::Test; 
    1515use MT::Plugin; 
    1616use MT::Entry; 
    … …  
    7777is($entry2->text, $TEST_TEXT, 'on-disk obj altered'); 
    7878 
    79 =pod 
    80  
    81 # TBD: generalize this 
    82 my $driver = MT::ObjectDriver->new('DBI::SQLite'); 
    83  
    84 #my %entries; 
    85 #tie %entries, "DB_File", $mt->{cfg}->DataSource . "/entry.db", 
    86 #                         O_RDWR, 0400, $DB_BTREE 
    87 #    || die $!; 
    88 #my $rec = $entries{$id}; 
    89 #$rec = $driver->{serializer}->unserialize($rec); 
    90 #is($$rec->{text}, rot13($TEST_TEXT), 'text rotated'); 
    91  
    92 #is($entry2->text_more, $TEST_TEXT_MORE, '$entry2->text_more()'); 
    93 #is($$rec->{text_more}, $TEST_TEXT_MORE, '$$rec->{text_more}'); 
    94  
    95 =cut 
    96  

  • branches/release-40/t/46-i18n-en.t

    r1098 r2562  
    2323use Encode; 
    2424use MT; 
     25use MT::Test; 
    2526use MT::Util; 
    2627my $mt = new MT; 

  • branches/release-40/t/47-i18n-ja.t

    r1098 r2562  
    2222 
    2323use Encode; 
    24 use MT::Bootstrap; 
    2524use MT; 
     25use MT::Test; 
    2626my $mt = new MT; 
    2727 

  • branches/release-40/t/49-tagsplit.t

    r1098 r2562  
    44use lib 't/lib', 'extlib', 'lib', '../lib', '../extlib'; 
    55use Test::More; 
     6use MT::Test; 
    67use JSON qw(jsonToObj); 
    78use MT::Tag; 

  • branches/release-40/t/62-asset.t

    r1098 r2562  
    2626#    is($asset->class, 'Image', 'class'); 
    2727    is($asset->class_label, 'Image', 'class_label'); 
    28     is($asset->thumbnail_file({Height => 100, Width => 100}), 't/site/assets_c/1.3b30679660d0d018c5c8b061f4280f3f5cb318ca.jpg', 'thumbnail'); 
     28    is(($asset->thumbnail_file({Height => 100, Width => 100}))[0], 't/site/assets_c/2008/06/test-thumb-640x480.jpg', 'thumbnail'); 
    2929    is($asset->image_width, 640, 'image_width');  
    3030    is($asset->image_height, 480, 'height'); 
    31     is($asset->as_html, '<span mt:asset-id="1" class="mt-enclosure mt-enclosure-image"><a href="http://narnia.na/nana/images/test.jpg">View image</a></span>', 'as_html'); 
    32     is($asset->as_html({popup => 1, include => 1}), qq(<span mt:asset-id="1" class="mt-enclosure mt-enclosure-image"><a href="http://narnia.na/nana/images/test.jpg" onclick="window.open('http://narnia.na/nana/images/test.jpg','popup','width=640,height=480,scrollbars=no,resizable=no,toolbar=no,directories=no,location=no,menubar=no,status=no,left=0,top=0'); return false">View image</a></span>), 'as_html_popup'); 
    33     is($asset->as_html({include => 1, wrap_text => 1, align => 'right'}), '<span mt:asset-id="1" class="mt-enclosure mt-enclosure-image"><img alt="test.jpg" src="http://narnia.na/nana/images/test.jpg" width="640" height="480" class="mt-image-right" style="float: right; margin: 0 0 20px 20px;"/></span>', 'as_html_include'); 
     31    is($asset->as_html, '<form mt:asset-id="1" class="mt-enclosure mt-enclosure-image" style="display: inline;"><a href="http://narnia.na/nana/images/test.jpg">View image</a></form>', 'as_html'); 
     32    is($asset->as_html({popup => 1, popup_asset_id => $asset->id, include => 1}), qq(<form mt:asset-id="1" class="mt-enclosure mt-enclosure-image" style="display: inline;"><a href="http://narnia.na/nana/images/test.jpg" onclick="window.open('http://narnia.na/nana/images/test.jpg','popup','width=640,height=480,scrollbars=no,resizable=no,toolbar=no,directories=no,location=no,menubar=no,status=no,left=0,top=0'); return false">View image</a></form>), 'as_html_popup'); 
     33    is($asset->as_html({include => 1, wrap_text => 1, align => 'right'}), '<form mt:asset-id="1" class="mt-enclosure mt-enclosure-image" style="display: inline;"><img alt="Image photo" src="http://narnia.na/nana/images/test.jpg" width="640" height="480" class="mt-image-right" style="float: right; margin: 0 0 20px 20px;" /></form>', 'as_html_include'); 
    3434 
    3535    #metadata validation 
    … …  
    4343    is($meta->{mime_type}, 'image/jpeg', 'metadata - mime_type'); 
    4444    is($meta->{duration}, undef, 'metadata - duration'); 
    45     is($meta->{'Actual Dimensions'}, '640 wide, 480 high', 'metadata - Actual Dimensions'); 
     45    is($meta->{'Actual Dimensions'}, '640 x 480 pixels', 'metadata - Actual Dimensions'); 
    4646 
    4747    # copy original image file 
    … …  
    5353    use Data::Dumper; 
    5454    my $img_pkg = MT::Asset->class_handler('image'); 
     55    $asset = new $img_pkg; 
    5556    isa_ok($asset, 'MT::Asset::Image', 'New object is MT::Asset::Image'); 
    5657    $asset->blog_id(1); 
    … …  
    99100    # method validation\ 
    100101    is($asset_f->class, 'file', 'class'); 
    101     is($asset_f->class_label, 'File', 'class_label'); 
    102     is($asset_f->as_html, '<span mt:asset-id="2" class="mt-enclosure mt-enclosure-file"><a href="http://narnia.na/nana/files/test.tmpl">test.tmpl</a></span>', 'as_html'); 
     102    is($asset_f->class_label, 'Asset', 'class_label'); 
     103    is($asset_f->as_html, '<form mt:asset-id="2" class="mt-enclosure mt-enclosure-file" style="display: inline;"><a href="http://narnia.na/nana/files/test.tmpl">test.tmpl</a></form>', 'as_html'); 
    103104 
    104105    #metadata validation 

  • branches/release-40/t/63-objectclasses.t

    r1098 r2562  
    22 
    33use strict; 
    4 use lib 'extlib', 'lib'; 
     4use lib 't/lib', 'extlib', 'lib'; 
    55use Test::More tests => 11; 
    6 use MT::Object; 
    76 
    8 package MT::Asset; 
     7use MT::Test; 
     8my $mt = new MT; 
     9 
     10package MT::TestAsset; 
    911 
    1012our @ISA = qw( MT::Object ); 
    … …  
    1921}); 
    2022 
    21 package MT::Asset::Image; 
     23package MT::TestAsset::Image; 
    2224 
    23 our @ISA = qw( MT::Asset ); 
     25our @ISA = qw( MT::TestAsset ); 
    2426 
    2527__PACKAGE__->install_properties({ 
    … …  
    2729}); 
    2830 
    29 package MT::Asset::Audio; 
     31package MT::TestAsset::Audio; 
    3032 
    31 our @ISA = qw( MT::Asset ); 
     33our @ISA = qw( MT::TestAsset ); 
    3234 
    3335__PACKAGE__->install_properties({ 
    … …  
    4042package main; 
    4143 
    42 my $file = new MT::Asset; 
    43 my $image = new MT::Asset::Image; 
    44 my $audio = new MT::Asset::Audio; 
     44my $file = new MT::TestAsset; 
     45my $image = new MT::TestAsset::Image; 
     46my $audio = new MT::TestAsset::Audio; 
    4547 
    46 ok($file->has_column('title')); 
    47 ok($image->has_column('title')); 
    48 ok($audio->has_column('title')); 
    49 ok(!$file->has_column('duration')); 
    50 ok(!$image->has_column('duration')); 
    51 ok($audio->has_column('duration')); 
    52 ok($file->class_type eq 'file'); 
    53 ok($image->class_type eq 'image'); 
    54 ok($audio->class_type eq 'audio'); 
    55 ok(MT::Asset->class_type eq 'file'); 
    56 ok(MT::Asset::Image->class_type eq 'image'); 
     48ok($file->has_column('title'), 'file has title column'); 
     49ok($image->has_column('title'), 'image has title column'); 
     50ok($audio->has_column('title'), 'audio has title column'); 
     51ok(!$file->has_column('duration'), 'file doesn\'t have column duration'); 
     52ok(!$image->has_column('duration'), 'image doesn\'t have column duration'); 
     53ok($audio->has_column('duration'), 'audio has column duration'); 
     54ok($file->class_type eq 'file', 'file class_type is file'); 
     55ok($image->class_type eq 'image', 'image class_type is image'); 
     56ok($audio->class_type eq 'audio', 'audio class_type is audio'); 
     57ok(MT::TestAsset->class_type eq 'file', 'generic asset class_type is file'); 
     58ok(MT::TestAsset::Image->class_type eq 'image', 'generic image asset class type is image'); 

  • branches/release-40/t/driver-tests.pl

    r2540 r2562  
    2626use Test::Deep; 
    2727use lib 't/lib'; 
    28 use MT::Test qw(:testdb :time); 
    2928 
    3029BEGIN { 
    3130    plan skip_all => "Configuration file $ENV{MT_CONFIG} not found" 
    32         if !-r $ENV{MT_CONFIG}; 
    33 } 
    34  
     31        if !-r "t/$ENV{MT_CONFIG}"; 
     32} 
     33 
     34use MT::Test qw(:testdb :time); 
    3535plan tests => 186; 
    3636