Menu
▾
▴
[Everydevel-opers] SF.net SVN: everydevel: [843] trunk/ebase
|
From: <chr...@us...> - 2006-04-14 00:13:47
|
Revision: 843 Author: chromatic Date: 2006-04-13 17:13:31 -0700 (Thu, 13 Apr 2006) ViewCVS: http://svn.sourceforge.net/everydevel/?rev=843&view=rev Log Message: ----------- r15652@windwheel: chromatic | 2006-04-13 17:13:21 -0700 Started adding Test::Class tests for nodetype node. This meant fixing a few mistakes in the node test. Note that the behavior of SUPER() will change soon! Modified Paths: -------------- trunk/ebase/MANIFEST trunk/ebase/lib/Everything/Node/Test/node.pm trunk/ebase/lib/Everything/Node/nodetype.pm trunk/ebase/t/Node/nodetype.t Added Paths: ----------- trunk/ebase/lib/Everything/Node/Test/nodetype.pm Property Changed: ---------------- trunk/ebase/ Property changes on: trunk/ebase ___________________________________________________________________ Name: svk:merge - a6810612-c0f9-0310-9d3e-a9e4af8c5745:/ebase/offline:15650 + a6810612-c0f9-0310-9d3e-a9e4af8c5745:/ebase/offline:15652 Modified: trunk/ebase/MANIFEST =================================================================== --- trunk/ebase/MANIFEST 2006-04-10 23:38:22 UTC (rev 842) +++ trunk/ebase/MANIFEST 2006-04-14 00:13:31 UTC (rev 843) @@ -88,6 +88,7 @@ lib/Everything/Node/usergroup.pm lib/Everything/Node/workspace.pm lib/Everything/Node/Test/node.pm +lib/Everything/Node/Test/nodetype.pm lib/Everything/Nodeball.pm lib/Everything/NodeBase.pm lib/Everything/NodeBase/mysql.pm Modified: trunk/ebase/lib/Everything/Node/Test/node.pm =================================================================== --- trunk/ebase/lib/Everything/Node/Test/node.pm 2006-04-10 23:38:22 UTC (rev 842) +++ trunk/ebase/lib/Everything/Node/Test/node.pm 2006-04-14 00:13:31 UTC (rev 843) @@ -13,9 +13,7 @@ sub node_class { 'Everything::Node::node' } -my $module = 'Everything::Node::node'; - -sub startup :Test( startup => 5 ) +sub startup :Test( startup => 4 ) { my $self = shift; $self->{errors} = []; @@ -39,7 +37,6 @@ } use_ok( $module ) or exit; - is( keys %import, 4, "$module should use several modules" ); ok( $module->isa( 'Everything::Node' ), "$module should extend Everything::Node" ); @@ -1055,3 +1052,5 @@ is( $node->{node_id}, 0, '... should reset node_id' ); ok( $result, '... and return true' ); } + +1; Added: trunk/ebase/lib/Everything/Node/Test/nodetype.pm =================================================================== --- trunk/ebase/lib/Everything/Node/Test/nodetype.pm (rev 0) +++ trunk/ebase/lib/Everything/Node/Test/nodetype.pm 2006-04-14 00:13:31 UTC (rev 843) @@ -0,0 +1,336 @@ +package Everything::Node::Test::nodetype; + +use strict; +use warnings; + +use base 'Everything::Node::Test::node'; +use Test::More; +use SUPER; + +# XXX - hack for now +*Everything::Node::nodetype::SUPER = \&UNIVERSAL::SUPER; + +sub node_class { 'Everything::Node::nodetype' } + +sub startup :Test( +1 ) +{ + my $self = shift; + $self->SUPER::startup(); + isa_ok( $self->node_class()->new(), 'Everything::Node::node' ); +} + +sub test_dbtables :Test( 2 ) +{ + my $self = shift; + my $module = $self->node_class(); + can_ok( $module, 'dbtables' ); + my @tables = $module->dbtables(); + is_deeply( \@tables, [qw( nodetype node )], + 'dbtables() should return node tables' ); +} + +sub test_construct :Test( 16 ) +{ + my $self = shift; + my $node = $self->{node}; + my $db = $self->{mock_db}; + + $node->set_true(qw( SUPER )); + $db->set_true( 'finish' ); + + $node->{node_id} = $node->{extends_nodetype} = 0; + $node->{sqltable} = 'foo,bar,baz'; + + ok( $node->construct(), + 'construct() should always succeed (unless it dies)' ); + + is( $node->next_call(), 'SUPER', '... should call SUPER()' ); + isa_ok( $node->{tableArray}, 'ARRAY', + '... storing necessary tables in "tableArray" field as something that' ); + + $node->{node_id} = 1; + $db->set_always( sqlSelect => 1 ) + ->set_always( sqlSelectJoined => $db ) + ->set_always( fetchrow_hashref => $node ); + + @$node{ + qw( + defaultguest_permission defaultguestaccess defaultgroupaccess + defaultauthoraccess canworkspace maxrevisions defaultauthor_permission + defaultgroup_permission defaultgroup_usergroup defaultotheraccess + defaultother_permission grouptable + ) + } + = ('') x 12; + + $node->construct(); + is( $node->{type}, $node, '... should set node number 1 type to itself' ); + + my ( $method, $args ) = $db->next_call(); + is( $method, 'sqlSelect', '... fetching a node if the node_id is 1' ); + is( join( '-', @$args ), + "$db-node_id-node-title='node' AND type_nodetype=1", + '... with the appropriate parameters' ); + + ( $method, $args ) = $db->next_call(); + is( $method, 'sqlSelectJoined', '... fetching its nodetype data' ); + like( join( ' ', @$args ), qr/\* nodetype.+nodetype_id=/, + '... with the appropriate arguments' ); + is( $db->next_call(), 'fetchrow_hashref', + '... populating nodetype node with nodetype data' ); + + my @fields = + qw( sqltable maxrevisions canworkspace grouptable defaultgroup_usergroup ); + @$node{@fields} = ('') x @fields; + + for my $class (qw( author group guest other )) + { + my @classfields = ( "default${class}access", "default${class}_permission" ); + push @fields, @classfields; + @$node{@classfields} = ( -1, -1 ); + } + + $node->{extends_nodetype} = $node->{node_id} = 6; + + my $parent = { map { $_ => $_, "derived_$_" => $_ } @fields }; + $parent->{derived_defaultguestaccess} = 100; + $node->{defaultguestaccess} = 1; + $parent->{derived_sqltable} = 'boo,far'; + + $db->set_always( getNode => $parent ); + + my $ip; + { + local *Everything::Security::inheritPermissions; + *Everything::Security::inheritPermissions = sub { + $ip = join( ' ', @_ ); + }; + + $node->construct(); + } + + ( $method, $args ) = $db->next_call(2); + is( $method, 'getNode', '... fetching nodetype data, if necessary' ); + is( $args->[1], 6, '... for parent' ); + is( $node->{derived_grouptable}, + 'grouptable', '... should copy derived fields if they are inherited' ); + + # misleading, I know... + is( $node->{defaultgroupaccess}, -1, '... but should not copy other fields' ); + is( $ip, '1 100', + '... should call inheritPermissions() for permission fields' ); + is( $node->{derived_sqltable}, + 'boo,far', '... should add sqltable fields to the list' ); + is( $node->{derived_grouptable}, + 'grouptable', + '... should use parent grouptable if none more specific exists' ); +} + +sub test_destruct :Test() +{ + my $self = shift; + my $node = $self->{node}; + $node->{tableArray} = 1; + $node->destruct(); + ok( !exists $node->{tableArray}, + 'destruct() should remove "tableArray" field' ); +} + +sub test_insert :Test( +4 ) +{ + my $self = shift; + my $node = $self->{node}; + my $db = $self->{mock_db}; + + $node->{extends_nodetype} = 100; + $node->{type_nodetype} = 200; + $self->SUPER::test_insert(); + delete $node->{extends_nodetype}; + $node->{DB} = $db; + $node->set_true( 'SUPER' ); + + $db->set_series( getType => map { { node_id => $_ } } ( 11, 12, 11 ) ); + + $node->insert( 'user' ); + my ( $method, $args ) = $db->next_call(); + is( $method, 'getType', 'insert() with no parent should extend a type' ); + is( $args->[1], 'node', '... the node type, by default' ); + + $node->{extends_nodetype} = 0; + + $node->insert( 'user' ); + is( $node->{extends_nodetype}, 12, '... or if the parent is 0' ); + + # make it extend itself, should not work + $node->{type_nodetype} = 12; + $db->{cache} = $node; + + $node->insert( 'user' ); + isnt( $node->{extends_nodetype}, 12, + '... and should not be allowed to extend itself' ); +} + +sub test_insert_access +{ + my $self = shift; + my $node = $self->{node}; + $node->{extends_nodetype} = 1; + $node->{type_nodetype} = 2; + $self->SUPER::test_insert_access( @_ ); +} + +sub test_insert_restrict_dupes +{ + my $self = shift; + my $node = $self->{node}; + $node->{extends_nodetype} = 1; + $node->{type_nodetype} = 2; + $self->SUPER::test_insert_restrict_dupes( @_ ); +} + +sub test_insert_restrictions +{ + my $self = shift; + my $node = $self->{node}; + $node->{extends_nodetype} = 1; + $node->{type_nodetype} = 2; + $self->SUPER::test_insert_restrictions( @_ ); +} + +sub test_update :Test( +3 ) +{ + my $self = shift; + my $node = $self->{node}; + my $db = $self->{mock_db}; + + $node->set_true( 'flushCacheGlobal' ); + $self->SUPER::test_update( @_ ); + + $db->{cache} = $node; + $node->set_series( SUPER => undef, 47 ); + $node->set_true( 'flushCacheGlobal' )->clear(); + + $node->update(); + is( $node->next_call(), 'SUPER', 'update() should call SUPER()' ); + + $node->{cache} = $node; + is( $node->update(), 47, '... and return the results' ); + is( $node->next_call( 2 ), 'flushCacheGlobal', + '... flushing the global cache, if SUPER() is successful' ); +} + +1; + +__END__ + +# nuke() + +# getTableArray() +$mock->{tableArray} = [ 1 .. 4 ]; +$result = getTableArray($mock); +is( ref $result, 'ARRAY', + 'getTableArray() should return array ref to "tableArray" field' ); +is( scalar @$result, 4, '... and should contain all items' ); +ok( !grep( { $_ eq 'node' } @$result ), + '... should not provide "node" table with no arguments' ); +is( getTableArray( $mock, 1 )->[-1], + 'node', '... but should happily provide it with $mockTable set to true' ); + +# getDefaultTypePermissions() +is( + getDefaultTypePermissions( $mock, 'author' ), + $mock->{derived_defaultauthoraccess}, + 'getDefaultTypePermissions() should return derived permissions for class' +); +ok( + !getDefaultTypePermissions( $mock, 'fakefield' ), + '... should return false if field does not exist' +); +ok( + !exists $mock->{derived_defaultfakefieldaccess}, + '... and should not autovivify bad field' +); + +# getParentType() +$mock->set_always( getType => 88 )->clear(); + +$mock->{extends_nodetype} = 77; +$result = getParentType($mock); +( $method, $args ) = $mock->next_call(); +is( $method, 'getType', + 'getParentType() should get parent type from the database, if it exists' ); +is( $args->[1], 77, '... with the parent id' ); +is( $result, 88, '... returning it' ); + +$mock->{extends_nodetype} = 0; +is( getParentType($mock), undef, + '... but should return false if it fails (underived nodetype)' ); + +# hasTypeAccess() +$mock->set_always( getNode => $mock )->set_always( hasAccess => 'acc' ) + ->clear(); + +hasTypeAccess( $mock, 'user', 'modes' ); +( $method, $args ) = $mock->next_call(); +is( $method, 'getNode', 'hasTypeAccess() should fetch node to check perms' ); +is( + join( '-', @$args ), + "$mock-dummy_access_node-$mock-create force", + '... forcing a dummy nodetype node' +); +( $method, $args ) = $mock->next_call(); +is( $method, 'hasAccess', '... checking access on result' ); +is( join( '-', @$args ), "$mock-user-modes", '... for user and permissions' ); + +# isGroupType() +is( + isGroupType($mock), + $mock->{derived_grouptable}, + 'isGroupType() should return "derived_grouptable" if it exists' +); +delete $mock->{derived_grouptable}, + is( isGroupType($mock), undef, '... and false if it does not' ); + +# derivesFrom() +$mock->set_series( + getType => 0, + { type_nodetype => 2 }, + { type_nodetype => 1, node_id => 88 }, + { type_nodetype => 1, node_id => 99 } +)->set_always( getParentType => $mock )->clear(); + +$result = derivesFrom( $mock, 'foo' ); +is( $mock->next_call(), 'getType', + 'derivesFrom() should find the type of the first parameter' ); +is( $result, 0, '... returning 0 unless it exists' ); + +is( derivesFrom( $mock, 'bar' ), 0, '... or if it is not a nodetype node' ); + +$mock->{node_id} = 77; +my $gpt = 0; +{ + $mock->mock( + getParentType => sub { + return if $gpt; + $gpt = 1; + $mock->{node_id} = 88; + return $mock; + } + ); + $result = derivesFrom( $mock, 'theboatashore' ); +} +ok( $gpt, '... and should walk up hierarchy with getParentType() as needed' ); +is( $result, 1, '... returning true if the nodes are related' ); +is( derivesFrom( $mock, '' ), 0, '... and false otherwise' ); + +# getNodeKeepKeys() +$mock->set_always( SUPER => { foo => 1 } )->clear(); + +$result = getNodeKeepKeys($mock); +is( $mock->next_call(), 'SUPER', 'getNodeKeepKeys() should call SUPER()' ); +is( ref $result, 'HASH', '... and should return a hash reference' ); +is( scalar grep( /default.+access/, keys %$result ), + 4, '... and should save class access keys' ); +is( $result->{defaultgroup_usergroup}, 1, '... and the default usergroup key' ); +is( scalar grep( /default.+permission/, keys %$result ), + 4, '... and default class permission keys' ); Property changes on: trunk/ebase/lib/Everything/Node/Test/nodetype.pm ___________________________________________________________________ Name: svn:mime-type + text/plain; charset=UTF-8 Name: svn:eol-style + native Modified: trunk/ebase/lib/Everything/Node/nodetype.pm =================================================================== --- trunk/ebase/lib/Everything/Node/nodetype.pm 2006-04-10 23:38:22 UTC (rev 842) +++ trunk/ebase/lib/Everything/Node/nodetype.pm 2006-04-14 00:13:31 UTC (rev 843) @@ -170,7 +170,7 @@ sub insert { - my ($this) = @_; + my $this = shift; if ( not defined $this->{extends_nodetype} or $this->{extends_nodetype} == 0 @@ -179,7 +179,7 @@ $this->{extends_nodetype} = $this->{DB}->getType('node')->{node_id}; } - return $this->SUPER(); + return $this->SUPER( @_ ); } =head2 C<update> @@ -193,10 +193,9 @@ sub update { - my ($this) = @_; + my $this = shift; + my $result = $this->SUPER( @_ ); - my $result = $this->SUPER(); - # If the nodetype was successfully updated, we need to flush the # cache to make sure all the nodetypes get reloaded. $this->{DB}{cache}->flushCacheGlobal() if $result; Modified: trunk/ebase/t/Node/nodetype.t =================================================================== --- trunk/ebase/t/Node/nodetype.t 2006-04-10 23:38:22 UTC (rev 842) +++ trunk/ebase/t/Node/nodetype.t 2006-04-14 00:13:31 UTC (rev 843) @@ -3,6 +3,13 @@ use strict; use warnings; +=cut + +use Everything::Node::Test::nodetype; +Everything::Node::Test::nodetype->runtests(); + +=cut + BEGIN { chdir 't' if -d 't'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
