Fixed UnitTests

composer.json

@@ -11,6 +11,6 @@
     ],
     "license": "BSD-2-Clause",
     "require-dev": {
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "4.8.*"
     }
 }

tests/bootstrap.php

@@ -13,9 +13,9 @@
 	$project_dir = dirname(dirname(__FILE__));
 
 	$map = array(
-		"MollieHelper"                => "$project_dir/catalog/controller/payment/mollie/helper.php",
-		"ControllerPaymentMollieBase" => "$project_dir/catalog/controller/payment/mollie/base.php",
-		"ModelPaymentMollieBase"      => "$project_dir/catalog/model/payment/mollie/base.php",
+		"MollieHelper"                         => "$project_dir/catalog/controller/extension/payment/mollie/helper.php",
+		"ControllerExtensionPaymentMollieBase" => "$project_dir/catalog/controller/extension/payment/mollie/base.php",
+		"ModelExtensionPaymentMollieBase"      => "$project_dir/catalog/model/extension/payment/mollie/base.php",
 	);
 
 	if (isset($map[$className]))

tests/unittests/catalog/model/ModelPaymentMollieBaseTest.php → tests/unittests/catalog/model/ModelExtensionPaymentMollieIdealTest.php

@@ -1,9 +1,9 @@
 <?php
 
-class ModelPaymentMollieIdealTest extends Mollie_OpenCart_TestCase
+class ModelExtensionPaymentMollieIdealTest extends Mollie_OpenCart_TestCase
 {
 	/**
-	 * @var ModelPaymentMollieIdeal
+	 * @var ModelExtensionPaymentMollieIdeal
 	 */
 	protected $model;
 
@@ -13,7 +13,7 @@ public function setUp()
 	{
 		parent::setUp();
 
-		$this->model = $this->getMock("ModelPaymentMollieBase", array("getAPIClient", "getIssuers", "getCurrentDate"));
+		$this->model = $this->getMock("ModelExtensionPaymentMollieBase", array("getAPIClient", "getIssuers", "getCurrentDate"));
 		$this->model->db = $this->getMock("stub", array("query", "escape", "countAffected"));
 
 		// Mock API client.
@@ -25,10 +25,6 @@ public function setUp()
 			->method("getAPIClient")
 			->willReturn($this->client);
 
-		$this->model
-			->method("getIssuersForMethod")
-			->willReturn(array());
-
 		// Mock model methods.
 		$this->model
 			->method("getCurrentDate")

tests/unittests/translationTest.php

@@ -25,7 +25,11 @@ public function testTranslationFilesHaveIdenticalKeys($orig_path)
 
 		foreach (self::$LANGUAGES as $language)
 		{
-			$lang_path = $path . DIRECTORY_SEPARATOR . $language . DIRECTORY_SEPARATOR . "payment" . DIRECTORY_SEPARATOR . "mollie.php";
+			$lang_path = $path .
+                DIRECTORY_SEPARATOR . $language .
+                DIRECTORY_SEPARATOR . "extension" .
+                DIRECTORY_SEPARATOR . "payment" .
+                DIRECTORY_SEPARATOR . "mollie.php";
 			$_         = array();
 
 			include $lang_path;