Refactored my clumsy tests

I've reworked the class and the tests I showed in my previous post.

This is the refactored class:

	<?php
	class SendingAndRedirectionAction
	{
	private $emailSender;
	private $redirection;
	private $formEmailComposer;
	function __construct(
	EmailSender $emailSender,
	Redirection $redirection,
	FormEmailComposer $formEmailComposer
	) {
	$this->emailSender = $emailSender;
	$this->redirection = $redirection;
	$this->formEmailComposer = $formEmailComposer;
	}
	public function applyOn(Form $form)
	{
	if ($form->isNotFilled()) {
	$this->redirection->backToInitialPage();
	return;
	}
	$email = $this->createEmailFrom($form);
	$sendingSucceeded = $this->send($email);
	$this->redirect($sendingSucceeded);
	}
	private function redirect($sendingSucceeded)
	{
	if ($sendingSucceeded) {
	$this->redirection->toSuccessPage();
	} else {
	$this->redirection->toFailPage();
	}
	}
	private function createEmailFrom(Form $form)
	{
	return $this->formEmailComposer->composeEmailFrom($form);
	}
	private function send(Email $email)
	{
	return $this->emailSender->send($email);
	}
	}

view raw SendingAndRedirectionAction.php hosted with ❤ by GitHub

The responsibility to compose an email from the form fields was delegated to the FormEmailComposer collaborator whereas the responsibility of sending the email was delegated to the EmailSender collaborator.

The Redirection collaborator is still in charge of the redirecting responsibility.

Now the Form and the Email class are just value objects.

These are the new tests:

	<?php
	class SendingAndRedirectionActionTest extends PHPUnit_Framework_TestCase
	{
	private $form;
	private $redirection;
	private $emailSender;
	private $sendingAndRedirectionAction;
	private $WHATEVER_FIELDS;
	private $formEmailComposer;
	private $email;
	function setUp()
	{
	$this->WHATEVER_FIELDS =
	array("fieldName" => "fieldContent");
	$this->redirection = Phake::mock('Redirection');
	$this->email = new Email(
	"from", "to", "subject", "message"
	);
	$this->form = Phake::mock('Form');
	$this->emailSender = Phake::mock('EmailSender');
	$this->formEmailComposer = Phake::mock('FormEmailComposer');
	$this->sendingAndRedirectionAction =
	new SendingAndRedirectionAction(
	$this->emailSender,
	$this->redirection,
	$this->formEmailComposer
	);
	}
	function testRedirectionBackToFormPage()
	{
	$this->whenFormNotFilled();
	$this->sendingAndRedirectionAction->applyOn($this->form);
	Phake::verify($this->redirection)
	->backToInitialPage();
	}
	function testEmailComposition()
	{
	$this->whenFormFilledWithWhateverFields();
	$this->andEmailGetsComposed();
	$this->sendingAndRedirectionAction->applyOn($this->form);
	Phake::verify($this->formEmailComposer)
	->composeEmailFrom($this->form);
	}
	function testEmailSending()
	{
	$this->whenFormFilledWithWhateverFields();
	$this->andEmailGetsComposed();
	$this->sendingAndRedirectionAction->applyOn($this->form);
	Phake::verify($this->emailSender)
	->send($this->email);
	}
	function testRedirectionToSuccesPage()
	{
	$this->whenFormFilledWithWhateverFields();
	$this->andEmailGetsComposed();
	$this->andIsSentSuccessfully();
	$this->sendingAndRedirectionAction->applyOn($this->form);
	Phake::verify($this->redirection)->toSuccessPage();
	}
	function testRedirectionToFailPage()
	{
	$this->whenFormFilledWithWhateverFields();
	$this->andEmailGetsComposed();
	$this->butIsNotSentSuccessfully();
	$this->sendingAndRedirectionAction->applyOn($this->form);
	Phake::verify($this->redirection)->toFailPage();
	}
	private function whenFormFilledWithWhateverFields()
	{
	$this->form = new Form($this->WHATEVER_FIELDS);
	}
	private function whenFormNotFilled()
	{
	$this->form = new Form(array());
	}
	private function andIsSentSuccessfully()
	{
	Phake::when($this->emailSender)
	->send($this->email)
	->thenReturn(true);
	}
	private function butIsNotSentSuccessfully()
	{
	Phake::when($this->emailSender)
	->send($this->email)
	->thenReturn(false);
	}
	private function andEmailGetsComposed()
	{
	Phake::when($this->formEmailComposer)
	->composeEmailFrom($this->form)
	->thenReturn($this->email);
	}
	}

view raw SendingAndRedirectionActionTest.php hosted with ❤ by GitHub

And this is how I'm using the SendingAndRedirectionAction class:

	<?php
	$action =
	Action::aSendByEmailAndRedirection()
	->ofFormIn("academias")
	->to("xxx@ppp.es")
	->build();
	$action->applyOn(new Form($_POST));

view raw use2.php hosted with ❤ by GitHub

I'm a bit happier with the naming and I also reduced the number of classes.
However I'm still concerned about the tests fragility.