Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284612
Change subject: Straighten out test namespaces; reusable config setup
......................................................................
Straighten out test namespaces; reusable config setup
Change-Id: I2028415797acde1e1ac3bae7c2c526df998665d4
---
M PaymentProviders/Adyen/Tests/phpunit/AuditTest.php
M PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
M PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
M PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php
M PaymentProviders/AstroPay/Tests/phpunit/AuditTest.php
M PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
M PaymentProviders/Worldpay/Tests/phpunit/AuditTest.php
M Tests/BaseSmashPigUnitTestCase.php
M Tests/MessageTest.php
M phpunit.xml
10 files changed, 53 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/12/284612/1
diff --git a/PaymentProviders/Adyen/Tests/phpunit/AuditTest.php
b/PaymentProviders/Adyen/Tests/phpunit/AuditTest.php
index f94d4d5..62a301e 100644
--- a/PaymentProviders/Adyen/Tests/phpunit/AuditTest.php
+++ b/PaymentProviders/Adyen/Tests/phpunit/AuditTest.php
@@ -1,11 +1,13 @@
-<?php namespace SmashPig\PaymentProviders\Adyen\Test;
+<?php
+namespace SmashPig\PaymentProviders\Adyen\Test;
use SmashPig\PaymentProviders\Adyen\Audit\AdyenAudit;
+use SmashPig\Tests\BaseSmashPigUnitTestCase;
/**
* Verify Adyen audit file processor functions
*/
-class AuditTest extends \BaseSmashPigUnitTestCase {
+class AuditTest extends BaseSmashPigUnitTestCase {
/**
* Normal donation
*/
diff --git a/PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
b/PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
index 9f908f1..8fc3539 100644
--- a/PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
+++ b/PaymentProviders/Amazon/Tests/phpunit/ApiTest.php
@@ -1,8 +1,10 @@
<?php
+namespace SmashPig\PaymentProviders\Amazon\Test;
use SmashPig\Core\Configuration;
use SmashPig\Core\Context;
use SmashPig\PaymentProviders\Amazon\AmazonApi;
+use SmashPig\Tests\BaseSmashPigUnitTestCase;
class ApiTest extends BaseSmashPigUnitTestCase {
diff --git a/PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
b/PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
index 0c5e16d..761b0a9 100644
--- a/PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
+++ b/PaymentProviders/Amazon/Tests/phpunit/AuditTest.php
@@ -1,22 +1,17 @@
-<?php namespace SmashPig\PaymentProviders\Amazon\Test;
+<?php
+namespace SmashPig\PaymentProviders\Amazon\Test;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
+use SmashPig\Tests\BaseSmashPigUnitTestCase;
use SmashPig\PaymentProviders\Amazon\Audit\AuditParser;
/**
* Verify Amazon audit file processor functions
*/
-class AuditTest extends \BaseSmashPigUnitTestCase {
+class AuditTest extends BaseSmashPigUnitTestCase {
public function setUp() {
parent::setUp();
- $config = new Configuration(
- __DIR__ . '/../../../../config_defaults.php',
- null,
- 'amazon',
- true
- );
- Context::init( $config );
+
+ $this->initConfig( null, 'amazon' );
}
/**
diff --git a/PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php
b/PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php
index 84c23f0..7e227e7 100644
--- a/PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php
+++ b/PaymentProviders/Amazon/Tests/phpunit/NormalizeTest.php
@@ -1,6 +1,9 @@
<?php
+namespace SmashPig\PaymentProviders\Amazon\Test;
+
use SmashPig\PaymentProviders\Amazon\ExpatriatedMessages\RefundCompleted;
use SmashPig\PaymentProviders\Amazon\ExpatriatedMessages\CaptureCompleted;
+use SmashPig\Tests\BaseSmashPigUnitTestCase;
class NormalizeTest extends BaseSmashPigUnitTestCase {
function setUp() {
diff --git a/PaymentProviders/AstroPay/Tests/phpunit/AuditTest.php
b/PaymentProviders/AstroPay/Tests/phpunit/AuditTest.php
index 229050b..3a3ac1d 100644
--- a/PaymentProviders/AstroPay/Tests/phpunit/AuditTest.php
+++ b/PaymentProviders/AstroPay/Tests/phpunit/AuditTest.php
@@ -1,11 +1,13 @@
-<?php namespace SmashPig\PaymentProviders\AstroPay\Test;
+<?php
+namespace SmashPig\PaymentProviders\AstroPay\Test;
use SmashPig\PaymentProviders\AstroPay\Audit\AstroPayAudit;
+use SmashPig\Tests\BaseSmashPigUnitTestCase;
/**
* Verify AstroPay audit file processor functions
*/
-class AuditTest extends \BaseSmashPigUnitTestCase {
+class AuditTest extends BaseSmashPigUnitTestCase {
/**
* Normal donation
*/
diff --git a/PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
b/PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
index c0ea7ba..668282b 100644
--- a/PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
+++ b/PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
@@ -1,8 +1,10 @@
-<?php namespace SmashPig\PaymentProviders\AstroPay\Test;
+<?php
+namespace SmashPig\PaymentProviders\AstroPay\Test;
use SmashPig\PaymentProviders\AstroPay\ExpatriatedMessages\PaymentMessage;
+use SmashPig\Tests\BaseSmashPigUnitTestCase;
-class NormalizeTest extends \BaseSmashPigUnitTestCase {
+class NormalizeTest extends BaseSmashPigUnitTestCase {
function setUp() {
parent::setUp();
$this->paymentSuccess = $this->loadJson( __DIR__ .
"/../Data/paid.json" );
diff --git a/PaymentProviders/Worldpay/Tests/phpunit/AuditTest.php
b/PaymentProviders/Worldpay/Tests/phpunit/AuditTest.php
index a3b5cce..fbbf2b1 100644
--- a/PaymentProviders/Worldpay/Tests/phpunit/AuditTest.php
+++ b/PaymentProviders/Worldpay/Tests/phpunit/AuditTest.php
@@ -1,13 +1,15 @@
-<?php namespace SmashPig\PaymentProviders\Worldpay\Test;
+<?php
+namespace SmashPig\PaymentProviders\Worldpay\Test;
use SmashPig\Core\Configuration;
use SmashPig\Core\Context;
use SmashPig\PaymentProviders\Worldpay\Audit\WpgReconciliationFile;
+use SmashPig\Tests\BaseSmashPigUnitTestCase;
/**
* Verify Amazon audit file processor functions
*/
-class AuditTest extends \BaseSmashPigUnitTestCase {
+class AuditTest extends BaseSmashPigUnitTestCase {
public function setUp() {
parent::setUp();
$config = new Configuration(
diff --git a/Tests/BaseSmashPigUnitTestCase.php
b/Tests/BaseSmashPigUnitTestCase.php
index e25fd43..4e10f21 100644
--- a/Tests/BaseSmashPigUnitTestCase.php
+++ b/Tests/BaseSmashPigUnitTestCase.php
@@ -1,4 +1,10 @@
<?php
+namespace SmashPig\Tests;
+
+use SmashPig\Core\Configuration;
+use SmashPig\Core\Context;
+
+use PHPUnit_Framework_TestCase;
class BaseSmashPigUnitTestCase extends PHPUnit_Framework_TestCase {
function setUp() {
@@ -7,6 +13,20 @@
require_once __DIR__ . '/../vendor/autoload.php';
}
+ /**
+ * @param string $path path to a testing config file, or null.
+ * @param string $group Configuration key for loading a custom view,
e.g. 'amazon'
+ */
+ function initConfig( $path = null, $group = 'default' ) {
+ $config = new Configuration(
+ __DIR__ . '/../config_defaults.php',
+ $path,
+ $group,
+ true
+ );
+ Context::init( $config );
+ }
+
function loadJson( $path ) {
return json_decode( file_get_contents( $path ), true );
}
diff --git a/Tests/MessageTest.php b/Tests/MessageTest.php
index a88b836..64b3316 100644
--- a/Tests/MessageTest.php
+++ b/Tests/MessageTest.php
@@ -1,11 +1,13 @@
<?php
+namespace SmashPig\Tests;
+
use SmashPig\CrmLink\Messages\DonationInterfaceMessage;
use SmashPig\CrmLink\Messages\DonationInterfaceAntifraud;
/**
* Test CrmLink message functions
*/
-class MessageTest extends \BaseSmashPigUnitTestCase {
+class MessageTest extends BaseSmashPigUnitTestCase {
public function testAntifraudFactory() {
$diMessage = new DonationInterfaceMessage();
diff --git a/phpunit.xml b/phpunit.xml
index ae488a5..a730af7 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -4,9 +4,9 @@
bootstrap="Tests/bootstrap-phpunit.php">
<testsuites>
- <testSuite name="Message tests">
- <file>Tests/MessageTest.php</file>
- </testSuite>
+ <testsuite name="Core tests">
+ <directory>Tests</directory>
+ </testsuite>
<testsuite name="Adyen tests">
<directory>PaymentProviders/Adyen/Tests/phpunit</directory>
</testsuite>
--
To view, visit https://gerrit.wikimedia.org/r/284612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2028415797acde1e1ac3bae7c2c526df998665d4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
