[Everydevel-opers] SF.net SVN: everydevel: [852] trunk/ebase

[<chr...@us...>]

Revision: 852
Author:   chromatic
Date:     2006-05-04 13:16:19 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/everydevel/?rev=852&view=rev

Log Message:
-----------
 r16503@windwheel:  chromatic | 2006-05-04 13:16:07 -0700
 Autodetect node class to test in Everything::Node::Test::node::node_class().

Modified Paths:
--------------
    trunk/ebase/lib/Everything/Node/Test/dbtable.pm
    trunk/ebase/lib/Everything/Node/Test/htmlcode.pm
    trunk/ebase/lib/Everything/Node/Test/node.pm
    trunk/ebase/lib/Everything/Node/Test/nodetype.pm
    trunk/ebase/lib/Everything/Node/Test/setting.pm
    trunk/ebase/lib/Everything/Node/Test/user.pm

Property Changed:
----------------
    trunk/ebase/

Property changes on: trunk/ebase
___________________________________________________________________
Name: svk:merge
   - a6810612-c0f9-0310-9d3e-a9e4af8c5745:/ebase/offline:16501
   + a6810612-c0f9-0310-9d3e-a9e4af8c5745:/ebase/offline:16503

Modified: trunk/ebase/lib/Everything/Node/Test/dbtable.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/dbtable.pm	2006-05-03 19:51:05 UTC (rev 851)
+++ trunk/ebase/lib/Everything/Node/Test/dbtable.pm	2006-05-04 20:16:19 UTC (rev 852)
@@ -10,8 +10,6 @@
 
 *Everything::Node::dbtable::SUPER = \&UNIVERSAL::SUPER;
 
-sub node_class { 'Everything::Node::dbtable' };
-
 sub test_insert :Test( 8 )
 {
 	my $self = shift;

Modified: trunk/ebase/lib/Everything/Node/Test/htmlcode.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/htmlcode.pm	2006-05-03 19:51:05 UTC (rev 851)
+++ trunk/ebase/lib/Everything/Node/Test/htmlcode.pm	2006-05-04 20:16:19 UTC (rev 852)
@@ -10,8 +10,6 @@
 
 *Everything::Node::htmlcode::SUPER = \&UNIVERSAL::SUPER;
 
-sub node_class { 'Everything::Node::htmlcode' }
-
 sub test_dbtables :Test( 2 )
 {
 	my $self  = shift;

Modified: trunk/ebase/lib/Everything/Node/Test/node.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/node.pm	2006-05-03 19:51:05 UTC (rev 851)
+++ trunk/ebase/lib/Everything/Node/Test/node.pm	2006-05-04 20:16:19 UTC (rev 852)
@@ -9,11 +9,18 @@
 use Test::MockObject;
 use Test::MockObject::Extends;
 
-use Scalar::Util 'reftype';
+use Scalar::Util qw( reftype blessed );
 
 local *Everything::Node::SUPER = \&UNIVERSAL::SUPER;
-sub node_class { 'Everything::Node::node' }
 
+sub node_class
+{
+	my $self =  shift;
+	my $name =  blessed( $self );
+	$name    =~ s/Test:://;
+	return $name;
+}
+
 sub startup :Test( startup => 3 )
 {
 	my $self         = shift;

Modified: trunk/ebase/lib/Everything/Node/Test/nodetype.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/nodetype.pm	2006-05-03 19:51:05 UTC (rev 851)
+++ trunk/ebase/lib/Everything/Node/Test/nodetype.pm	2006-05-04 20:16:19 UTC (rev 852)
@@ -10,8 +10,6 @@
 # XXX - hack for now
 *Everything::Node::nodetype::SUPER = \&UNIVERSAL::SUPER;
 
-sub node_class { 'Everything::Node::nodetype' }
-
 sub startup :Test( +1 )
 {
 	my $self = shift;

Modified: trunk/ebase/lib/Everything/Node/Test/setting.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/setting.pm	2006-05-03 19:51:05 UTC (rev 851)
+++ trunk/ebase/lib/Everything/Node/Test/setting.pm	2006-05-04 20:16:19 UTC (rev 852)
@@ -10,8 +10,6 @@
 
 *Everything::Node::setting::SUPER = \&UNIVERSAL::SUPER;
 
-sub node_class { 'Everything::Node::setting' }
-
 sub test_extends :Test( +1 )
 {
 	my $self   = shift;

Modified: trunk/ebase/lib/Everything/Node/Test/user.pm
===================================================================
--- trunk/ebase/lib/Everything/Node/Test/user.pm	2006-05-03 19:51:05 UTC (rev 851)
+++ trunk/ebase/lib/Everything/Node/Test/user.pm	2006-05-04 20:16:19 UTC (rev 852)
@@ -12,8 +12,6 @@
 
 use base 'Everything::Node::Test::setting';
 
-sub node_class { 'Everything::Node::user' }
-
 sub test_extends :Test( +1 )
 {
 	my $self   = shift;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.