Menu
▾
▴
[Everydevel-opers] SF.net SVN: everydevel: [976] trunk/ebase
|
From: <pau...@us...> - 2007-07-24 18:08:02
|
Revision: 976
http://svn.sourceforge.net/everydevel/?rev=976&view=rev
Author: paul_the_nomad
Date: 2007-07-24 11:07:57 -0700 (Tue, 24 Jul 2007)
Log Message:
-----------
Fixes for compatibility with Test::MockObject 1.08
Modified Paths:
--------------
trunk/ebase/lib/Everything/Auth/Test/EveryAuth.pm
trunk/ebase/lib/Everything/HTML/FormObject/Test/AuthorMenu.pm
trunk/ebase/lib/Everything/HTTP/Test/Apache.pm
trunk/ebase/lib/Everything/HTTP/Test/CGI.pm
trunk/ebase/lib/Everything/HTTP/Test/URL.pm
trunk/ebase/lib/Everything/Node/Test/Runnable.pm
trunk/ebase/lib/Everything/Node/Test/container.pm
trunk/ebase/lib/Everything/Node/Test/htmlpage.pm
trunk/ebase/lib/Everything/Node/Test/node.pm
trunk/ebase/lib/Everything/Test/CmdLine.pm
trunk/ebase/lib/Everything/Test/Ecore/SimpleServer.pm
trunk/ebase/lib/Everything/Test/HTML.pm
trunk/ebase/lib/Everything/Test/Node.pm
trunk/ebase/lib/Everything/Test/Nodeball.pm
trunk/ebase/lib/Everything/Test/XML.pm
trunk/ebase/lib/Everything/XML/Test/Node.pm
Property Changed:
----------------
trunk/ebase/
Property changes on: trunk/ebase
___________________________________________________________________
Name: svk:merge
- 16c2b9cb-492b-4d64-9535-64d4e875048d:/wip/ebase:1030
1b7afbaf-3eae-422c-ad05-e2bef7c06a0f:/wip/ebase:979
a6810612-c0f9-0310-9d3e-a9e4af8c5745:/ebase/offline:17930
+ 16c2b9cb-492b-4d64-9535-64d4e875048d:/wip/ebase:1030
1b7afbaf-3eae-422c-ad05-e2bef7c06a0f:/wip/ebase:980
a6810612-c0f9-0310-9d3e-a9e4af8c5745:/ebase/offline:17930
Modified: trunk/ebase/lib/Everything/Auth/Test/EveryAuth.pm
===================================================================
--- trunk/ebase/lib/Everything/Auth/Test/EveryAuth.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Auth/Test/EveryAuth.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -11,7 +11,6 @@
my $self = shift;
my $module = $self->module_class();
my $mock = Test::MockObject->new;
- $mock->fake_module('Everything');
$mock->fake_module('Everything::HTML');
my $cgi = CGI->new;
use_ok($module) or exit;
Modified: trunk/ebase/lib/Everything/HTML/FormObject/Test/AuthorMenu.pm
===================================================================
--- trunk/ebase/lib/Everything/HTML/FormObject/Test/AuthorMenu.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/HTML/FormObject/Test/AuthorMenu.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -8,13 +8,6 @@
use warnings;
use strict;
-sub setup_mocks {
- my $self = shift;
- $self->SUPER;
- $self->{mock}->fake_module('Everything::HTML');
-
-}
-
sub test_cgi_verify : Test(17) {
my $self = shift;
my $mock = $self->{mock};
Modified: trunk/ebase/lib/Everything/HTTP/Test/Apache.pm
===================================================================
--- trunk/ebase/lib/Everything/HTTP/Test/Apache.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/HTTP/Test/Apache.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -11,7 +11,6 @@
sub test_startup : Test(startup => 1) {
my $self = shift;
my $mock = Test::MockObject->new;
- $mock->fake_module('Everything');
$mock->fake_module('Everything::Auth');
my $fake_apache_request = Test::MockObject->new;
my $fake_everything_request = Test::MockObject->new;
Modified: trunk/ebase/lib/Everything/HTTP/Test/CGI.pm
===================================================================
--- trunk/ebase/lib/Everything/HTTP/Test/CGI.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/HTTP/Test/CGI.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -6,6 +6,11 @@
use strict;
use warnings;
+BEGIN {
+ Test::MockObject->fake_module('Everything::HTTP::ResponseFactory');
+ Test::MockObject->fake_module('Everything::HTTP::Request');
+}
+
sub test_handle : Test(17) {
my $self = shift;
my $package = $self->{class};
@@ -25,10 +30,8 @@
);
$mock->set_series( 'isOfType', 0, 0, 1, 1, 0, 1, 1, 0 );
- $mock->fake_module('Everything::HTTP::Request');
$mock->fake_new('Everything::HTTP::Request');
- $mock->fake_module('Everything::HTTP::ResponseFactory');
$mock->fake_new('Everything::HTTP::ResponseFactory');
local $ENV{SCRIPT_NAME} = 'http://foo/bar/';
Modified: trunk/ebase/lib/Everything/HTTP/Test/URL.pm
===================================================================
--- trunk/ebase/lib/Everything/HTTP/Test/URL.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/HTTP/Test/URL.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -36,18 +36,7 @@
}
-sub test_accessors : Test(10) {
- my $self = shift;
- my @attributes = qw/request cgi location path_info url/;
- foreach (@attributes) {
- can_ok($self->{class}, "set_$_");
- can_ok($self->{class}, "get_$_");
- }
-
-}
-
-
sub test_create_nodetype_rule : Test(6) {
my $self = shift;
my $instance = Test::MockObject::Extends->new($self->{instance});
@@ -56,9 +45,7 @@
my $node = $self->{mock};
- $node->{DB}=$self->{mock};
- $instance->set_always('get_e', $node);
- $node->set_always('get_db', $node);
+ $node->set_always('get_nodebase', $node);
$node->set_always('getNode', $node);
$node->{type} = $node;
my $nodetype_name = 'nodetypename';
@@ -68,13 +55,15 @@
my $nodetype_rule;
ok ($nodetype_rule = $instance->create_nodetype_rule($sub, $nodetype_name),
'...should run nodetype rule');
+
is (ref $nodetype_rule, 'CODE', '...and return a code ref.');
$node->set_series('getType', {title => 'nodetypename'}, {title => 'notnodetypename'});
- is ($nodetype_rule->($node), 'for real', '...should run the code if our node conforms.');
+ my $obj = bless {}, 'Everything::Node::nodetypename';
+ is ($nodetype_rule->($obj), 'for real', '...should run the code if our node conforms.');
$node->{title} = "differentname";
is ($nodetype_rule->($node), undef, '...and return undef when it does not.');
- is ($instance->get_select_node_subs_ref->[-1], $nodetype_rule, '...and add it to the subs.')
+ is ($instance->get_node_to_url_subs_ref->[-1], $nodetype_rule, '...and add it to the subs.')
}
sub test_create_linknode : Test(3) {
Modified: trunk/ebase/lib/Everything/Node/Test/Runnable.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/Runnable.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Node/Test/Runnable.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -10,10 +10,12 @@
+BEGIN {
+ Test::MockObject->fake_module('Everything::Auth');
+}
-
sub startup_runnable : Test(startup => 1) {
my $self = shift;
my $mock = Test::MockObject->new;
@@ -21,7 +23,6 @@
flushErrorsToBackside => sub {1},
getBacksideErrors => sub {1});
- $mock->fake_module('Everything::Auth');
*Everything::HTTP::Request::DB = \$mock;
$mock->set_always('get_db', $mock);
$mock->set_always('getNodeById', $mock);
Modified: trunk/ebase/lib/Everything/Node/Test/container.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/container.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Node/Test/container.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -95,6 +95,7 @@
my $result;
my $node_id = 123;
$instance->mock( get_node_id => sub { $node_id } );
+ $instance->set_false( 'get_parent_container' );
is( $result = $instance->generate_container( undef, $mock ),
$expected,
@@ -102,7 +103,7 @@
## test for parent container;
- $instance->set_parent_container($node_id);
+ $instance->mock(get_parent_container => sub { $node_id } );
$mock->set_always( getNode => $instance );
dies_ok { $result = $instance->generate_container( 1, $mock ) }
Modified: trunk/ebase/lib/Everything/Node/Test/htmlpage.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/htmlpage.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Node/Test/htmlpage.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -6,6 +6,7 @@
use base 'Everything::Node::Test::node';
use Test::More;
+use SUPER;
sub test_dbtables
{
@@ -52,6 +53,7 @@
my $class = $self->node_class();
my $instance = $self->{node};
$instance->set_always( 'run', 'some htmlpage html <BacksideErrors>' );
+ $instance->set_always(get_parent_container => 0 );
my $mock = Test::MockObject->new;
$mock->set_always( get_user => $mock );
can_ok($class, 'make_html');
Modified: trunk/ebase/lib/Everything/Node/Test/node.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/node.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Node/Test/node.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -76,7 +76,7 @@
my $blank_db = catfile(qw( t ebase.db ));
require 't/lib/build_test_db.pm' unless -e $blank_db;
- my $tempdir = File::Temp::tempdir( DIR => 't', CLEANUP => 1 );
+ my $tempdir = File::Temp::tempdir( DIR => 't', CLEANUP => 1);
my $module = $self->node_class();
my $module_db = catfile( $tempdir, $module . '_base.db' );
Modified: trunk/ebase/lib/Everything/Test/CmdLine.pm
===================================================================
--- trunk/ebase/lib/Everything/Test/CmdLine.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Test/CmdLine.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -14,6 +14,8 @@
BEGIN {
*CORE::GLOBAL::exit = sub { $exited++ };
+ Test::MockObject->fake_module('Everything::NodeBase');
+
}
sub test_get_options : Test(4) {
@@ -97,7 +99,6 @@
|| return 'abs_path not implemented.';
my $mock = Test::MockObject->new;
- $mock->fake_module('Everything::NodeBase');
my @new_args;
my $new_returns = $mock;
Modified: trunk/ebase/lib/Everything/Test/Ecore/SimpleServer.pm
===================================================================
--- trunk/ebase/lib/Everything/Test/Ecore/SimpleServer.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Test/Ecore/SimpleServer.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -2,7 +2,7 @@
package Everything::Test::Ecore::SimpleServer;
use SUPER;
-use Everything::HTML qw/mod_perlInit/;
+use Everything::HTTP::CGI;
use base 'HTTP::Server::Simple::CGI';
@@ -30,7 +30,7 @@
my $args = $self->{mod_perlInit};
- mod_perlInit( @$args );
+ Everything::HTTP::CGI->handle( @$args );
}
Modified: trunk/ebase/lib/Everything/Test/HTML.pm
===================================================================
--- trunk/ebase/lib/Everything/Test/HTML.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Test/HTML.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -23,7 +23,7 @@
my $self = shift;
my $class = $self->module_class();
my $mock = Test::MockObject->new;
- $mock->fake_module('Everything');
+
$mock->fake_module('Everything::HTTP::Request');
$mock->fake_new('Everything::HTTP::Request');
$mock->set_always( 'get_cgi', $mock )->set_always( 'get_node', $mock );
Modified: trunk/ebase/lib/Everything/Test/Node.pm
===================================================================
--- trunk/ebase/lib/Everything/Test/Node.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Test/Node.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -8,6 +8,11 @@
use strict;
use warnings;
+BEGIN {
+ Test::MockObject->fake_module('Everything::Util');
+ Test::MockObject->fake_module('XML::Dom');
+}
+
sub module_class {
my $self = shift;
my $name = blessed($self);
@@ -29,8 +34,6 @@
}
);
- $mock->fake_module('Everything::Util');
- $mock->fake_module('XML::Dom');
$self->{mock} = $mock;
use_ok( $self->{class} ) || exit;
Modified: trunk/ebase/lib/Everything/Test/Nodeball.pm
===================================================================
--- trunk/ebase/lib/Everything/Test/Nodeball.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Test/Nodeball.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -15,6 +15,10 @@
use strict;
use warnings;
+BEGIN {
+ Test::MockObject->fake_module('Everything::XML::Node');
+}
+
sub startup : Test(startup => +0) {
my $self = shift;
$self->SUPER;
@@ -436,7 +440,6 @@
|| return 'exportNodes not implemented.';
my $instance = $self->{instance};
my $mock = $self->{mock};
- $mock->fake_module('Everything::XML::Node');
$mock->fake_new('Everything::XML::Node');
$mock->mock( toXML => sub { "some xml" } );
my $test_code = \&{ $self->{class} . '::exportNodes' };
Modified: trunk/ebase/lib/Everything/Test/XML.pm
===================================================================
--- trunk/ebase/lib/Everything/Test/XML.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/Test/XML.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -8,6 +8,8 @@
use base 'Everything::Test::Abstract';
+BEGIN { Test::MockObject->fake_module( 'XML::DOM' ); }
+
sub startup : Test(startup => +1) {
my $self = shift;
my $mock = Test::MockObject->new;
@@ -15,7 +17,6 @@
$self->{le} = [];
$mock->fake_module( 'Everything',
logErrors => sub { push @{ $self->{le} }, [@_] } );
- $mock->fake_module('XML::DOM');
# test imports
my %import;
Modified: trunk/ebase/lib/Everything/XML/Test/Node.pm
===================================================================
--- trunk/ebase/lib/Everything/XML/Test/Node.pm 2007-07-24 18:05:18 UTC (rev 975)
+++ trunk/ebase/lib/Everything/XML/Test/Node.pm 2007-07-24 18:07:57 UTC (rev 976)
@@ -8,6 +8,12 @@
use strict;
use warnings;
+BEGIN {
+ Test::MockObject->fake_module('XML::DOM::Text');
+ Test::MockObject->fake_module('XML::DOM::Element');
+ Test::MockObject->fake_module('XML::DOM::Document');
+}
+
sub object_class {
my $self = shift;
my $name = blessed($self);
@@ -177,9 +183,7 @@
$instance->set_node($mock);
$instance->set_nodebase($mock);
- $mock->fake_module('XML::DOM::Element');
$mock->fake_new('XML::DOM::Element');
- $mock->fake_module('XML::DOM::Text');
$mock->fake_new('XML::DOM::Text');
$mock->set_true( 'setAttribute', 'appendChild', '-isOfType', '-getRef' );
@@ -356,8 +360,6 @@
use strict 'refs';
$mock->set_always(getNodeKeys => { key1 => 'value1', key2 => 'value2'} );
- $mock->fake_module('XML::DOM::Document');
- $mock->fake_module('XML::DOM::Text');
$mock->fake_new('XML::DOM::Document');
$mock->fake_new('XML::DOM::Text');
$mock->fake_new('XML::DOM::Element');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
