Changeset 4155 for trunk/t

Timestamp:

08/29/09 00:39:39 (3 months ago)

Author:

fumiakiy

Message:

Merged slapshot to trunk. "svn merge -r3786:4152 http://code.sixapart.com/svn/movabletype/branches/slapshot/ ."

Location:

trunk/t

Files:

• 100-cms_search.t (copied) (copied from branches/slapshot/t/100-cms_search.t)
• 101-email.t (copied) (copied from branches/slapshot/t/101-email.t)
• 27-context.t (modified) (1 diff)
• 35-tags.dat (modified) (2 diffs)
• 35-tags.t (modified) (3 diffs)
• 62-asset.t (modified) (2 diffs)
• 66-templatecache.t (modified) (2 diffs)
• 80-serialize.t (copied) (copied from branches/slapshot/t/80-serialize.t)
• 81-pagination.t (copied) (copied from branches/slapshot/t/81-pagination.t)
• 92-pubqueue.t (modified) (1 diff)
• 98-check.t (modified) (2 diffs)
• 99-includeblogs.t (copied) (copied from branches/slapshot/t/99-includeblogs.t)
• lib/MT/Test.pm (modified) (7 diffs)

trunk/t/27-context.t

@@ -101 +101 @@
 is(build($ctx, '<$MTEntryAuthor$>'), $entry->author->name, 'MTEntryAuthor');
 is(build($ctx, '<$MTEntryMore$>'), html_text_transform($entry->text_more), 'MTEntryMore');
-is(build($ctx, '<$MTEntryCommentCount$>'), 0, 'MTEntryCommentCount');
+is(build($ctx, '<$MTEntryCommentCount$>'), 3, 'MTEntryCommentCount');
 is(build($ctx, '<$MTEntryDate format="%Y.%m.%d %H:%M:%S"$>'), $ts, 'MTEntryDate format');
 

trunk/t/35-tags.dat

@@ -353 +353 @@
 { "r" : "1", "t" : "<MTAuthors sort_by='email'><MTAuthorEmail>;</MTAuthors>", "e" : "bobd@example.com;chuckd@example.com;"}, #350
 { "r" : "1", "t" : "<MTAuthors sort_by='url'><MTAuthorURL>;</MTAuthors>", "e" : ";http://chuckd.com/;"}, #351
-{ "r" : "1", "t" : "<MTAuthors display_name=\"Chucky Dee\"><MTAuthorName>;<MTAuthorDisplayName>;<MTAuthorEmail>;<MTAuthorURL>;</MTAuthors>", "e" : "Chuck D;Chucky Dee;chuckd@example.com;http://chuckd.com/;"}, #352
+{ "r" : "1", "t" : "<MTAuthors username='Chuck D'><MTAuthorName>;<MTAuthorDisplayName>;<MTAuthorEmail>;<MTAuthorURL>;</MTAuthors>", "e" : "Chuck D;Chucky Dee;chuckd@example.com;http://chuckd.com/;"}, #352
 { "r" : "0", "t" : "<MTArchiveList type='Monthly'><MTPages><MTPageTitle></MTPages></MTArchiveList>", "e" : "Watching the River Flow" }, #353
 { "r" : "1", "t" : "<MTAuthors sort_by='display_name' sort_order='descend'><MTAuthorID>;</MTAuthors>", "e" : "3;2;"}, #354
@@ -427 +427 @@
 { "r" : "1", "t" : "<mt:entries limit='1'><mt:EntryTitle></mt:Entries>", "e" : "A Rainy Day" }, #424
 { "r" : "1", "t" : "<mt:entries category='NOT foo'><mt:EntryTitle>;</mt:Entries>", "e" : "A Rainy Day;Verse 5;Verse 4;Verse 2;Verse 1;" }, #425
-{ "r" : "1", "t" : "<mt:entries lastn='1' tags='verse'><mt:EntryTitle></mt:Entries>", "e" : "Verse 5" } #426
+{ "r" : "1", "t" : "<mt:entries lastn='1' tags='verse'><mt:EntryTitle></mt:Entries>", "e" : "Verse 5" }, #426
+{ "r" : "1", "t" : "<mt:authors username='Chuck D'><MTAuthorName>;<MTAuthorDisplayName>;<MTAuthorEmail>;<MTAuthorURL>;</mt:authors>", "e" : "Chuck D;Chucky Dee;chuckd@example.com;http://chuckd.com/;"}, #427
+{ "r" : "1", "t" : "<mt:authors id='2' username='Bob D'><MTAuthorName>;<MTAuthorDisplayName>;<MTAuthorEmail>;<MTAuthorURL>;</mt:authors>", "e" : "Chuck D;Chucky Dee;chuckd@example.com;http://chuckd.com/;"}, #428
+{ "r" : "1", "t" : "<mt:authors id='2'><MTAuthorName>;<MTAuthorDisplayName>;<MTAuthorEmail>;<MTAuthorURL>;</mt:authors>", "e" : "Chuck D;Chucky Dee;chuckd@example.com;http://chuckd.com/;"} #429
 ]

trunk/t/35-tags.t

@@ -37 +37 @@
 
 # Ok. We are now ready to test!
-plan tests => (scalar(@$test_suite) * 2) + 3;
+plan tests => (scalar(@$test_suite)) + 3;
 
 my $blog_name_tmpl = MT::Template->load({name => "blog-name", blog_id => 1});
@@ -86 +86 @@
 }
 
-php_tests($test_suite);
-
 sub build {
     my($ctx, $markup) = @_;
@@ -99 +97 @@
     return $res;
 }
-
-sub php_tests {
-    my ($test_suite) = @_;
-    my $test_script = <<'PHP';
-<?php
-include_once("php/mt.php");
-include_once("php/lib/MTUtil.php");
-require "t/lib/JSON.php";
-
-$cfg_file = '<CFG_FILE>';
-
-$const = array(
-    'CFG_FILE' => $cfg_file,
-    'VERSION_ID' => VERSION_ID,
-    'CURRENT_WORKING_DIRECTORY' => '',
-    'STATIC_CONSTANT' => '',
-    'DYNAMIC_CONSTANT' => '1',
-    'DAYS_CONSTANT1' => '<DAYS_CONSTANT1>',
-    'DAYS_CONSTANT2' => '<DAYS_CONSTANT2>',
-    'CURRENT_YEAR' => strftime("%Y"),
-    'CURRENT_MONTH' => strftime("%m"),
-);
-
-$output_results = 0;
-
-$mt = new MT(1, $cfg_file);
-$ctx =& $mt->context();
-
-$path = $mt->config['mtdir'];
-if (substr($path, strlen($path) - 1, 1) == '/')
-    $path = substr($path, 1, strlen($path)-1);
-if (substr($path, strlen($path) - 2, 2) == '/t')
-    $path = substr($path, 0, strlen($path) - 2);
-$const['CURRENT_WORKING_DIRECTORY'] = $path;
-
-$db = $mt->db();
-$ctx->mt->db = &$db;
-$ctx->stash('blog_id', 1);
-$blog = $db->fetch_blog(1);
-$ctx->stash('blog', $blog);
-$ctx->stash('current_timestamp', '20040816135142');
-$mt->init_plugins();
-$entry = $db->fetch_entry(1);
-
-$suite = load_tests();
-
-run($ctx, $suite);
-
-function run(&$ctx, $suite) {
-    $test_num = 0;
-    global $entry;
-    global $mt;
-    global $tmpl;
-    foreach ($suite as $test_item) {
-        $mt->db->savedqueries = array();
-        if ( preg_match('/MT(Entry|Link)/', $test_item->t) 
-          && !preg_match('/MT(Comments|Pings)/', $test_item->t) )
-        {
-            $ctx->stash('entry', $entry);
-        }
-        else {
-            $ctx->__stash['entry'] = null;
-        }
-        if ( preg_match('/MTEntries|MTPages/', $test_item->t) ) {
-            $ctx->__stash['entries'] = null;
-            $ctx->__stash['author'] = null;
-            $ctx->__stash['category'] = null;
-        }
-        if ( preg_match('/MTCategoryArchiveLink/', $test_item->t) ) {
-            $ctx->stash('current_archive_type', 'Category');
-        } else {
-            $ctx->stash('current_archive_type', '');
-        }
-        $test_num++;
-        if ($test_item->r == 1) {
-            $tmpl = $test_item->t;
-            $result = build($ctx, $test_item->t);
-            ok($result, $test_item->e, $test_num);
-        } else {
-            echo "ok - php test $test_num\n";
-        }
-    }
-}
-
-function load_tests() {
-    $suite = cleanup(file_get_contents('t/35-tags.dat'));
-    $json = new JSON();
-    global $const;
-    foreach ($const as $c => $r) {
-        $suite = preg_replace('/' . $c . '/', $r, $suite);
-    }
-    $suite = $json->decode($suite);
-    return $suite;
-}
-
-function cleanup($tmpl) {
-    # Translating perl array/hash structures to PHP...
-    # This is not a general solution... it's custom built for our input.
-    $tmpl = preg_replace('/^ *#.*$/m', '', $tmpl);
-    $tmpl = preg_replace('/# *\d+ *(?:TBD.*)? *$/m', '', $tmpl);
-    return $tmpl;
-}
-
-function build(&$ctx, $tmpl) {
-    if ($ctx->_compile_source('evaluated template', $tmpl, $_var_compiled)) {
-        ob_start();
-        $ctx->_eval('?>' . $_var_compiled);
-        $_contents = ob_get_contents();
-        ob_end_clean();
-        return $_contents;
-    } else {
-        return $ctx->error("Error compiling template module '$module'");
-    }
-}
-
-function ok($str, $that, $test_num) {
-    global $mt;
-    global $tmpl;
-    $str = trim($str);
-    $that = trim($that);
-    if ($str === $that) {
-        echo "ok - php test $test_num\n";
-        return true;
-    } else {
-        echo "not ok - php test $test_num\n".
-             "#     expected: $that\n".
-             "#          got: $str\n";
-        return false;
-    }
-}
-
-?>
-PHP
-
-    $test_script =~ s/<\Q$_\E>/$const{$_}/g for keys %const;
-
-    # now run the test suite through PHP!
-    my $pid = open2(\*IN, \*OUT, "php");
-    print OUT $test_script;
-    close OUT;
-    select IN;
-    $| = 1;
-    select STDOUT;
-
-    my @lines;
-    my $num = 1;
-
-    my $test = sub {
-        while (@lines) {
-            my $result = shift @lines;
-            if ($result =~ m/^ok/) {
-                pass($result);
-            } elsif ($result =~ m/^not ok/) {
-                fail($result);
-            } elsif ($result =~ m/^#/) {
-                print STDERR $result . "\n";
-            } else {
-                print $result . "\n";
-            }
-        }
-    };
-
-    my $output = '';
-    while (<IN>) {
-        $output .= $_;
-        if ($output =~ m/\n/) {
-            my @new_lines = split /\n/, $output;
-            $output = pop @new_lines;
-            push @lines, @new_lines;
-        }
-        $test->() if @lines;
-    }
-    push @lines, $output if $output ne '';
-    close IN;
-    $test->() if @lines;
-}

trunk/t/62-asset.t

@@ -31 +31 @@
     is($asset->image_width, 640, 'image_width'); 
     is($asset->image_height, 480, 'height');
-    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');
-    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');
-    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');
+    is($asset->as_html, '<a href="http://narnia.na/nana/images/test.jpg">View image</a>', 'as_html');
+    is($asset->as_html({popup => 1, popup_asset_id => $asset->id, include => 1}), qq(<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>), 'as_html_popup');
+    is($asset->as_html({include => 1, wrap_text => 1, align => 'right'}), '<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;" />', 'as_html_include');
 
     #metadata validation
@@ -103 +103 @@
     is($asset_f->class, 'file', 'class');
     is($asset_f->class_label, 'Asset', 'class_label');
-    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');
+    is($asset_f->as_html, '<a href="http://narnia.na/nana/files/test.tmpl">test.tmpl</a>', 'as_html');
 
     #metadata validation

trunk/t/66-templatecache.t

@@ -49 +49 @@
 MT::Touch->touch($blog->id, 'entry');
 my $out2 = $tmpl->build($ctx, {});
-ok($out2 eq "hello", "Test template should be the same");
+ok($out2 ne "hello", "Test template should be the same");
 
 MT::Request->instance->reset;
@@ -67 +67 @@
 $mt->rebuild( BlogId => $blog->id, Force  => 1 ) || print "Rebuild error: ", $mt->errstr;
 my $out3 = $tmpl->build($ctx, {});
-ok($out3 ne "hello yay", "Test template should be different");
+ok($out3 eq "hello yay", "Test template should be different");

trunk/t/92-pubqueue.t

@@ -5 +5 @@
 
 use lib 't/lib', 'lib', 'extlib';
-use Test::More tests => 66;
+use Test::More tests => 67;
 
 use MT;

trunk/t/98-check.t

@@ -7 +7 @@
 use MT::Test;
 
-use Test::More tests => 38;
+use Test::More tests => 39;
 
 # required modules in MT check
@@ -52 +52 @@
 use_ok('File::Temp');
 use_ok('Net::LDAP');
+use_ok('XML::Parser');

trunk/t/lib/MT/Test.pm

@@ -1 +1 @@
 #############################################################################
-# Copyright å© 2008-2009 Six Apart Ltd.
+# Copyright © 2008-2009 Six Apart Ltd.
 # $Id$
 
@@ -8 +8 @@
 our $VERSION = 0.9;
 our @EXPORT =
-  qw( is_object are_objects _run_app out_like out_unlike err_like grab_stderr get_current_session _tmpl_out tmpl_out_like get_last_output get_tmpl_error get_tmpl_out _run_rpt _run_tasks );
+  qw( is_object are_objects _run_app out_like out_unlike err_like grab_stderr get_current_session _tmpl_out tmpl_out_like tmpl_out_unlike get_last_output get_tmpl_error get_tmpl_out _run_rpt _run_tasks );
 
 use strict;
@@ -18 +18 @@
 use File::Basename;
 use MT;
+
+MT->add_callback( 'post_init', 1, undef, \&add_plugin_test_libs );
+
+sub add_plugin_test_libs {
+    require MT::Plugin;
+    my @p = MT::Plugin->select;
+    foreach my $p (@p) {
+        my $t_lib = File::Spec->catdir( $p->path, 't', 'lib' );
+        unshift @INC, $t_lib if ( -d $t_lib );
+    }
+}
 
 use Test::More;
@@ -286 +297 @@
         }
     };
+    *MT::Memcached::inflate = sub {
+        my $driver = shift;
+        my ( $class, $data ) = @_;
+        $class->inflate($data);
+    };
+    *MT::Memcached::deflate = sub {
+        my $driver = shift;
+        my ($obj) = @_;
+        $obj->deflate;
+    };
+
+    # make sure things will pull from Memcached instead of RAM
+    eval {
+        require MT::ObjectDriver::Driver::Cache::RAM;
+        MT::ObjectDriver::Driver::Cache::RAM->Disabled(1);
+    };
 }
 
@@ -348 +375 @@
     );
 
-    MT->config->PluginSchemaVersion ({});
+    MT->config->PluginSchemaVersion( {} );
     MT::Upgrade->do_upgrade(
-        App     => __PACKAGE__,
-        User    => {},
-        Blog    => {}
+        App  => __PACKAGE__,
+        User => {},
+        Blog => {}
     );
-    
 
     eval {
@@ -492 +518 @@
       ( 'Blog Administrator', 'Author' );
 
-    unless ($admin_role && $author_role) {
+    unless ( $admin_role && $author_role ) {
         my @default_roles = (
-            { name => 'Blog Administrator',
-              description => 'Can administer the blog.',
-              role_mask => 2**12,
-              perms => ['administer_blog'] },
-            { name => 'Author',
-              description => 'Can create entries, edit their own, upload files and publish.',
-              perms => ['comment', 'create_post', 'publish_post', 'upload', 'send_notifications'], },
+            {
+                name        => 'Blog Administrator',
+                description => 'Can administer the blog.',
+                role_mask   => 2**12,
+                perms       => ['administer_blog']
+            },
+            {
+                name => 'Author',
+                description =>
+'Can create entries, edit their own, upload files and publish.',
+                perms => [
+                    'comment',      'create_post',
+                    'publish_post', 'upload',
+                    'send_notifications'
+                ],
+            },
         );
 
         foreach my $r (@default_roles) {
             my $role = MT::Role->new();
-            $role->name(MT->translate($r->{name}));
-            $role->description(MT->translate($r->{description}));
+            $role->name( MT->translate( $r->{name} ) );
+            $role->description( MT->translate( $r->{description} ) );
             $role->clear_full_permissions;
-            $role->set_these_permissions($r->{perms});
-            if ($r->{name} =~ m/^System/) {
+            $role->set_these_permissions( $r->{perms} );
+            if ( $r->{name} =~ m/^System/ ) {
                 $role->is_system(1);
             }
-            $role->role_mask($r->{role_mask}) if exists $r->{role_mask};
+            $role->role_mask( $r->{role_mask} ) if exists $r->{role_mask};
             $role->save;
         }
@@ -1495 +1530 @@
 }
 
+sub tmpl_out_unlike {
+    my ( $text, $param, $ctx_h, $re, $name ) = @_;
+
+    return unlike( _tmpl_out( $text, $param, $ctx_h ), $re, $name );
+}
+
 sub _run_rpt {
-    my $daemonize = 0;
-    my $sleep     = 5;
-    my $help      = 0;
-    my $load      = 10;
-    my $verbose   = 0;
-    my $scoreboard;
-    my $randomize_jobs = 0;
-    my $trace_objects  = 0;
-
-    if ($trace_objects) {
-        require Devel::Leak::Object;
-        Devel::Leak::Object->import(qw{ GLOBAL_bless });
-    }
-
-    my %cfg;
-    $cfg{verbose}    = $verbose;
-    $cfg{scoreboard} = $scoreboard;
-    $cfg{prioritize} = 1;
-    $cfg{randomize}  = $randomize_jobs;
-
-    require MT::Bootstrap;
-    require MT;
-
-    my $mt = MT->instance() or die MT->errstr;
-
-    $mt->{vtbl}                 = {};
-    $mt->{is_admin}             = 0;
-    $mt->{template_dir}         = 'cms';
-    $mt->{user_class}           = 'MT::Author';
-    $mt->{plugin_template_path} = 'tmpl';
-    $mt->run_callbacks( 'init_app', $mt );
-
-    my $client = eval {
-        require MT::TheSchwartz;
-        my $c = MT::TheSchwartz->new(%cfg);
-        no warnings 'once';
-        $TheSchwartz::FIND_JOB_BATCH_SIZE = $load;
-        $c;
-    };
-    if ( ( my $error = $@ ) && $verbose ) {
-        print STDERR "Error initializing TheSchwartz: $error\n";
-    }
-
-    if ( $daemonize && $client ) {
-        $client->work_periodically($sleep);
-    }
-    else {
-
-        # First, run periodic tasks
-        $mt->run_tasks();
-        $client->work_until_done if $client;
-    }
+    `perl ./tools/run-periodic-tasks`;
 
     1;