From d3065c983dc0d4a4d1912cfe4318aa8039c2b106 Mon Sep 17 00:00:00 2001
From: Tom Oram <tom@scl.co.uk>
Date: Mon, 25 Nov 2013 15:33:10 +0000
Subject: [PATCH] Updated tests to use TestCustomerLocator from SclZfCart test
 suite

---
 src/SclZfCartSagepay/Sagepay.php              |  1 -
 tests/Bootstrap.php                           |  1 +
 tests/SclZfCartSagepayTests/SagepayTest.php   |  2 +-
 .../TestAssets/TestCustomerLocator.php        | 21 -------------------
 tests/config.php                              |  2 +-
 5 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 tests/SclZfCartSagepayTests/TestAssets/TestCustomerLocator.php

diff --git a/src/SclZfCartSagepay/Sagepay.php b/src/SclZfCartSagepay/Sagepay.php
index f150945..b829982 100644
--- a/src/SclZfCartSagepay/Sagepay.php
+++ b/src/SclZfCartSagepay/Sagepay.php
@@ -196,5 +196,4 @@ private function getCallbackUrl($type)
             //['force_canonical' => true]
         );
     }
-
 }
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index a8ad67b..219fd0a 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -18,6 +18,7 @@ public static function init($config)
     {
         $loader = self::getAutoloader();
 
+        $loader->add('SclZfCartTests\\', __DIR__ . '/../vendor/sclinternet/scl-zf-cart/tests');
         $loader->add('SclZfCartSagepayTests\\', __DIR__);
 
         self::$application = \Zend\Mvc\Application::init($config);
diff --git a/tests/SclZfCartSagepayTests/SagepayTest.php b/tests/SclZfCartSagepayTests/SagepayTest.php
index 85ef6e5..30db43c 100644
--- a/tests/SclZfCartSagepayTests/SagepayTest.php
+++ b/tests/SclZfCartSagepayTests/SagepayTest.php
@@ -2,7 +2,7 @@
 namespace SclZfCartSagepayTests;
 
 use SclContact\Contact;
-use SclZfCartSagepayTests\TestAssets\TestCustomerLocator;
+use SclZfCartTests\TestAssets\TestCustomerLocator;
 use SclZfCartSagepay\Options\ConnectionOptions;
 use SclZfCartSagepay\Options\SagepayOptions;
 use SclZfCartSagepay\Sagepay;
diff --git a/tests/SclZfCartSagepayTests/TestAssets/TestCustomerLocator.php b/tests/SclZfCartSagepayTests/TestAssets/TestCustomerLocator.php
deleted file mode 100644
index 11af141..0000000
--- a/tests/SclZfCartSagepayTests/TestAssets/TestCustomerLocator.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace SclZfCartSagepayTests\TestAssets;
-
-use SclZfCart\Customer\CustomerLocatorInterface;
-use SclZfCart\Customer\CustomerInterface;
-
-class TestCustomerLocator implements CustomerLocatorInterface
-{
-    private static $customer;
-
-    public static function setCustomer(CustomerInterface $customer)
-    {
-        self::$customer = $customer;
-    }
-
-    public function getActiveCustomer()
-    {
-        return self::$customer;
-    }
-}
diff --git a/tests/config.php b/tests/config.php
index c1786a3..636a5cd 100644
--- a/tests/config.php
+++ b/tests/config.php
@@ -6,7 +6,7 @@
             'SclZfCart\Customer\CustomerLocatorInterface' => 'test_customer_locator',
         ],
         'invokables' => [
-            'test_customer_locator' => 'SclZfCartSagepayTests\TestAssets\TestCustomerLocator',
+            'test_customer_locator' => 'SclZfCartTests\TestAssets\TestCustomerLocator',
         ],
     ],
 ];