Merge branch 'master' into WebGUI8

t/lib/WebGUI/Test.pm

@@ -820,6 +820,10 @@ Example call:
             my ($class, $ident) = @_;
             return WebGUI::Storage->get($CLASS->session, $ident);
         },
+        'SQL' => sub {
+            my (undef, $sql) = @_;
+            return $CLASS->session->db->dbh->prepare($sql);
+        },
     );
 
     my %clone = (
@@ -896,6 +900,10 @@ Example call:
             my $link = shift;
             $link->session->db->write("delete from ldapLink where ldapLinkId=?", [$link->{ldapLinkId}]);
         },
+        'CODE' => sub {
+            (shift)->();
+        },
+        'SQL' => 'execute',
     );
 
     sub cleanupGuard {
@@ -907,9 +915,9 @@ Example call:
             my $construct;
             if ( ref $class ) {
                 my $object = $class;
+                $class = ref $class;
                 my $cloneSub = $CLASS->_findByIsa($class, \%clone);
                 $construct = $cloneSub ? sub { $object->$cloneSub } : sub { $object };
-                $class = ref $class;
             }
             else {
                 my $id = shift;
@@ -959,7 +967,7 @@ sub _findByIsa {
     my $toFind = shift;
     my $hash = shift;
     for my $key ( sort { length $b <=> length $a} keys %$hash ) {
-        if ($toFind->isa($key)) {
+        if ($toFind eq $key || $toFind->isa($key)) {
             return $hash->{$key};
         }
     }

t/lib/WebGUI/Test/Activity.pm

@@ -0,0 +1,109 @@
+package WebGUI::Test::Activity;
+
+use WebGUI::Workflow;
+use WebGUI::Test;
+
+=head Name
+
+package WebGUI::Test::Activity;
+
+=head Description
+
+ This package encapsulates the code required to run
+ an activity.
+
+=head Usage
+
+use WebGUI::Test::Activity;
+
+my $instance = WebGUI::Test::Activity->create( $session, 'WebGUI::Workflow::Activity::RemoveOldCarts', {
+		cartTimeout => 3600,
+} );
+
+is( $instance->run, 'complete', 'activity complete' );
+is( $instance->run, 'done', 'activity done' );
+$instance->reset;
+is( $instance->run, 'complete', 'activity complete' );
+is( $instance->run, 'done', 'activity done' );
+$instance->delete;
+
+=head methods
+
+=head2 create
+
+=params
+
+session -- the session variable
+
+class -- the class for the activity to run
+
+params -- params to set in the workflow
+
+=cut
+
+sub create {
+    my $myClass = shift;
+    my $session = shift;
+    my $activityClass = shift;
+    my $activityParams;
+    if( exists $_[0] and ref $_[0] eq 'HASH' ) {
+        $activityParams = shift ;
+    } else {
+        $activityParams = { @_ };
+    }
+	my $workflow  = WebGUI::Workflow->create($session,
+	    {
+		enabled    => 1,
+		objectType => $activityParams->{objectType} || 'None',
+		mode       => 'realtime',
+	    },
+	);
+        delete $activityParams->{objectType};
+	my $activity = $workflow->addActivity($activityClass);
+    if( scalar( keys %$activityParams ) > 0 ) {
+	$activity->set(%$activityParams);
+    }
+
+	my $instance = WebGUI::Workflow::Instance->create($session,
+	    {
+		workflowId              => $workflow->getId,
+		skipSpectreNotification => 1,
+	    }
+	);
+
+	addToCleanup($workflow);
+
+    return bless { instance => $instance,
+		   session => $session,
+                   workflow => $workflow }, __PACKAGE__;
+}
+
+=head2 run
+
+calls run on the instance of the workflow
+
+=cut
+
+sub run {
+    return $_[0]{instance}->run;
+}
+
+=head2 reset
+
+creates a new instance of the workflow so that it can be re-run
+
+=cut
+
+sub reset {
+    my $self = shift;
+    my $session = $self->{session};
+    $self->{instance} = WebGUI::Workflow::Instance->create($session,
+	{
+	    workflowId              => $self->{workflow}->getId,
+	    skipSpectreNotification => 1,
+	}
+    );
+}
+
+1;
+