Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356883 )

Change subject: Merge branch 'master' into deployment
......................................................................

Merge branch 'master' into deployment

bc5bfa22 Switch TestingAccessWrapper to librarized version
a818351f When requested GW is disabled, form chooser allows others
ee06df15 Localisation updates from https://translatewiki.net.
6723ff81 Initialize SmashPig in Amazon API entry point
16108165 Fix error serialization in payments.api

Change-Id: Iafce72c09cbf7e5b2767fade28923ccab9207cbe
---
D tests/phpunit/Adapter/Adyen/AdyenTest.php
D tests/phpunit/Adapter/AstroPay/AstroPayTest.php
D tests/phpunit/Adapter/GatewayAdapterTest.php
D tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
D tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
D tests/phpunit/DonationInterfaceTestCase.php
D tests/phpunit/FraudFiltersTest.php
7 files changed, 0 insertions(+), 2,772 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/83/356883/1

diff --git a/tests/phpunit/Adapter/Adyen/AdyenTest.php 
b/tests/phpunit/Adapter/Adyen/AdyenTest.php
deleted file mode 100644
index 6546ecb..0000000
--- a/tests/phpunit/Adapter/Adyen/AdyenTest.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<<<<<<< HEAD   (91ac51 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-use Wikimedia\TestingAccessWrapper;
-
-/**
- *
- * @group Fundraising
- * @group DonationInterface
- * @group Adyen
- */
-class DonationInterface_Adapter_Adyen_Test extends DonationInterfaceTestCase {
-
-       /**
-        * @param $name string The name of the test case
-        * @param $data array Any parameters read from a dataProvider
-        * @param $dataName string|int The name or index of the data set
-        */
-       public function __construct( $name = null, array $data = array(), 
$dataName = '' ) {
-               parent::__construct( $name, $data, $dataName );
-               $this->testAdapterClass = 'TestingAdyenAdapter';
-               DonationInterface::initializeSmashPig( 'adyen' );
-       }
-
-       public function setUp() {
-               parent::setUp();
-
-               $this->setMwGlobals( array(
-                       'wgAdyenGatewayEnabled' => true,
-               ) );
-       }
-
-       /**
-        * Integration test to verify that the donate transaction works as 
expected when all necessary data is present.
-        */
-       function testDoTransactionDonate() {
-               $init = $this->getDonorTestData();
-               $init['payment_submethod'] = 'visa';
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->do_transaction( 'donate' );
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $ret = $exposed->buildRequestParams();
-
-               $expected = array (
-                       'allowedMethods' => 'card',
-                       'billingAddress.street' => $init['street_address'],
-                       'billingAddress.city' => $init['city'],
-                       'billingAddress.postalCode' => $init['postal_code'],
-                       'billingAddress.stateOrProvince' => 
$init['state_province'],
-                       'billingAddress.country' => $init['country'],
-                       'billingAddress.houseNumberOrName' => 'NA',
-                       'billingAddressType' => 2,
-                       'card.cardHolderName' => $init['first_name'] . ' ' . 
$init['last_name'],
-                       'currencyCode' => $init['currency'],
-                       'merchantAccount' => 'wikitest',
-                       'merchantReference' => $exposed->getData_Staged( 
'order_id' ),
-                       'merchantSig' => $exposed->getData_Staged( 
'hpp_signature' ),
-                       'paymentAmount' => ($init['amount']) * 100,
-//                     'sessionValidity' => '2014-03-09T19:41:50+00:00',       
//commenting out, because this is a problem.
-//                     'shipBeforeDate' => $exposed->getData_Staged( 
'expiration' ),   //this too.
-                       'skinCode' => 'testskin',
-                       'shopperLocale' => 'en_US',
-                       'shopperEmail' => 'nob...@wikimedia.org',
-                       'offset' => '52', //once we construct the 
FraudFiltersTestCase, it should land here.
-               );
-
-               //deal with problem keys.
-               //@TODO: Refactor gateway so these are more testable
-               $problems = array (
-                       'sessionValidity',
-                       'shipBeforeDate',
-               );
-
-               foreach ( $problems as $oneproblem ) {
-                       if ( isset( $ret[$oneproblem] ) ) {
-                               unset( $ret[$oneproblem] );
-                       }
-               }
-
-               $this->assertEquals( $expected, $ret, 'Adyen "donate" 
transaction not constructing the expected redirect URL' );
-               $this->assertNotNull( $gateway->getData_Unstaged_Escaped( 
'order_id' ), "Adyen order_id is null, and we need one for 'merchantReference'" 
);
-       }
-
-       function testRiskScoreAddedToQueueMessage() {
-               $init = $this->getDonorTestData();
-               $init['payment_submethod'] = 'visa';
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $exposed->risk_score = 57;
-               $message = $exposed->getStompTransaction();
-               $this->assertEquals( 57, $message['risk_score'], 'Risk score 
was not correctly added to queue message.' );
-       }
-
-       /**
-        * Make sure language is staged correctly when qs param is uppercase
-        */
-       function testLanguageCaseSensitivity() {
-               $init = $this->getDonorTestData();
-               $init['payment_submethod'] = 'visa';
-               $init['language'] = 'FR';
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->do_transaction( 'donate' );
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $ret = $exposed->buildRequestParams();
-
-               $expected = array (
-                       'allowedMethods' => 'card',
-                       'billingAddress.street' => $init['street_address'],
-                       'billingAddress.city' => $init['city'],
-                       'billingAddress.postalCode' => $init['postal_code'],
-                       'billingAddress.stateOrProvince' => 
$init['state_province'],
-                       'billingAddress.country' => $init['country'],
-                       'billingAddress.houseNumberOrName' => 'NA',
-                       'billingAddressType' => 2,
-                       'card.cardHolderName' => $init['first_name'] . ' ' . 
$init['last_name'],
-                       'currencyCode' => $init['currency'],
-                       'merchantAccount' => 'wikitest',
-                       'merchantReference' => $exposed->getData_Staged( 
'order_id' ),
-                       'merchantSig' => $exposed->getData_Staged( 
'hpp_signature' ),
-                       'paymentAmount' => ($init['amount']) * 100,
-                       'skinCode' => 'testskin',
-                       'shopperLocale' => 'fr_US',
-                       'shopperEmail' => 'nob...@wikimedia.org',
-                       'offset' => '52',
-               );
-
-               //deal with problem keys.
-               //@TODO: Refactor gateway so these are more testable
-               $problems = array (
-                       'sessionValidity',
-                       'shipBeforeDate',
-               );
-
-               foreach ( $problems as $oneproblem ) {
-                       if ( isset( $ret[$oneproblem] ) ) {
-                               unset( $ret[$oneproblem] );
-                       }
-               }
-
-               $this->assertEquals( $expected, $ret, 'Adyen "donate" 
transaction not constructing the expected redirect URL' );
-               $this->assertNotNull( $gateway->getData_Unstaged_Escaped( 
'order_id' ), "Adyen order_id is null, and we need one for 'merchantReference'" 
);
-       }
-
-       public function testDonorReturnSuccess() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['language'] = 'FR';
-               $init['order_id'] = '55555';
-               $session['Donor'] = $init;
-               $this->setUpRequest( $init, $session );
-               $gateway = $this->getFreshGatewayObject( array() );
-               $result = $gateway->processDonorReturn( array(
-                       'authResult' => 'AUTHORISED',
-                       'merchantReference' => '55555.0',
-                       'merchantSig' => 
'o1QTd6X/PYrOgLPoSheamR3osAksh6oTaSytsCcJsFA=',
-                       'paymentMethod' => 'visa',
-                       'pspReference' => '123987612346789',
-                       'shopperLocale' => 'fr_FR',
-                       'skinCode' => 'testskin',
-                       'title' => 'Special:AdyenGatewayResult'
-               ) );
-               $this->assertFalse( $result->isFailed() );
-               $this->assertEmpty( $result->getErrors() );
-               // TODO inspect the queue message
-       }
-
-       public function testDonorReturnFailure() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['language'] = 'FR';
-               $init['order_id'] = '55555';
-               $session['Donor'] = $init;
-               $this->setUpRequest( $init, $session );
-               $gateway = $this->getFreshGatewayObject( array() );
-               $result = $gateway->processDonorReturn( array(
-                       'authResult' => 'REFUSED',
-                       'merchantReference' => '55555.0',
-                       'merchantSig' => 
'EVqAiz4nZ8XQ9Wfbm9bOQYaKPV22qdY+/6va7zAo580=',
-                       'paymentMethod' => 'visa',
-                       'pspReference' => '123987612346789',
-                       'shopperLocale' => 'fr_FR',
-                       'skinCode' => 'testskin',
-                       'title' => 'Special:AdyenGatewayResult'
-               ) );
-               $this->assertTrue( $result->isFailed() );
-       }
-}
->>>>>>> BRANCH (161081 Fix error serialization in payments.api)
diff --git a/tests/phpunit/Adapter/AstroPay/AstroPayTest.php 
b/tests/phpunit/Adapter/AstroPay/AstroPayTest.php
deleted file mode 100644
index 0499308..0000000
--- a/tests/phpunit/Adapter/AstroPay/AstroPayTest.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<<<<<<< HEAD   (91ac51 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-use \Psr\Log\LogLevel;
-use Wikimedia\TestingAccessWrapper;
-
-/**
- *
- * @group Fundraising
- * @group DonationInterface
- * @group AstroPay
- */
-class DonationInterface_Adapter_AstroPay_AstroPayTest extends 
DonationInterfaceTestCase {
-
-       /**
-        * @param $name string The name of the test case
-        * @param $data array Any parameters read from a dataProvider
-        * @param $dataName string|int The name or index of the data set
-        */
-       function __construct( $name = null, array $data = array(), $dataName = 
'' ) {
-               parent::__construct( $name, $data, $dataName );
-               $this->testAdapterClass = 'TestingAstroPayAdapter';
-       }
-
-       function setUp() {
-               parent::setUp();
-               $this->setMwGlobals( array(
-                       'wgAstroPayGatewayEnabled' => true,
-               ) );
-       }
-
-       /**
-        * Ensure we're setting the right url for each transaction
-        * @covers AstroPayAdapter::getCurlBaseOpts
-        */
-       function testCurlUrl() {
-               $init = $this->getDonorTestData( 'BR' );
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setCurrentTransaction( 'NewInvoice' );
-
-               $result = $gateway->getCurlBaseOpts();
-
-               $this->assertEquals(
-                       
'https://sandbox.astropay.example.com/api_curl/streamline/NewInvoice',
-                       $result[CURLOPT_URL],
-                       'Not setting URL to transaction-specific value.'
-               );
-       }
-
-       /**
-        * Test the NewInvoice transaction is making a sane request and signing
-        * it correctly
-        */
-       function testNewInvoiceRequest() {
-               $init = $this->getDonorTestData( 'BR' );
-               $session['Donor']['order_id'] = '123456789';
-               $this->setUpRequest( $init, $session );
-               $this->setLanguage( $init['language'] );
-               $gateway = new TestingAstroPayAdapter();
-
-               $gateway->do_transaction( 'NewInvoice' );
-               parse_str( $gateway->curled[0], $actual );
-
-               $expected = array(
-                       'x_login' => 'createlogin',
-                       'x_trans_key' => 'createpass',
-                       'x_invoice' => '123456789',
-                       'x_amount' => '100.00',
-                       'x_currency' => 'BRL',
-                       'x_bank' => 'TE',
-                       'x_country' => 'BR',
-                       'x_description' => wfMessage( 
'donate_interface-donation-description' )->inLanguage( $init['language'] 
)->text(),
-                       'x_iduser' => 'nob...@example.org',
-                       'x_cpf' => '00003456789',
-                       'x_name' => 'Nome Apelido',
-                       'x_email' => 'nob...@example.org',
-                       // 'x_address' => 'Rua Falso 123',
-                       // 'x_zip' => '01110-111',
-                       // 'x_city' => 'São Paulo',
-                       // 'x_state' => 'SP',
-                       'control' => 
'AC43664E0C4DF30607A26F271C8998BC4EE26511366E65AFB69B96E89BFD4359',
-                       'type' => 'json',
-               );
-               $this->assertEquals( $expected, $actual, 'NewInvoice is not 
including the right parameters' );
-       }
-
-       /**
-        * When AstroPay sends back valid JSON with status "0", we should set 
txn
-        * status to true and errors should be empty.
-        */
-       function testStatusNoErrors() {
-               $init = $this->getDonorTestData( 'BR' );
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->do_transaction( 'NewInvoice' );
-
-               $this->assertEquals( true, $gateway->getTransactionStatus(),
-                       'Transaction status should be true for code "0"' );
-
-               $this->assertFalse( $gateway->getErrorState()->hasErrors(),
-                       'Transaction errors should be empty for code "0"' );
-       }
-
-       /**
-        * If astropay sends back non-JSON, communication status should be false
-        */
-       function testGibberishResponse() {
-               $init = $this->getDonorTestData( 'BR' );
-               $this->setLanguage( $init['language'] );
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( 'notJson' );
-
-               $gateway->do_transaction( 'NewInvoice' );
-
-               $this->assertEquals( false, $gateway->getTransactionStatus(),
-                       'Transaction status should be false for bad format' );
-       }
-
-       /**
-        * When AstroPay sends back valid JSON with status "1", we should set
-        * error array to generic error and log a warning.
-        */
-       function testStatusErrors() {
-               $init = $this->getDonorTestData( 'BR' );
-               $this->setLanguage( $init['language'] );
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( '1' );
-
-               $gateway->do_transaction( 'NewInvoice' );
-
-               $errors = $gateway->getErrorState()->getErrors();
-
-               $this->assertEquals(
-                       'internal-0000',
-                       $errors[0]->getErrorCode(),
-                       'Wrong error for code "1"'
-               );
-               $logged = $this->getLogMatches( LogLevel::WARNING, '/This error 
message should appear in the log./' );
-               $this->assertNotEmpty( $logged );
-       }
-
-       /**
-        * do_transaction should set redirect key when we get a valid response.
-        */
-       function testRedirectOnSuccess() {
-               $init = $this->getDonorTestData( 'BR' );
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->do_transaction( 'NewInvoice' );
-
-               // from the test response
-               $expected = 
'https://sandbox.astropaycard.com/go_to_bank?id=A5jvKfK1iHIRUTPXXt8lDFGaRRLzPgBg';
-               $response = $gateway->getTransactionResponse();
-               $this->assertEquals( $expected, $response->getRedirect(),
-                       'do_transaction is not setting the right redirect' );
-       }
-
-       /**
-        * do_transaction should set redirect key when we get a valid response.
-        */
-       function testDoPaymentSuccess() {
-               $init = $this->getDonorTestData( 'BR' );
-               $init['payment_method'] = 'cc';
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $result = $gateway->doPayment();
-
-               // from the test response
-               $expected = 
'https://sandbox.astropaycard.com/go_to_bank?id=A5jvKfK1iHIRUTPXXt8lDFGaRRLzPgBg';
-               $this->assertEquals( $expected, $result->getRedirect(),
-                       'doPayment is not setting the right redirect' );
-       }
-
-       /**
-        * When AstroPay sends back valid JSON with status "1", we should set
-        * error array to generic error and log a warning.
-        */
-       function testDoPaymentErrors() {
-               $init = $this->getDonorTestData( 'BR' );
-               $this->setLanguage( $init['language'] );
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( '1' );
-
-               $result = $gateway->doPayment();
-
-               $errors = $result->getErrors();
-               $this->assertNotEmpty(
-                       $errors,
-                       'Should be an error in PaymentResult'
-               );
-
-               $logged = $this->getLogMatches( LogLevel::WARNING, '/This error 
message should appear in the log./' );
-               $this->assertNotEmpty( $logged );
-               // TODO: Should this really be a refresh, or should we finalize 
to failed here?
-               $this->assertTrue( $result->getRefresh(), 'PaymentResult should 
be a refresh' );
-       }
-
-       /**
-        * Should set a validation error on amount
-        */
-       function testDoPaymentLimitExceeded() {
-               $init = $this->getDonorTestData( 'BR' );
-               $this->setLanguage( $init['language'] );
-               $init['payment_method'] = 'cc';
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( 'limit_exceeded' );
-
-               $result = $gateway->doPayment();
-               $this->assertTrue( $result->getRefresh(), 'PaymentResult should 
be a refresh' );
-
-               $errors = $gateway->getTransactionResponse()->getErrors();
-               $this->assertEquals( 'donate_interface-error-msg-limit', 
$errors[0]->getMessageKey() );
-               $this->assertEquals( 'amount', $errors[0]->getField() );
-       }
-
-       /**
-        * Should set a validation error on fiscal_number
-        */
-       function testDoPaymentBadFiscalNumber() {
-               $init = $this->getDonorTestData( 'BR' );
-               $this->setLanguage( $init['language'] );
-               $init['payment_method'] = 'cc';
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( 'fiscal_number' );
-
-               $result = $gateway->doPayment();
-               $this->assertTrue( $result->getRefresh(), 'PaymentResult should 
be a refresh' );
-
-               $errors = $gateway->getTransactionResponse()->getErrors();
-               $this->assertEquals( 
'donate_interface-error-msg-fiscal_number', $errors[0]->getMessageKey() );
-               $this->assertEquals( 'fiscal_number', $errors[0]->getField() );
-       }
-
-       /**
-        * Should finalize to failed
-        */
-       function testDoPaymentUserUnauthorized() {
-               $init = $this->getDonorTestData( 'BR' );
-               $this->setLanguage( $init['language'] );
-               $init['payment_method'] = 'cc';
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( 'user_unauthorized' );
-
-               $result = $gateway->doPayment();
-               $this->assertTrue( $result->isFailed() );
-       }
-
-       /**
-        * Should tell the user to try again
-        */
-       function testDoPaymentCouldNotRegister() {
-               $init = $this->getDonorTestData( 'BR' );
-               $this->setLanguage( $init['language'] );
-               $init['payment_method'] = 'cc';
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( 'could_not_register' );
-
-               $result = $gateway->doPayment();
-               $this->assertTrue( $result->getRefresh(), 'PaymentResult should 
be a refresh' );
-
-               $errors = $gateway->getTransactionResponse()->getErrors();
-
-               $this->assertEquals( 'internal-0001', 
$errors[0]->getErrorCode() );
-       }
-
-       /**
-        * Should tell the user to try again
-        */
-       function testDoPaymentCouldNotMakeDeposit() {
-               $init = $this->getDonorTestData( 'BR' );
-               $this->setLanguage( $init['language'] );
-               $init['payment_method'] = 'cc';
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( 'could_not_make_deposit' 
);
-
-               $result = $gateway->doPayment();
-               $this->assertTrue( $result->getRefresh(), 'PaymentResult should 
be a refresh' );
-
-               $errors = $gateway->getTransactionResponse()->getErrors();
-
-               $this->assertEquals( 'internal-0001', 
$errors[0]->getErrorCode() );
-       }
-
-       /**
-        * PaymentStatus transaction should interpret the delimited response
-        */
-       function testPaymentStatus() {
-               $init = $this->getDonorTestData( 'BR' );
-               $session['Donor']['order_id'] = '123456789';
-               $this->setUpRequest( $init, $session );
-               $gateway = new TestingAstroPayAdapter();
-
-               $gateway->do_transaction( 'PaymentStatus' );
-
-               // from the test response
-               $expected = array(
-                       'result' => '9',
-                       'x_amount' => '100.00',
-                       'x_iduser' => '08feb2d12771bbcfeb86',
-                       'x_invoice' => '123456789',
-                       'PT' => '1',
-                       'x_control' => 
'0656B92DF44B814D48D84FED2F444CCA1E991A24A365FBEECCCA15B73CC08C2A',
-                       'x_document' => '987654321',
-                       'x_bank' => 'TE',
-                       'x_payment_type' => '03',
-                       'x_bank_name' => 'GNB',
-                       'x_currency' => 'BRL',
-               );
-               $results = $gateway->getTransactionData();
-               $this->assertEquals( $expected, $results,
-                       'PaymentStatus response not interpreted correctly' );
-               // Should not throw exception
-               $gateway->verifyStatusSignature( $results );
-       }
-
-       /**
-        * Invalid signature should be recognized as such.
-        */
-       function testInvalidSignature() {
-               $init = $this->getDonorTestData( 'BR' );
-               $session['Donor']['order_id'] = '123456789';
-               $this->setUpRequest( $init, $session );
-               $gateway = new TestingAstroPayAdapter();
-
-               $gateway->setDummyGatewayResponseCode( 'badsig' );
-               $gateway->do_transaction( 'PaymentStatus' );
-
-               $results = $gateway->getTransactionData();
-               $this->setExpectedException( 'ResponseProcessingException' );
-               $gateway->verifyStatusSignature( $results );
-       }
-
-       /**
-        * If status is paid and signature is correct, processDonorReturn 
should not
-        * throw exception and final status should be 'completed'
-        */
-       function testSuccessfulReturn() {
-               $init = $this->getDonorTestData( 'BR' );
-               $session['Donor']['order_id'] = '123456789';
-               $this->setUpRequest( $init, $session );
-               $gateway = new TestingAstroPayAdapter();
-
-               $requestValues = array(
-                       'result' => '9',
-                       'x_amount' => '100.00',
-                       'x_amount_usd' => '42.05',
-                       'x_control' => 
'DDF89085AC70C0B0628150C51D64419D8592769F2439E3936570E26D24881730',
-                       'x_description' => 'Donation to the Wikimedia 
Foundation',
-                       'x_document' => '32869',
-                       'x_iduser' => '08feb2d12771bbcfeb86',
-                       'x_invoice' => '123456789',
-               );
-
-               $result = $gateway->processDonorReturn( $requestValues );
-               $this->assertFalse( $result->isFailed() );
-               $status = $gateway->getFinalStatus();
-               $this->assertEquals( FinalStatus::COMPLETE, $status );
-       }
-
-       /**
-        * Make sure we record the actual amount charged, even if the donor has
-        * opened a new window and screwed up their session data.
-        */
-       function testReturnUpdatesAmount() {
-               $init = $this->getDonorTestData( 'BR' );
-               $init['amount'] = '22.55'; // junk session data from another 
banner click
-               $session['Donor']['order_id'] = '123456789';
-               $this->setUpRequest( $init, $session );
-               $gateway = new TestingAstroPayAdapter();
-
-               $amount = $gateway->getData_Unstaged_Escaped( 'amount' );
-               $this->assertEquals( '22.55', $amount );
-
-               $requestValues = array(
-                       'result' => '9',
-                       'x_amount' => '100.00',
-                       'x_amount_usd' => '42.05',
-                       'x_control' => 
'DDF89085AC70C0B0628150C51D64419D8592769F2439E3936570E26D24881730',
-                       'x_description' => 'Donation to the Wikimedia 
Foundation',
-                       'x_document' => '32869',
-                       'x_iduser' => '08feb2d12771bbcfeb86',
-                       'x_invoice' => '123456789',
-               );
-
-               $result = $gateway->processDonorReturn( $requestValues );
-               $this->assertFalse( $result->isFailed() );
-               $amount = $gateway->getData_Unstaged_Escaped( 'amount' );
-               $this->assertEquals( '100.00', $amount, 'Not recording correct 
amount' );
-       }
-
-       /**
-        * If payment is rejected, final status should be 'failed'
-        */
-       function testRejectedReturn() {
-               $init = $this->getDonorTestData( 'BR' );
-               $session['Donor']['order_id'] = '123456789';
-               $this->setUpRequest( $init, $session );
-               $gateway = new TestingAstroPayAdapter();
-
-               $requestValues = array(
-                       'result' => '8', // rejected by bank
-                       'x_amount' => '100.00',
-                       'x_amount_usd' => '42.05',
-                       'x_control' => 
'706F57BC3E74906B14B1DEB946F027104513797CC62AC0F5107BC98F42D5DC95',
-                       'x_description' => 'Donation to the Wikimedia 
Foundation',
-                       'x_document' => '32869',
-                       'x_iduser' => '08feb2d12771bbcfeb86',
-                       'x_invoice' => '123456789',
-               );
-
-               $result = $gateway->processDonorReturn( $requestValues );
-               $this->assertTrue( $result->isFailed() );
-               $status = $gateway->getFinalStatus();
-               $this->assertEquals( FinalStatus::FAILED, $status );
-       }
-
-       function testStageBankCode() {
-               $init = $this->getDonorTestData( 'BR' );
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'elo';
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->doPayment();
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $bank_code = $exposed->getData_Staged( 'bank_code' );
-               $this->assertEquals( 'EL', $bank_code, 'Not setting bank_code 
in doPayment' );
-       }
-
-       /**
-        * Test that we run the AntiFraud filters before redirecting
-        */
-       function testAntiFraudFilters() {
-               DonationInterface_FraudFiltersTest::setupFraudMaps( $this );
-               $init = $this->getDonorTestData( 'BR' );
-               $init['payment_method'] = 'cc';
-               $init['bank_code'] = 'VD';
-               // following data should trip fraud alarms
-               $init['utm_medium'] = 'somethingmedia';
-               $init['utm_source'] = 'somethingmedia';
-               $init['email'] = 'someb...@wikipedia.org';
-
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $result = $gateway->doPayment();
-
-               $this->assertTrue( $result->isFailed(), 'Result should be 
failure if fraud filters say challenge' );
-               $this->assertEquals( 'challenge', 
$gateway->getValidationAction(), 'Validation action is not as expected' );
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $this->assertEquals( 60, $exposed->risk_score, 'RiskScore is 
not as expected' );
-       }
-
-       function testStageFiscalNumber() {
-               $init = $this->getDonorTestData( 'BR' );
-               $init['fiscal_number'] = '000.034.567-89';
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->doPayment();
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $staged = $exposed->getData_Staged( 'fiscal_number' );
-               $this->assertEquals( '00003456789', $staged, 'Not stripping 
fiscal_number punctuation in doPayment' );
-       }
-
-       /**
-        * We should increment the order ID with each NewInvoice call
-        */
-       function testNewInvoiceOrderId() {
-               $init = $this->getDonorTestData( 'BR' );
-               $firstRequest = $this->setUpRequest( $init );
-               $firstAttempt = new TestingAstroPayAdapter();
-               $firstAttempt->setDummyGatewayResponseCode( '1' );
- 
-               $firstAttempt->doPayment();
-
-               $this->setUpRequest( $init, $firstRequest->getSessionArray() );
-               $secondAttempt = new TestingAstroPayAdapter();
-               $secondAttempt->doPayment();
-
-               parse_str( $firstAttempt->curled[0], $firstParams );
-               parse_str( $secondAttempt->curled[0], $secondParams );
-
-               $this->assertNotEquals( $firstParams['x_invoice'], 
$secondParams['x_invoice'],
-                       'Not generating new order id for NewInvoice call'
-               );
-       }
-
-       /**
-        * We should increment the order ID with each NewInvoice call, even when
-        * retrying inside a single doPayment call
-        */
-       function testNewInvoiceOrderIdRetry() {
-               $init = $this->getDonorTestData( 'BR' );
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( 'collision' );
- 
-               $gateway->doPayment();
-
-               parse_str( $gateway->curled[0], $firstParams );
-               parse_str( $gateway->curled[1], $secondParams );
-
-               $this->assertNotEquals( $firstParams['x_invoice'], 
$secondParams['x_invoice'],
-                       'Not generating new order id for retried NewInvoice 
call'
-               );
-       }
-
-       /**
-        * We should show an error for incompatible country / currency 
combinations
-        */
-       function testBadCurrencyForCountry() {
-               $init = $this->getDonorTestData( 'BR' );
-               $init['currency'] = 'CLP';
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $errorState = $gateway->getErrorState();
-
-               $this->assertTrue(
-                       $errorState->hasValidationError( 'currency' ),
-                       'Should show a currency code error for trying to use 
CLP in BR'
-               );
-       }
-
-       function testDummyFiscalNumber() {
-               $init = $this->getDonorTestData( 'MX' );
-               $init['payment_submethod'] = 'visa';
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->doPayment();
-
-               parse_str( $gateway->curled[0], $firstParams );
-               $fiscalNumber = $firstParams['x_cpf'];
-               $this->assertEquals(
-                       13, strlen( $fiscalNumber ),
-                       'Fake fiscal number should be 13 digits'
-               );
-       }
-}
->>>>>>> BRANCH (161081 Fix error serialization in payments.api)
diff --git a/tests/phpunit/Adapter/GatewayAdapterTest.php 
b/tests/phpunit/Adapter/GatewayAdapterTest.php
deleted file mode 100644
index d570957..0000000
--- a/tests/phpunit/Adapter/GatewayAdapterTest.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<<<<<<< HEAD   (91ac51 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-use Wikimedia\TestingAccessWrapper;
-
-/**
- * TODO: Test everything.
- * Make sure all the basic functions in the gateway_adapter are tested here.
- * Also, the filters firing properly and... that the fail score they give
- * back is acted upon in the way we think it does.
- * Hint: For that mess, use GatewayAdapter's $debugarray
- *
- * Also, note that it barely makes sense to test the functions that need to be
- * defined in each gateway as per the abstract class. If we did that here, we'd
- * basically be just testing the test code. So, don't do it.
- * Those should definitely be tested in the various gateway-specific test
- * classes.
- *
- * @group Fundraising
- * @group DonationInterface
- * @group Splunge
- */
-class DonationInterface_Adapter_GatewayAdapterTest extends 
DonationInterfaceTestCase {
-
-       /**
-        * @param $name string The name of the test case
-        * @param $data array Any parameters read from a dataProvider
-        * @param $dataName string|int The name or index of the data set
-        */
-       public function __construct( $name = null, array $data = array(), 
$dataName = '' ) {
-               global $wgDonationInterfaceAllowedHtmlForms;
-               global $wgDonationInterfaceTest;
-               $wgDonationInterfaceTest = true;
-               parent::__construct( $name, $data, $dataName );
-       }
-
-       public function setUp() {
-               parent::setUp();
-
-               $this->setMwGlobals( array(
-                       'wgDonationInterfaceAllowedHtmlForms' => array(
-                               'testytest' => array(
-                                       'gateway' => 'globalcollect', // RAR.
-                               ),
-                               'rapidFailError' => array(
-                                       'file' => 'error-cc.html',
-                                       'gateway' => array( 'globalcollect', 
'adyen', 'amazon', 'astropay', 'paypal' ),
-                                       'special_type' => 'error',
-                               )
-                       ),
-               ) );
-       }
-
-       /**
-        *
-        * @covers GatewayAdapter::__construct
-        * @covers GatewayAdapter::defineVarMap
-        * @covers GatewayAdapter::defineReturnValueMap
-        * @covers GatewayAdapter::defineTransactions
-        */
-       public function testConstructor() {
-
-               $options = $this->getDonorTestData();
-               $class = $this->testAdapterClass;
-
-               $_SERVER['REQUEST_URI'] = 
GatewayFormChooser::buildPaymentsFormURL(
-                       'testytest', array( 'gateway' => 
$class::getIdentifier() )
-               );
-               $gateway = $this->getFreshGatewayObject( $options );
-
-               $this->assertInstanceOf( TESTS_ADAPTER_DEFAULT, $gateway );
-
-               $this->resetAllEnv();
-               $gateway = $this->getFreshGatewayObject( $options = array() );
-               $this->assertInstanceOf( TESTS_ADAPTER_DEFAULT, $gateway, 
"Having trouble constructing a blank adapter." );
-       }
-
-       /**
-        *
-        * @covers GatewayAdapter::__construct
-        * @covers DonationData::__construct
-        */
-       public function testConstructorHasDonationData() {
-
-               $_SERVER['REQUEST_URI'] = 
'/index.php/Special:GlobalCollectGateway?form_name=TwoStepAmount';
-
-               $options = $this->getDonorTestData();
-               $gateway = $this->getFreshGatewayObject( $options );
-
-               $this->assertInstanceOf( 'TestingGlobalCollectAdapter', 
$gateway );
-
-               // please define this function only inside the 
TESTS_ADAPTER_DEFAULT,
-               // which should be a test adapter object that descende from one 
of the
-               // production adapters.
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $this->assertInstanceOf( 'DonationData', $exposed->dataObj );
-       }
-
-       public function testLanguageChange() {
-               $options = $this->getDonorTestData( 'US' );
-               $options['payment_method'] = 'cc';
-               $options['payment_submethod'] = 'visa';
-               $gateway = $this->getFreshGatewayObject( $options );
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $this->assertEquals( $exposed->getData_Staged( 'language' ), 
'en', "'US' donor's language was inproperly set. Should be 'en'" );
-               $gateway->do_transaction( 'INSERT_ORDERWITHPAYMENT' );
-               // so we know it tried to screw with the session and such.
-
-               $options = $this->getDonorTestData( 'NO' );
-               $gateway = $this->getFreshGatewayObject( $options );
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $this->assertEquals( $exposed->getData_Staged( 'language' ), 
'no', "'NO' donor's language was inproperly set. Should be 'no'" );
-       }
-
-       /**
-        * Make sure data is cleared out when changing gateways.
-        * In particular, ensure order IDs aren't leaking.
-        */
-       public function testResetOnGatewaySwitch() {
-               // Fill the session with some GlobalCollect stuff
-               $init = $this->getDonorTestData( 'FR' );
-               $init['payment_method'] = 'cc';
-               $firstRequest = $this->setUpRequest( $init );
-               $globalcollect_gateway = new TestingGlobalCollectAdapter();
-               $globalcollect_gateway->do_transaction( 
'INSERT_ORDERWITHPAYMENT' );
-
-               $session = $firstRequest->getSessionArray();
-               $this->assertEquals( 'globalcollect', 
$session['Donor']['gateway'], 'Test setup failed.' );
-
-               //Then simulate switching to Adyen
-               $session['sequence'] = 2;
-               unset( $init['order_id'] );
-
-               $secondRequest = $this->setUpRequest( $init, $session );
-               $adyen_gateway = new TestingAdyenAdapter();
-               $adyen_gateway->batch_mode = true;
-
-               $session = $secondRequest->getSessionArray();
-               $ctId = $adyen_gateway->getData_Unstaged_Escaped( 
'contribution_tracking_id' );
-               $expected_order_id = "$ctId.{$session['sequence']}";
-               $this->assertEquals( $expected_order_id, 
$adyen_gateway->getData_Unstaged_Escaped( 'order_id' ),
-                       'Order ID was not regenerated on gateway switch!' );
-       }
-
-       public function testResetOnRecurringSwitch() {
-               // Donor initiates a non-recurring donation
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-
-               $firstRequest = $this->setUpRequest( $init );
-
-               $gateway = new TestingGlobalCollectAdapter();
-               $oneTimeOrderId = $gateway->getData_Unstaged_Escaped( 
'order_id' );
-               $gateway->do_transaction( 'INSERT_ORDERWITHPAYMENT' );
-
-               $donorData = $firstRequest->getSessionData( 'Donor' );
-               $this->assertEquals( '', $donorData['recurring'], 'Test setup 
failed.' );
-
-               // Then they go back and decide they want to make a recurring 
donation
-
-               $init['recurring'] = '1';
-               $secondRequest = $this->setUpRequest( $init, 
$firstRequest->getSessionArray() );
-
-               $gateway = new TestingGlobalCollectAdapter();
-               $recurOrderId = $gateway->getData_Unstaged_Escaped( 'order_id' 
);
-               $gateway->do_transaction( 'INSERT_ORDERWITHPAYMENT' );
-               $donorData = $secondRequest->getSessionData( 'Donor' );
-               $this->assertEquals( '1', $donorData['recurring'], 'Test setup 
failed.' );
-
-
-               $this->assertNotEquals( $oneTimeOrderId, $recurOrderId,
-                       'Order ID was not regenerated on recurring switch!' );
-       }
-
-       public function testResetSubmethodOnMethodSwitch() {
-               // Donor thinks they want to make a bank transfer, submits form
-               $init = $this->getDonorTestData( 'BR' );
-               $init['payment_method'] = 'bt';
-               $init['payment_submethod'] = 'itau';
-
-               $firstRequest = $this->setUpRequest( $init );
-
-               $gateway = new TestingAstroPayAdapter();
-               $gateway->do_transaction( 'NewInvoice' );
-
-               $donorData = $firstRequest->getSessionData( 'Donor' );
-               $this->assertEquals( 'itau', $donorData['payment_submethod'], 
'Test setup failed.' );
-
-               // Then they go back and decide they want to donate via credit 
card
-               $init['payment_method'] = 'cc';
-               unset( $init['payment_submethod'] );
-
-               $secondRequest = $this->setUpRequest( $init, 
$firstRequest->getSessionArray() );
-
-               $gateway = new TestingAstroPayAdapter();
-               $newMethod = $gateway->getData_Unstaged_Escaped( 
'payment_method' );
-               $newSubmethod = $gateway->getData_Unstaged_Escaped( 
'payment_submethod' );
-
-               $this->assertEquals( 'cc', $newMethod, 'Test setup failed' );
-               $this->assertEquals( '', $newSubmethod, 'Submethod was not 
blanked on method switch' );
-       }
-
-       public function testStreetStaging() {
-               $options = $this->getDonorTestData( 'BR' );
-               unset( $options['street_address'] );
-               $options['payment_method'] = 'cc';
-               $options['payment_submethod'] = 'visa';
-               $this->setUpRequest( $options );
-               $gateway = new TestingGlobalCollectAdapter();
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $exposed->stageData();
-
-               $this->assertEquals( 'N0NE PROVIDED', $exposed->getData_Staged( 
'street_address' ),
-                       'Street must be stuffed with fake data to prevent AVS 
scam.' );
-       }
-
-       public function testPostalCodeStaging() {
-               $options = $this->getDonorTestData( 'BR' );
-               unset( $options['postal_code'] );
-               $options['payment_method'] = 'cc';
-               $options['payment_submethod'] = 'visa';
-               $this->setUpRequest( $options );
-               $gateway = new TestingGlobalCollectAdapter();
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $exposed->stageData();
-
-               $this->assertEquals( '0', $exposed->getData_Staged( 
'postal_code' ),
-                       'Postal code must be stuffed with fake data to prevent 
AVS scam.' );
-       }
-
-       public function testGetRapidFailPage() {
-               $this->setMwGlobals( array(
-                       'wgDonationInterfaceRapidFail' => true,
-               ) );
-               $options = $this->getDonorTestData( 'US' );
-               $options['payment_method'] = 'cc';
-               $gateway = $this->getFreshGatewayObject( $options );
-               $this->assertEquals( 'rapidFailError', 
ResultPages::getFailPage( $gateway ) );
-       }
-
-       public function testGetFallbackFailPage() {
-               $this->setMwGlobals( array(
-                       'wgDonationInterfaceRapidFail' => false,
-                       'wgDonationInterfaceFailPage' => 'Main_Page', //coz we 
know it exists
-               ) );
-               $options = $this->getDonorTestData( 'US' );
-               $gateway = $this->getFreshGatewayObject( $options );
-               $page = ResultPages::getFailPage( $gateway );
-               $expectedTitle = Title::newFromText( 'Main_Page' );
-               $expectedURL = wfAppendQuery( $expectedTitle->getFullURL(), 
'uselang=en' );
-               $this->assertEquals( $expectedURL, $page );
-       }
-
-       // TODO: Move to ResultsPagesTest.php
-       public function testGetFailPageForType() {
-               $url = ResultPages::getFailPageForType( 'GlobalCollectAdapter' 
);
-               $expectedTitle = Title::newFromText( 'Donate-error' );
-               $expectedURL = wfAppendQuery( $expectedTitle->getFullURL(), 
'uselang=en' );
-               $this->assertEquals( $expectedURL, $url );
-       }
-
-       public function testCancelPage() {
-               $this->setMwGlobals( array(
-                       'wgDonationInterfaceCancelPage' => 'Ways to give'
-               ) );
-               $gateway = $this->getFreshGatewayObject();
-               $url = ResultPages::getCancelPage( $gateway );
-               $expectedTitle = Title::newFromText( 'Ways to give/en' );
-               $this->assertEquals( $expectedTitle->getFullURL(), $url );
-       }
-
-       public function testCannotOverrideIp() {
-               $data = $this->getDonorTestData( 'FR' );
-               unset( $data['country'] );
-               $data['user_ip'] = '8.8.8.8';
-
-               $gateway = $this->getFreshGatewayObject( $data );
-               $this->assertEquals( '127.0.0.1', 
$gateway->getData_Unstaged_Escaped( 'user_ip' ) );
-       }
-
-       public function testCanOverrideIpInBatchMode() {
-               $data = $this->getDonorTestData( 'FR' );
-               unset( $data['country'] );
-               $data['user_ip'] = '8.8.8.8';
-
-               $gateway = $this->getFreshGatewayObject( $data, array( 
'batch_mode' => true ) );
-               $this->assertEquals( '8.8.8.8', 
$gateway->getData_Unstaged_Escaped( 'user_ip' ) );
-       }
-
-       function testGetScoreName() {
-               $rule = array(
-                       'KeyMapA' => array( 'a','s','d','f','q','w','e','r','t' 
),
-                       'KeyMapB' => array(),
-                       'GibberishWeight' => .9,
-                       'Score' => 10
-               );
-               $this->setMwGlobals(
-                       array( 'wgDonationInterfaceNameFilterRules' => array( 
$rule ) )
-               );
-               $init = $this->getDonorTestData();
-               $init['first_name'] = 'asdf';
-               $init['last_name'] = 'qwert';
-
-               $gateway = $this->getFreshGatewayObject( $init );
-               $result = $gateway->getScoreName();
-               $this->assertNotEquals( 0, $result, 'Bad name not detected');
-       }
-
-       public function TestSetValidationAction() {
-               $data = $this->getDonorTestData( 'FR' );
-               $gateway = $this->getFreshGatewayObject( $data );
-               $gateway->setValidationAction( 'process' );
-               $this->assertEquals( 'process', 
$gateway->getValidationAction(), 'Setup failed' );
-               $gateway->setValidationAction( 'reject' );
-               $this->assertEquals( 'reject', $gateway->getValidationAction(), 
'Unable to escalate action' );
-               $gateway->setValidationAction( 'process' );
-               $this->assertEquals( 'reject', $gateway->getValidationAction(), 
'De-escalating action without reset!' );
-       }
-}
-
->>>>>>> BRANCH (161081 Fix error serialization in payments.api)
diff --git 
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php 
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
deleted file mode 100644
index fb0e2cc..0000000
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<<<<<<< HEAD   (91ac51 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-use Psr\Log\LogLevel;
-use Wikimedia\TestingAccessWrapper;
-
-/**
- *
- * @group Fundraising
- * @group DonationInterface
- * @group GlobalCollect
- * @group OrphanSlayer
- */
-class DonationInterface_Adapter_GlobalCollect_Orphans_GlobalCollectTest 
extends DonationInterfaceTestCase {
-       public function setUp() {
-               parent::setUp();
-
-               $this->setMwGlobals( array(
-                       'wgGlobalCollectGatewayEnabled' => true,
-                       'wgDonationInterfaceAllowedHtmlForms' => array(
-                               'cc-vmad' => array(
-                                       'gateway' => 'globalcollect',
-                                       'payment_methods' => array('cc' => 
array( 'visa', 'mc', 'amex', 'discover' )),
-                                       'countries' => array(
-                                               '+' => array( 'US', ),
-                                       ),
-                               ),
-                       ),
-               ) );
-       }
-
-       /**
-        * @param $name string The name of the test case
-        * @param $data array Any parameters read from a dataProvider
-        * @param $dataName string|int The name or index of the data set
-        */
-       function __construct( $name = null, array $data = array(), $dataName = 
'' ) {
-               parent::__construct( $name, $data, $dataName );
-               $this->testAdapterClass = 'TestingGlobalCollectOrphanAdapter';
-               $this->dummy_utm_data = array (
-                       'utm_source' => 'dummy_source',
-                       'utm_campaign' => 'dummy_campaign',
-                       'utm_medium' => 'dummy_medium',
-                       'date' => time(),
-               );
-       }
-
-       public function testConstructor() {
-
-               $options = $this->getDonorTestData();
-               $class = $this->testAdapterClass;
-
-               $gateway = $this->getFreshGatewayObject();
-
-               $this->assertInstanceOf( $class, $gateway );
-
-               $this->verifyNoLogErrors();
-       }
-
-
-       public function testBatchOrderID_generate() {
-
-               //no data on construct, generate Order IDs
-               $gateway = $this->getFreshGatewayObject( null, array ( 
'order_id_meta' => array ( 'generate' => TRUE ) ) );
-               $this->assertTrue( $gateway->getOrderIDMeta( 'generate' ), 'The 
order_id meta generate setting override is not working properly. Order_id 
generation may be broken.' );
-               $this->assertNotNull( $gateway->getData_Unstaged_Escaped( 
'order_id' ), 'Failed asserting that an absent order id is not left as null, 
when generating our own' );
-
-               $data = array_merge( $this->getDonorTestData(), 
$this->dummy_utm_data );
-               $data['order_id'] = '55555';
-
-               //now, add data and check that we didn't kill the oid. Still 
generating.
-               $gateway->loadDataAndReInit( $data );
-               $this->assertEquals( $gateway->getData_Unstaged_Escaped( 
'order_id' ), '55555', 'loadDataAndReInit failed to stick OrderID' );
-
-               $data['order_id'] = '444444';
-               $gateway->loadDataAndReInit( $data );
-               $this->assertEquals( $gateway->getData_Unstaged_Escaped( 
'order_id' ), '444444', 'loadDataAndReInit failed to stick OrderID' );
-
-               $this->verifyNoLogErrors();
-       }
-
-       public function testBatchOrderID_no_generate() {
-
-               //no data on construct, do not generate Order IDs
-               $gateway = $this->getFreshGatewayObject( null, array ( 
'order_id_meta' => array ( 'generate' => FALSE ) ) );
-               $this->assertFalse( $gateway->getOrderIDMeta( 'generate' ), 
'The order_id meta generate setting override is not working properly. Deferred 
order_id generation may be broken.' );
-               $this->assertEmpty( $gateway->getData_Unstaged_Escaped( 
'order_id' ), 'Failed asserting that an absent order id is left as null, when 
not generating our own' );
-
-               $data = array_merge( $this->getDonorTestData(), 
$this->dummy_utm_data );
-               $data['order_id'] = '66666';
-
-               //now, add data and check that we didn't kill the oid. Still 
not generating
-               $gateway->loadDataAndReInit( $data );
-               $this->assertEquals( $gateway->getData_Unstaged_Escaped( 
'order_id' ), '66666', 'loadDataAndReInit failed to stick OrderID' );
-
-               $data['order_id'] = '777777';
-               $gateway->loadDataAndReInit( $data );
-               $this->assertEquals( $gateway->getData_Unstaged_Escaped( 
'order_id' ), '777777', 'loadDataAndReInit failed to stick OrderID on second 
batch item' );
-
-               $this->verifyNoLogErrors();
-       }
-
-       /**
-        * Tests to make sure that certain error codes returned from GC will
-        * trigger order cancellation, even if retryable errors also exist.
-        * @dataProvider mcNoRetryCodeProvider
-        */
-       public function testNoMastercardFinesForRepeatOnBadCodes( $code ) {
-               $gateway = $this->getFreshGatewayObject( null, array ( 
'order_id_meta' => array ( 'generate' => FALSE ) ) );
-
-               //Toxic card should not retry, even if there's an order id 
collision
-               $init = array_merge( $this->getDonorTestData(), 
$this->dummy_utm_data );
-               $init['ffname'] = 'cc-vmad';
-               $init['order_id'] = '55555';
-               $init['email'] = 'innoc...@clean.com';
-               $init['contribution_tracking_id'] = mt_rand();
-               $gateway->loadDataAndReInit( $init );
-
-               $gateway->setDummyGatewayResponseCode( $code );
-               $result = $gateway->do_transaction( 'Confirm_CreditCard' );
-               $this->assertEquals( 1, count( $gateway->curled ), "Gateway 
kept trying even with response code $code!  MasterCard could fine us a thousand 
bucks for that!" );
-               $this->assertEquals( false, $result->getCommunicationStatus(), 
"Error code $code should mean status of do_transaction is false" );
-               $errors = $result->getErrors();
-               $this->assertFalse( empty( $errors ), 'Orphan adapter needs to 
see the errors to consider it rectified' );
-               $finder = function( $error ) {
-                       return $error->getErrorCode() == '1000001';
-               };
-               $this->assertNotEmpty( array_filter( $errors, $finder ), 
'Orphan adapter needs error 1000001 to consider it rectified' );
-               $loglines = $this->getLogMatches( LogLevel::INFO, "/Got error 
code $code, not retrying to avoid MasterCard fines./" );
-               $this->assertNotEmpty( $loglines, "GC Error $code is not 
generating the expected payments log error" );
-       }
-
-       /**
-        * Make sure we're incorporating GET_ORDERSTATUS AVS and CVV responses 
into
-        * fraud scores.
-        */
-       function testGetOrderstatusPostProcessFraud() {
-               $this->setMwGlobals( array(
-                       'wgDonationInterfaceEnableCustomFilters' => true,
-                       'wgGlobalCollectGatewayCustomFiltersFunctions' => array(
-                               'getCVVResult' => 10,
-                               'getAVSResult' => 30,
-                       ),
-               ) );
-               $gateway = $this->getFreshGatewayObject( null, array ( 
'order_id_meta' => array ( 'generate' => FALSE ) ) );
-
-               $init = array_merge( $this->getDonorTestData(), 
$this->dummy_utm_data );
-               $init['ffname'] = 'cc-vmad';
-               $init['order_id'] = '55555';
-               $init['email'] = 'innoc...@manichean.com';
-               $init['contribution_tracking_id'] = mt_rand();
-               $init['payment_method'] = 'cc';
-
-               $gateway->loadDataAndReInit( $init );
-               $gateway->setDummyGatewayResponseCode( '600_badCvv' );
-
-               $gateway->do_transaction( 'Confirm_CreditCard' );
-               $action = $gateway->getValidationAction();
-               $this->assertEquals( 'review', $action,
-                       'Orphan gateway should fraud fail on bad CVV and AVS' );
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $this->assertEquals( 40, $exposed->risk_score,
-                       'Risk score was incremented correctly.' );
-       }
-}
->>>>>>> BRANCH (161081 Fix error serialization in payments.api)
diff --git a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php 
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
deleted file mode 100644
index d190ace..0000000
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
+++ /dev/null
@@ -1,641 +0,0 @@
-<<<<<<< HEAD   (91ac51 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-use Psr\Log\LogLevel;
-use Wikimedia\TestingAccessWrapper;
-
-/**
- *
- * @group Fundraising
- * @group DonationInterface
- * @group GlobalCollect
- */
-class DonationInterface_Adapter_GlobalCollect_GlobalCollectTest extends 
DonationInterfaceTestCase {
-       public function setUp() {
-               parent::setUp();
-
-               $this->setMwGlobals( array(
-                       'wgGlobalCollectGatewayEnabled' => true,
-                       'wgDonationInterfaceAllowedHtmlForms' => array(
-                               'cc-vmad' => array(
-                                       'gateway' => 'globalcollect',
-                                       'payment_methods' => array('cc' => 
array( 'visa', 'mc', 'amex', 'discover' )),
-                                       'countries' => array(
-                                               '+' => array( 'US', ),
-                                       ),
-                               ),
-                       ),
-               ) );
-       }
-
-       /**
-        * @param $name string The name of the test case
-        * @param $data array Any parameters read from a dataProvider
-        * @param $dataName string|int The name or index of the data set
-        */
-       function __construct( $name = null, array $data = array(), $dataName = 
'' ) {
-               parent::__construct( $name, $data, $dataName );
-               $this->testAdapterClass = 'TestingGlobalCollectAdapter';
-       }
-
-       /**
-        * testnormalizeOrderID
-        * Non-exhaustive integration tests to verify that order_id
-        * normalization works as expected with different settings and
-        * conditions in theGlobalCollect adapter
-        * @covers GatewayAdapter::normalizeOrderID
-        */
-       public function testNormalizeOrderID() {
-               $request = $this->getDonorTestData();
-               $externalData = $this->getDonorTestData();
-               $session = array( 'Donor' => $this->getDonorTestData() );
-
-               //no order_id from anywhere, explicit no generate
-               $gateway = $this->getFreshGatewayObject( $externalData, array ( 
'order_id_meta' => array ( 'generate' => FALSE ) ) );
-               $this->assertFalse( $gateway->getOrderIDMeta( 'generate' ), 
'The order_id meta generate setting override is not working properly. Deferred 
order_id generation may be broken.' );
-               $this->assertNull( $gateway->getData_Unstaged_Escaped( 
'order_id' ), 'Failed asserting that an absent order id is left as null, when 
not generating our own' );
-
-               //no order_id from anywhere, explicit generate
-               $gateway = $this->getFreshGatewayObject( $externalData, array ( 
'order_id_meta' => array ( 'generate' => TRUE ) ) );
-               $this->assertTrue( $gateway->getOrderIDMeta( 'generate' ), 'The 
order_id meta generate setting override is not working properly. Self order_id 
generation may be broken.' );
-               $this->assertInternalType( 'numeric', 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Generated order_id is not 
numeric, which it should be for GlobalCollect' );
-
-               // conflicting order_id in request and session, default GC 
generation
-               $request['order_id'] = '55555';
-               $session['Donor']['order_id'] = '44444';
-               $this->setUpRequest( $request, $session );
-               $gateway = new TestingGlobalCollectAdapter();
-               $this->assertEquals( '55555', 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'GlobalCollect gateway is 
preferring session data over the request. Session should be secondary.' );
-
-               // conflicting order_id in request and session, garbage data in 
request, default GC generation
-               $request['order_id'] = 'nonsense!';
-               $this->setUpRequest( $request, $session );
-               $gateway = new TestingGlobalCollectAdapter();
-               $this->assertEquals( '44444', 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'GlobalCollect gateway is not 
ignoring nonsensical order_id candidates' );
-
-               // order_id in session, default GC generation
-               unset( $request['order_id'] );
-               $this->setUpRequest( $request, $session );
-               $gateway = new TestingGlobalCollectAdapter();
-               $this->assertEquals( '44444', 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'GlobalCollect gateway is not 
recognizing the session order_id' );
-
-               // conflicting order_id in external data, request and session, 
explicit GC generation, batch mode
-               $request['order_id'] = '33333';
-               $externalData['order_id'] = '22222';
-               $this->setUpRequest( $request, $session );
-               $gateway = $this->getFreshGatewayObject( $externalData, array ( 
'order_id_meta' => array ( 'generate' => true ), 'batch_mode' => true ) );
-               $this->assertEquals( $externalData['order_id'], 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Failed asserting that an 
extrenally provided order id is being honored in batch mode' );
-
-               //make sure that decimal numbers are rejected by GC. Should be 
a toss and regen
-               $externalData['order_id'] = '2143.0';
-               unset( $request['order_id'] );
-               unset( $session['Donor']['order_id'] );
-               $this->setUpRequest( $request, $session );
-               //conflicting order_id in external data, request and session, 
explicit GC generation, batch mode
-               $gateway = $this->getFreshGatewayObject( $externalData, array ( 
'order_id_meta' => array ( 'generate' => true, 'disallow_decimals' => true ), 
'batch_mode' => true ) );
-               $this->assertNotEquals( $externalData['order_id'], 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Failed assering that a 
decimal order_id was regenerated, when disallow_decimals is true' );
-       }
-
-       /**
-        * Non-exhaustive integration tests to verify that order_id, when in
-        * self-generation mode, won't regenerate until it is told to.
-        * @covers GatewayAdapter::normalizeOrderID
-        * @covers GatewayAdapter::regenerateOrderID
-        */
-       function testStickyGeneratedOrderID() {
-               $init = self::$initial_vars;
-               unset( $init['order_id'] );
-
-               //no order_id from anywhere, explicit generate
-               $gateway = $this->getFreshGatewayObject( $init, array ( 
'order_id_meta' => array ( 'generate' => TRUE ) ) );
-               $this->assertNotNull( $gateway->getData_Unstaged_Escaped( 
'order_id' ), 'Generated order_id is null. The rest of this test is broken.' );
-               $original_order_id = $gateway->getData_Unstaged_Escaped( 
'order_id' );
-
-               $gateway->normalizeOrderID();
-               $this->assertEquals( $original_order_id, 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Re-normalized order_id has 
changed without explicit regeneration.' );
-
-               //this might look a bit strange, but we need to be able to 
generate valid order_ids without making them stick to anything.
-               $gateway->generateOrderID();
-               $this->assertEquals( $original_order_id, 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'function generateOrderID 
auto-changed the selected order ID. Not cool.' );
-
-               $gateway->regenerateOrderID();
-               $this->assertNotEquals( $original_order_id, 
$gateway->getData_Unstaged_Escaped( 'order_id' ), 'Re-normalized order_id has 
not changed, after explicit regeneration.' );
-       }
-
-       /**
-        * Integration test to verify that order_id can be retrieved from
-        * performing an INSERT_ORDERWITHPAYMENT.
-        */
-       function testOrderIDRetrieval() {
-               $init = $this->getDonorTestData();
-               unset( $init['order_id'] );
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-
-               //no order_id from anywhere, explicit generate
-               $gateway = $this->getFreshGatewayObject( $init, array ( 
'order_id_meta' => array ( 'generate' => FALSE ) ) );
-               $this->assertNull( $gateway->getData_Unstaged_Escaped( 
'order_id' ), 'Ungenerated order_id is not null. The rest of this test is 
broken.' );
-
-               $gateway->do_transaction( 'INSERT_ORDERWITHPAYMENT' );
-
-               $this->assertNotNull( $gateway->getData_Unstaged_Escaped( 
'order_id' ), 'No order_id was retrieved from INSERT_ORDERWITHPAYMENT' );
-       }
-
-       /**
-        * Just run the GET_ORDERSTATUS transaction and make sure we load the 
data
-        */
-       function testGetOrderStatus() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@safedomain.org';
-
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->do_transaction( 'GET_ORDERSTATUS' );
-
-               $data = $gateway->getTransactionData();
-
-               $this->assertEquals( 'N', $data['CVVRESULT'], 'CVV Result not 
loaded from XML response' );
-       }
-
-       /**
-        * Don't fraud-fail someone for bad CVV if GET_ORDERSTATUS
-        * comes back with STATUSID 25 and no CVVRESULT
-        * @group CvvResult
-        */
-       function testConfirmCreditCardStatus25() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@safedomain.org';
-
-               $this->setUpRequest( array( 'CVVRESULT' => 'M' ) );
-
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( '25' );
-
-               $gateway->do_transaction( 'Confirm_CreditCard' );
-               $action = $gateway->getValidationAction();
-               $this->assertEquals( 'process', $action, 'Gateway should not 
fraud fail on STATUSID 25' );
-       }
-
-       /**
-        * Make sure we're incorporating GET_ORDERSTATUS AVS and CVV responses 
into
-        * fraud scores.
-        */
-       function testGetOrderstatusPostProcessFraud() {
-               $this->setMwGlobals( array(
-                       'wgDonationInterfaceEnableCustomFilters' => true,
-                       'wgGlobalCollectGatewayCustomFiltersFunctions' => array(
-                               'getCVVResult' => 10,
-                               'getAVSResult' => 30,
-                       ),
-               ) );
-
-               $init = $this->getDonorTestData();
-               $init['ffname'] = 'cc-vmad';
-               $init['order_id'] = '55555';
-               $init['email'] = 'innoc...@manichean.com';
-               $init['contribution_tracking_id'] = mt_rand();
-               $init['payment_method'] = 'cc';
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->setDummyGatewayResponseCode( '600_badCvv' );
-
-               $gateway->do_transaction( 'Confirm_CreditCard' );
-               $action = $gateway->getValidationAction();
-               $this->assertEquals( 'review', $action,
-                       'Orphan gateway should fraud fail on bad CVV and AVS' );
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $this->assertEquals( 40, $exposed->risk_score,
-                       'Risk score was incremented correctly.' );
-       }
-
-       /**
-        * Ensure the Confirm_CreditCard transaction prefers CVVRESULT from the 
XML
-        * over any value from the querystring
-        */
-       function testConfirmCreditCardPrefersXmlCvv() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@safedomain.org';
-
-               $this->setUpRequest( array( 'CVVRESULT' => 'M' ) );
-
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $gateway->do_transaction( 'Confirm_CreditCard' );
-
-               $this->assertEquals( 'N', 
$gateway->getData_Unstaged_Escaped('cvv_result'), 'CVV Result not taken from 
XML response' );
-       }
-
-       /**
-        * Make sure we record the actual amount charged, even if the donor has
-        * opened a new window and screwed up their session data.
-        */
-       function testConfirmCreditCardUpdatesAmount() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@safedomain.org';
-               // The values in session are not the values we originally used
-               // for INSERT_ORDERWITHPAYMENT
-               $init['amount'] = '12.50';
-               $init['currency'] = 'USD';
-
-               $gateway = $this->getFreshGatewayObject( $init );
-
-               $amount = $gateway->getData_Unstaged_Escaped( 'amount' );
-               $currency = $gateway->getData_Unstaged_Escaped( 'currency' );
-               $this->assertEquals( '12.50', $amount );
-               $this->assertEquals( 'USD', $currency );
-
-               $gateway->do_transaction( 'Confirm_CreditCard' );
-
-               $amount = $gateway->getData_Unstaged_Escaped( 'amount' );
-               $currency = $gateway->getData_Unstaged_Escaped( 'currency' );
-               $this->assertEquals( '23.45', $amount, 'Not recording correct 
amount' );
-               $this->assertEquals( 'EUR', $currency, 'Not recording correct 
currency'  );
-       }
-
-       /**
-        * testDefineVarMap
-        *
-        * This is tested with a bank transfer from Spain.
-        *
-        * @covers GlobalCollectAdapter::__construct
-        * @covers GlobalCollectAdapter::defineVarMap
-        */
-       public function testDefineVarMap() {
-
-               $gateway = $this->getFreshGatewayObject( self::$initial_vars );
-
-               $var_map = array(
-                       'ORDERID' => 'order_id',
-                       'AMOUNT' => 'amount',
-                       'CURRENCYCODE' => 'currency',
-                       'LANGUAGECODE' => 'language',
-                       'COUNTRYCODE' => 'country',
-                       'MERCHANTREFERENCE' => 'contribution_tracking_id',
-                       'RETURNURL' => 'returnto',
-                       'IPADDRESS' => 'server_ip',
-                       'ISSUERID' => 'issuer_id',
-                       'PAYMENTPRODUCTID' => 'payment_product',
-                       'CVV' => 'cvv',
-                       'EXPIRYDATE' => 'expiration',
-                       'CREDITCARDNUMBER' => 'card_num',
-                       'FIRSTNAME' => 'first_name',
-                       'SURNAME' => 'last_name',
-                       'STREET' => 'street_address',
-                       'CITY' => 'city',
-                       'STATE' => 'state_province',
-                       'ZIP' => 'postal_code',
-                       'EMAIL' => 'email',
-                       'ACCOUNTHOLDER' => 'account_holder',
-                       'ACCOUNTNAME' => 'account_name',
-                       'ACCOUNTNUMBER' => 'account_number',
-                       'ADDRESSLINE1E' => 'address_line_1e',
-                       'ADDRESSLINE2' => 'address_line_2',
-                       'ADDRESSLINE3' => 'address_line_3',
-                       'ADDRESSLINE4' => 'address_line_4',
-                       'ATTEMPTID' => 'attempt_id',
-                       'AUTHORISATIONID' => 'authorization_id',
-                       'BANKACCOUNTNUMBER' => 'bank_account_number',
-                       'BANKAGENZIA' => 'bank_agenzia',
-                       'BANKCHECKDIGIT' => 'bank_check_digit',
-                       'BANKCODE' => 'bank_code',
-                       'BANKFILIALE' => 'bank_filiale',
-                       'BANKNAME' => 'bank_name',
-                       'BRANCHCODE' => 'branch_code',
-                       'COUNTRYCODEBANK' => 'country_code_bank',
-                       'COUNTRYDESCRIPTION' => 'country_description',
-                       'CUSTOMERBANKCITY' => 'customer_bank_city',
-                       'CUSTOMERBANKSTREET' => 'customer_bank_street',
-                       'CUSTOMERBANKNUMBER' => 'customer_bank_number',
-                       'CUSTOMERBANKZIP' => 'customer_bank_zip',
-                       'DATECOLLECT' => 'date_collect',
-                       'DESCRIPTOR' => 'descriptor',
-                       'DIRECTDEBITTEXT' => 'direct_debit_text',
-                       'DOMICILIO' => 'domicilio',
-                       'EFFORTID' => 'effort_id',
-                       'IBAN' => 'iban',
-                       'IPADDRESSCUSTOMER' => 'user_ip',
-                       'PAYMENTREFERENCE' => 'payment_reference',
-                       'PROVINCIA' => 'provincia',
-                       'SPECIALID' => 'special_id',
-                       'SWIFTCODE' => 'swift_code',
-                       'TRANSACTIONTYPE' => 'transaction_type',
-                       'FISCALNUMBER' => 'fiscal_number',
-                       'AVSRESULT' => 'avs_result',
-                       'CVVRESULT' => 'cvv_result',
-               );
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $this->assertEquals( $var_map, $exposed->var_map );
-       }
-
-       public function testLanguageStaging() {
-               $options = $this->getDonorTestData( 'NO' );
-               $options['payment_method'] = 'cc';
-               $options['payment_submethod'] = 'visa';
-               $gateway = $this->getFreshGatewayObject( $options );
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $exposed->stageData();
-
-               $this->assertEquals( $exposed->getData_Staged( 'language' ), 
'no', "'NO' donor's language was inproperly set. Should be 'no'" );
-       }
-
-       public function testLanguageFallbackStaging() {
-               $options = $this->getDonorTestData( 'Catalonia' );
-               $options['payment_method'] = 'cc';
-               $options['payment_submethod'] = 'visa';
-               $gateway = $this->getFreshGatewayObject( $options );
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $exposed->stageData();
-
-               // Requesting the fallback language from the gateway.
-               $this->assertEquals( 'en', $exposed->getData_Staged( 'language' 
) );
-       }
-
-       /**
-        * Make sure unstaging functions don't overwrite core donor data.
-        */
-       public function testAddResponseData_underzealous() {
-               $options = $this->getDonorTestData( 'Catalonia' );
-               $options['payment_method'] = 'cc';
-               $options['payment_submethod'] = 'visa';
-               $gateway = $this->getFreshGatewayObject( $options );
-
-               // This will set staged_data['language'] = 'en'.
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $exposed->stageData();
-
-               $ctid = mt_rand();
-
-               $gateway->addResponseData( array(
-                       'contribution_tracking_id' => $ctid . '.1',
-               ) );
-
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               // Desired vars were written into normalized data.
-               $this->assertEquals( $ctid, $exposed->dataObj->getVal( 
'contribution_tracking_id' ) );
-
-               // Language was not overwritten.
-               $this->assertEquals( 'ca', $exposed->dataObj->getVal( 
'language' ) );
-       }
-
-       /**
-        * Tests to make sure that certain error codes returned from GC will or
-        * will not create payments error loglines.
-        */
-       function testCCLogsOnGatewayError() {
-               $init = $this->getDonorTestData( 'US' );
-               unset( $init['order_id'] );
-               $init['ffname'] = 'cc-vmad';
-
-               //this should not throw any payments errors: Just an invalid 
card.
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( '430285' );
-               $gateway->do_transaction( 'GET_ORDERSTATUS' );
-               $this->verifyNoLogErrors();
-
-               //Now test one we want to throw a payments error
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( '21000050' );
-               $gateway->do_transaction( 'GET_ORDERSTATUS' );
-               $loglines = $this->getLogMatches( LogLevel::ERROR, 
'/Investigation required!/' );
-               $this->assertNotEmpty( $loglines, 'GC Error 21000050 is not 
generating the expected payments log error' );
-
-               //Reset logs
-               $this->testLogger->messages = array();
-
-               //Most irritating version of 20001000 - They failed to enter an 
expiration date on GC's form. This should log some specific info, but not an 
error.
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( '20001000-expiry' );
-               $gateway->do_transaction( 'GET_ORDERSTATUS' );
-               $this->verifyNoLogErrors();
-               $loglines = $this->getLogMatches( LogLevel::INFO, 
'/processResponse:.*EXPIRYDATE/' );
-               $this->assertNotEmpty( $loglines, 'GC Error 20001000-expiry is 
not generating the expected payments log line' );
-       }
-
-       /**
-        * Tests to make sure that certain error codes returned from GC will
-        * trigger order cancellation, even if retryable errors also exist.
-        * @dataProvider mcNoRetryCodeProvider
-        */
-       public function testNoMastercardFinesForRepeatOnBadCodes( $code ) {
-               $init = $this->getDonorTestData( 'US' );
-               unset( $init['order_id'] );
-               $init['ffname'] = 'cc-vmad';
-               //Make it not look like an orphan
-               $this->setUpRequest( array(
-                       'CVVRESULT' => 'M',
-                       'AVSRESULT' => '0'
-               ) );
-
-               //Toxic card should not retry, even if there's an order id 
collision
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( $code );
-               $gateway->do_transaction( 'Confirm_CreditCard' );
-               $this->assertEquals( 1, count( $gateway->curled ), "Gateway 
kept trying even with response code $code!  MasterCard could fine us a thousand 
bucks for that!" );
-       }
-
-       /**
-        * Tests that two API requests don't send the same order ID and merchant
-        * reference.  This was the case when users doubleclicked and we were
-        * using the last 5 digits of time in seconds as a suffix.  We want to 
see
-        * what happens when a 2nd request comes in while the 1st is still 
waiting
-        * for a CURL response, so here we fake that situation by having CURL 
throw
-        * an exception during the 1st response.
-        */
-       public function testNoDupeOrderId( ) {
-               $this->setUpRequest( array(
-                       'action'=>'donate',
-                       'amount'=>'3.00',
-                       'card_type'=>'amex',
-                       'city'=>'Hollywood',
-                       'contribution_tracking_id'=>'22901382',
-                       'country'=>'US',
-                       'currency'=>'USD',
-                       'email'=>'faketyf...@gmail.com',
-                       'first_name'=>'Fakety',
-                       'format'=>'json',
-                       'gateway'=>'globalcollect',
-                       'language'=>'en',
-                       'last_name'=>'Fake',
-                       'payment_method'=>'cc',
-                       'referrer'=>'http://en.wikipedia.org/wiki/Main_Page',
-                       'state_province'=>'MA',
-                       'street_address'=>'99 Fake St',
-                       'utm_campaign'=>'C14_en5C_dec_dsk_FR',
-                       'utm_medium'=>'sitenotice',
-                       'utm_source'=>'B14_120921_5C_lg_fnt_sans.no-LP.cc',
-                       'postal_code'=>'90210'
-               ) );
-
-               $gateway = new TestingGlobalCollectAdapter();
-               $gateway->setDummyGatewayResponseCode( 'Exception' );
-               try {
-                       $gateway->do_transaction( 'INSERT_ORDERWITHPAYMENT' );
-               }
-               catch ( Exception $e ) {
-                       // totally expected this
-               }
-               $first = $gateway->curled[0];
-               //simulate another request coming in before we get anything 
back from GC
-               $anotherGateway = new TestingGlobalCollectAdapter();
-               $anotherGateway->do_transaction( 'INSERT_ORDERWITHPAYMENT' );
-               $second = $anotherGateway->curled[0];
-               $this->assertFalse( $first == $second, 'Two calls to the api 
did the same thing');
-       }
-
-       /**
-        * Tests to see that we don't claim we're going to retry when we aren't
-        * going to. For GC, we really only want to retry on code 300620
-        * @dataProvider benignNoRetryCodeProvider
-        */
-       public function testNoClaimRetryOnBoringCodes( $code ) {
-               $init = $this->getDonorTestData( 'US' );
-               unset( $init['order_id'] );
-               $init['ffname'] = 'cc-vmad';
-               //Make it not look like an orphan
-               $this->setUpRequest( array(
-                       'CVVRESULT' => 'M',
-                       'AVSRESULT' => '0'
-               ) );
-
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( $code );
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $start_id = $exposed->getData_Staged( 'order_id' );
-               $gateway->do_transaction( 'Confirm_CreditCard' );
-               $finish_id = $exposed->getData_Staged( 'order_id' );
-               $loglines = $this->getLogMatches( LogLevel::INFO, '/Repeating 
transaction on request for vars:/' );
-               $this->assertEmpty( $loglines, "Log says we are going to repeat 
the transaction for code $code, but that is not true" );
-               $this->assertEquals( $start_id, $finish_id, "Needlessly 
regenerated order id for code $code ");
-       }
-
-       /**
-        * doPayment should return an iframe result with normal data
-        */
-       function testDoPaymentSuccess() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@clean.com';
-               $init['ffname'] = 'cc-vmad';
-               unset( $init['order_id'] );
-
-               $gateway = $this->getFreshGatewayObject( $init );
-               $result = $gateway->doPayment();
-               $this->assertEmpty( $result->isFailed(), 'PaymentResult should 
not be failed' );
-               $this->assertEmpty( $result->getErrors(), 'PaymentResult should 
have no errors' );
-               $this->assertEquals( 'url_placeholder', $result->getIframe(), 
'PaymentResult should have iframe set' );
-       }
-
-       /**
-        * doPayment should recover from an attempt to use a duplicate order ID.
-        */
-       function testDuplicateOrderId() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@localhost.net';
-               $init['ffname'] = 'cc-vmad';
-               unset( $init['order_id'] );
-
-               $gateway = $this->getFreshGatewayObject( $init );
-               $orig_id = $gateway->getData_Unstaged_Escaped( 'order_id' );
-               $gateway->setDummyGatewayResponseCode( function ( $gateway ) 
use ( $orig_id ) {
-                       if ( $gateway->getData_Unstaged_Escaped( 'order_id' ) 
=== $orig_id ) {
-                               return 'duplicate';
-                       } else {
-                               return null;
-                       }
-               } );
-               $result = $gateway->doPayment();
-               $this->assertEmpty( $result->isFailed(), 'PaymentResult should 
not be failed' );
-               $this->assertEmpty( $result->getErrors(), 'PaymentResult should 
have no errors' );
-               $this->assertNotEquals( $gateway->getData_Unstaged_Escaped( 
'order_id' ), $orig_id,
-                       'Order ID regenerated in DonationData.' );
-               $this->assertNotEquals( $gateway->session_getData( 'order_id' 
), $orig_id,
-                       'Order ID regenerated in session.' );
-       }
-
-       /**
-        * doPayment should recover from Ingenico-side timeouts.
-        */
-       function testTimeoutRecover() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@localhost.net';
-               $init['ffname'] = 'cc-vmad';
-
-               $gateway = $this->getFreshGatewayObject( $init );
-               $gateway->setDummyGatewayResponseCode( '11000400' );
-               $gateway->do_transaction( 'SET_PAYMENT' );
-               $loglines = $this->getLogMatches( LogLevel::INFO, '/Repeating 
transaction for timeout/' );
-               $this->assertNotEmpty( $loglines, "Log does not say we retried 
for timeout." );
-       }
-
-       public function testDonorReturnSuccess() {
-               $init = $this->getDonorTestData( 'FR' );
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@localhost.net';
-               $init['order_id'] = mt_rand();
-               $session['Donor'] = $init;
-               $this->setUpRequest( $init, $session );
-               $gateway = $this->getFreshGatewayObject( array() );
-               $result = $gateway->processDonorReturn( array(
-                       'REF' => $init['order_id'],
-                       'CVVRESULT' => 'M',
-                       'AVSRESULT' => '0'
-               ) );
-               $this->assertFalse( $result->isFailed() );
-               $this->assertEmpty( $result->getErrors() );
-               // TODO inspect the queue message
-       }
-
-       public function testDonorReturnFailure() {
-               $init = $this->getDonorTestData();
-               $init['payment_method'] = 'cc';
-               $init['payment_submethod'] = 'visa';
-               $init['email'] = 'innoc...@localhost.net';
-               $init['order_id'] = mt_rand();
-               $session['Donor'] = $init;
-               $this->setUpRequest( $init, $session );
-               $gateway = $this->getFreshGatewayObject( array() );
-               $gateway->setDummyGatewayResponseCode( '430285' ); // invalid 
card
-               $result = $gateway->processDonorReturn( array(
-                       'REF' => $init['order_id'],
-                       'CVVRESULT' => 'M',
-                       'AVSRESULT' => '0'
-               ) );
-               $this->assertTrue( $result->isFailed() );
-       }
-}
->>>>>>> BRANCH (161081 Fix error serialization in payments.api)
diff --git a/tests/phpunit/DonationInterfaceTestCase.php 
b/tests/phpunit/DonationInterfaceTestCase.php
deleted file mode 100644
index 7164f36..0000000
--- a/tests/phpunit/DonationInterfaceTestCase.php
+++ /dev/null
@@ -1,707 +0,0 @@
-<<<<<<< HEAD   (91ac51 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-use Psr\Log\LogLevel;
-use SmashPig\Core\Context;
-use Wikimedia\TestingAccessWrapper;
-
-/**
- * @group              Fundraising
- * @group              QueueHandling
- * @group              ClassMethod
- * @group              ListenerAdapter
- *
- * @category   UnitTesting
- * @package            Fundraising_QueueHandling
- */
-abstract class DonationInterfaceTestCase extends MediaWikiTestCase {
-
-       /**
-        * An array of the vars we expect to be set before people hit payments.
-        * @var array
-        */
-       public static $initial_vars = array (
-               'ffname' => 'testytest',
-               'referrer' => 'www.yourmom.com', //please don't go there.
-               'currency' => 'USD',
-       );
-
-       /**
-        * This will be set by a test method with the adapter object.
-        *
-        * @var GatewayAdapter  $gatewayAdapter
-        */
-       protected $gatewayAdapter;
-
-       /**
-        * @var TestingDonationLogger
-        */
-       protected $testLogger;
-       protected $testAdapterClass = TESTS_ADAPTER_DEFAULT;
-
-       /**
-        * @param $name string The name of the test case
-        * @param $data array Any parameters read from a dataProvider
-        * @param $dataName string|int The name or index of the data set
-        */
-       public function __construct( $name = null, array $data = array(), 
$dataName = '' ) {
-
-               //Just in case you got here without running the configuration...
-               global $wgDonationInterfaceTestMode;
-               $wgDonationInterfaceTestMode = true;
-
-               parent::__construct( $name, $data, $dataName );
-       }
-
-       protected function setUp() {
-               // TODO: Use SmashPig dependency injection instead.  Also 
override
-               // SmashPig core logger.
-               $this->testLogger = new TestingDonationLogger();
-               DonationLoggerFactory::$overrideLogger = $this->testLogger;
-               $this->setMwGlobals( array(
-                       'wgDonationInterfaceEnableQueue' => true,
-                       'wgDonationInterfaceDefaultQueueServer' => array(
-                               'type' => 'TestingQueue',
-                       ),
-               ) );
-               parent::setUp();
-       }
-
-       protected function tearDown() {
-               $this->resetAllEnv();
-               TestingQueue::clearAll();
-               DonationLoggerFactory::$overrideLogger = null;
-               parent::tearDown();
-       }
-
-       /**
-        * Set up a fake request with the given data. Returns the fake request.
-        * @param array $data
-        * @param array $session
-        * @return FauxRequest
-        */
-       protected function setUpRequest( $data, $session = null ) {
-               RequestContext::resetMain();
-               $request = new FauxRequest( $data, false, $session );
-               RequestContext::getMain()->setRequest( $request );
-               return $request;
-       }
-
-       /**
-        * Set global language for the duration of the test
-        *
-        * @param string $language language code to force
-        */
-       protected function setLanguage( $language ) {
-               RequestContext::getMain()->setLanguage( $language );
-               // BackCompat
-               $this->setMwGlobals( 'wgLang', 
RequestContext::getMain()->getLanguage() );
-       }
-
-       /**
-        * buildRequestXmlForGlobalCollect
-        *
-        * @todo
-        * - there are many cases to this that need to be developed.
-        * - Do not consider this a complete test!
-        *
-        * @covers GatewayAdapter::__construct
-        * @covers GatewayAdapter::setCurrentTransaction
-        * @covers GatewayAdapter::buildRequestXML
-        */
-       public function buildRequestXmlForGlobalCollect( $optionsForTestData, 
$options ) {
-
-               global $wgDonationInterfaceTest;
-
-               $wgDonationInterfaceTest = true;
-
-               $this->setUpRequest( $options );
-               $this->gatewayAdapter = new TestingGlobalCollectAdapter();
-
-               
$this->gatewayAdapter->setCurrentTransaction('INSERT_ORDERWITHPAYMENT');
-
-               $exposed = TestingAccessWrapper::newFromObject( 
$this->gatewayAdapter );
-               $request = trim( $exposed->buildRequestXML() );
-
-               $this->setUpRequest( $options );
-               $expected = $this->getExpectedXmlRequestForGlobalCollect( 
$optionsForTestData, $options );
-
-               $this->assertEquals( $expected, $request, 'The constructed XML 
for payment_method [' . $optionsForTestData['payment_method'] . '] and 
payment_submethod [' . $optionsForTestData['payment_submethod'] . '] does not 
match our expected request.' );
-       }
-
-       /**
-        *
-        * @param string $country The country we want the test user to be from.
-        * @return array Donor data to use
-        * @throws OutOfBoundsException when there is no data available for the 
requested country
-        */
-       public static function getDonorTestData( $country = '' ) {
-               $donortestdata = array (
-                       'US' => array ( //default
-                               'city' => 'San Francisco',
-                               'state_province' => 'CA',
-                               'postal_code' => '94105',
-                               'currency' => 'USD',
-                               'street_address' => '123 Fake Street',
-                               'first_name' => 'Firstname',
-                               'last_name' => 'Surname',
-                               'amount' => '1.55',
-                               'language' => 'en',
-                               'email' => 'nob...@wikimedia.org',
-                       ),
-                       'ES' => array (
-                               'city' => 'Barcelona',
-                               'state_province' => 'XX',
-                               'postal_code' => '0',
-                               'currency' => 'EUR',
-                               'street_address' => '123 Calle Fake',
-                               'first_name' => 'Nombre',
-                               'last_name' => 'Apellido',
-                               'amount' => '1.55',
-                               'language' => 'es',
-                       ),
-                       'Catalonia' => array (
-                               'city' => 'Barcelona',
-                               'state_province' => 'XX',
-                               'postal_code' => '0',
-                               'currency' => 'EUR',
-                               'street_address' => '123 Calle Fake',
-                               'first_name' => 'Nombre',
-                               'last_name' => 'Apellido',
-                               'amount' => '1.55',
-                               'language' => 'ca',
-                       ),
-                       'NO' => array (
-                               'city' => 'Oslo',
-                               'state_province' => 'XX',
-                               'postal_code' => '0',
-                               'currency' => 'EUR',
-                               'street_address' => '123 Fake Gate',
-                               'first_name' => 'Fornavn',
-                               'last_name' => 'Etternavn',
-                               'amount' => '1.55',
-                               'language' => 'no',
-                       ),
-                       'FR' => array (
-                               'city' => 'Versailles',
-                               'state_province' => 'XX',
-                               'postal_code' => '0',
-                               'currency' => 'EUR',
-                               'street_address' => '123 Rue Faux',
-                               'first_name' => 'Prénom',
-                               'last_name' => 'Nom',
-                               'amount' => '1.55',
-                               'language' => 'fr',
-                       ),
-                       // Fiji is configured as a snowflake to test special 
treatment for certain store IDs
-                       'FJ' => array (
-                               'city' => 'Suva',
-                               'state_province' => 'XX',
-                               'postal_code' => '0',
-                               'currency' => 'EUR',
-                               'street_address' => '123 Fake Street',
-                               'first_name' => 'FirstName',
-                               'last_name' => 'LastName',
-                               'amount' => '1.55',
-                               'language' => 'en',
-                       ),
-                       'NL' => array (
-                               'city' => 'Amsterdam',
-                               'state_province' => 'XX',
-                               'postal_code' => '0',
-                               'currency' => 'EUR',
-                               'street_address' => '123 nep straat',
-                               'first_name' => 'Voornaam',
-                               'last_name' => 'Achternaam',
-                               'amount' => '1.55',
-                               'language' => 'nl',
-                       ),
-                       'BE' => array (
-                               'city' => 'Antwerp',
-                               'state_province' => 'XX',
-                               'postal_code' => '0',
-                               'currency' => 'EUR',
-                               'street_address' => '123 nep straat',
-                               'first_name' => 'Voornaam',
-                               'last_name' => 'Achternaam',
-                               'amount' => '1.55',
-                               'language' => 'nl',
-                       ),
-                       'IT' => array (
-                               'city' => 'Torino',
-                               'state_province' => 'TO',
-                               'postal_code' => '10123',
-                               'currency' => 'EUR',
-                               'street_address' => 'Via Falso 123',
-                               'first_name' => 'Nome',
-                               'last_name' => 'Cognome',
-                               'amount' => '1.55',
-                               'language' => 'it',
-                       ),
-                       'CA' => array (
-                               'city' => 'Saskatoon',
-                               'state_province' => 'SK',
-                               'postal_code' => 'S7K 0J5',
-                               'currency' => 'CAD',
-                               'street_address' => '123 Fake Street',
-                               'first_name' => 'Firstname',
-                               'last_name' => 'Surname',
-                               'amount' => '1.55',
-                               'language' => 'en',
-                       ),
-                       'BR' => array (
-                               'currency' => 'BRL',
-                               'fiscal_number' => '00003456789',
-                               'payment_submethod' => 'test_bank',
-                               'first_name' => 'Nome',
-                               'last_name' => 'Apelido',
-                               'amount' => '100',
-                               'language' => 'pt',
-                               'email' => 'nob...@example.org'
-                       ),
-                       'MX' => array (
-                               'city' => 'Tuxtla Gutiérrez',
-                               'state_province' => 'CHP',
-                               'currency' => 'MXN',
-                               'street_address' => 'Calle Falso 123',
-                               'first_name' => 'Nombre',
-                               'last_name' => 'Apellido',
-                               'email' => 'pue...@unido.coop',
-                               'amount' => '155',
-                               'language' => 'es',
-                       ),
-               );
-               //default to US
-               if ( $country === '' ) {
-                       $country = 'US';
-               }
-
-               if ( array_key_exists( $country, $donortestdata ) ) {
-                       $donortestdata = array_merge( self::$initial_vars, 
$donortestdata[$country] );
-                       $donortestdata['country'] = $country;
-                       return $donortestdata;
-               }
-               throw new OutOfBoundsException( __FUNCTION__ . ": No donor data 
for country '$country'" );
-       }
-
-       /**
-        * Supported languages for Belgium
-        */
-       public function belgiumLanguageProvider() {
-               return array(
-                       array( 'nl' ),
-                       array( 'de' ),
-                       array( 'fr' ),
-               );
-       }
-
-       /**
-        * Supported languages for Canada
-        */
-       public function canadaLanguageProvider() {
-               return array(
-                       array( 'en' ),
-                       array( 'fr' ),
-               );
-       }
-
-       /**
-        * Transaction codes for GC and GC orphan adapters not to be retried
-        * on pain of $1000+ fines by MasterCard
-        */
-       public function mcNoRetryCodeProvider() {
-               return array(
-                       array( '430260' ),
-                       array( '430306' ),
-                       array( '430330' ),
-                       array( '430354' ),
-                       array( '430357' ),
-               );
-       }
-       
-       public function benignNoRetryCodeProvider() {
-               return array(
-                       array( '430285' ),
-               );
-       }
-
-       /**
-        * Get the expected XML request from GlobalCollect
-        *
-        * @param $optionsForTestData
-        * @param array $options
-        * @return string    The expected XML request
-        */
-       public function getExpectedXmlRequestForGlobalCollect( 
$optionsForTestData, $options = array() ) {
-               global $wgDonationInterfaceThankYouPage;
-               $request = RequestContext::getMain()->getRequest();
-
-               $orderId = $this->gatewayAdapter->getData_Unstaged_Escaped( 
'order_id' );
-               $exposed = TestingAccessWrapper::newFromObject( 
$this->gatewayAdapter );
-               $merchantref = $exposed->getData_Staged( 
'contribution_tracking_id' );
-               //@TODO: WHY IN THE NAME OF ZARQUON are we building XML in a 
STRING format here?!?!?!!!1one1!?. Great galloping galumphing giraffes.
-               $expected  = '<?xml version="1.0" encoding="UTF-8"?' . ">\n";
-               $expected .= '<XML>';
-               $expected .=    '<REQUEST>';
-               $expected .=            
'<ACTION>INSERT_ORDERWITHPAYMENT</ACTION>';
-               $expected .=            '<META><MERCHANTID>' . 
$exposed->account_config[ 'MerchantID' ] . '</MERCHANTID>';
-
-               if ( isset( $request ) ) {
-                       $expected .=            '<IPADDRESS>' . 
$request->getIP() . '</IPADDRESS>';
-               }
-               
-               $expected .=                    '<VERSION>1.0</VERSION>';
-               $expected .=            '</META>';
-               $expected .=            '<PARAMS>';
-               $expected .=                    '<ORDER>';
-               $expected .=                            '<ORDERID>' . $orderId 
. '</ORDERID>';
-               $expected .=                            '<AMOUNT>' . 
$options['amount'] * 100 . '</AMOUNT>';
-               $expected .=                            '<CURRENCYCODE>' . 
$options['currency'] . '</CURRENCYCODE>';
-               $expected .=                            '<LANGUAGECODE>' . 
$options['language'] . '</LANGUAGECODE>';
-               $expected .=                            '<COUNTRYCODE>' . 
$options['country'] . '</COUNTRYCODE>';
-               $expected .= '<MERCHANTREFERENCE>' . $merchantref . 
'</MERCHANTREFERENCE>';
-
-               if ( isset( $request ) ) {
-                       $expected .=                    '<IPADDRESSCUSTOMER>' . 
$request->getIP() . '</IPADDRESSCUSTOMER>';
-               }
-
-               $expected .=                            '<EMAIL>' . TESTS_EMAIL 
. '</EMAIL>';
-               $expected .=                    '</ORDER>';
-               $expected .=                    '<PAYMENT>';
-               $expected .=                            '<PAYMENTPRODUCTID>' . 
$optionsForTestData['payment_product_id'] . '</PAYMENTPRODUCTID>';
-               $expected .=                            '<AMOUNT>' . 
$options['amount'] * 100 . '</AMOUNT>';
-               $expected .=                            '<CURRENCYCODE>' . 
$options['currency'] . '</CURRENCYCODE>';
-               $expected .=                            '<LANGUAGECODE>' . 
$options['language'] . '</LANGUAGECODE>';
-               $expected .=                            '<COUNTRYCODE>' . 
$options['country'] . '</COUNTRYCODE>';
-               $expected .=                            
'<HOSTEDINDICATOR>1</HOSTEDINDICATOR>';
-               $expected .=                            
"<RETURNURL>{$wgDonationInterfaceThankYouPage}/{$options['language']}?country={$options['country']}</RETURNURL>";
-               $expected .=                            
'<AUTHENTICATIONINDICATOR>0</AUTHENTICATIONINDICATOR>';
-               $expected .=                            '<FIRSTNAME>' . 
$options['first_name'] . '</FIRSTNAME>';
-               $expected .=                            '<SURNAME>' . 
$options['last_name'] . '</SURNAME>';
-               $expected .=                            '<STREET>' . 
$options['street_address'] . '</STREET>';
-               $expected .=                            '<CITY>' . 
$options['city'] . '</CITY>';
-               $expected .=                            '<STATE>' . 
$options['state_province'] . '</STATE>';
-               $expected .=                            '<ZIP>' . 
$options['postal_code'] . '</ZIP>';
-               $expected .= '<EMAIL>' . TESTS_EMAIL . '</EMAIL>';
-
-               // Set the issuer id if it is passed.
-               if ( isset( $optionsForTestData['descriptor'] ) ) {
-                       $expected .= '<DESCRIPTOR>' . 
$optionsForTestData['descriptor'] . '</DESCRIPTOR>';
-               }
-
-               // Set the issuer id if it is passed.
-               if ( isset( $optionsForTestData['issuer_id'] ) ) {
-                       $expected .=                            '<ISSUERID>' . 
$optionsForTestData['issuer_id'] . '</ISSUERID>';
-               }
-
-
-               // If we're doing Direct Debit...
-               //@TODO: go ahead and split this out into a "Get the direct 
debit I_OWP XML block function" the second this gets even slightly annoying.
-               if ( $optionsForTestData['payment_method'] === 'dd' ) {
-                       $expected .= '<ACCOUNTNAME>' . 
$optionsForTestData['account_name'] . '</ACCOUNTNAME>';
-                       $expected .= '<ACCOUNTNUMBER>' . 
$optionsForTestData['account_number'] . '</ACCOUNTNUMBER>';
-                       $expected .= '<BANKCODE>' . 
$optionsForTestData['bank_code'] . '</BANKCODE>';
-                       $expected .= '<BRANCHCODE>' . 
$optionsForTestData['branch_code'] . '</BRANCHCODE>';
-                       $expected .= '<BANKCHECKDIGIT>' . 
$optionsForTestData['bank_check_digit'] . '</BANKCHECKDIGIT>';
-                       $expected .= '<DATECOLLECT>' . gmdate( 'Ymd' ) . 
'</DATECOLLECT>'; //is this cheating? Probably.
-                       $expected .= '<DIRECTDEBITTEXT>' . 
$optionsForTestData['direct_debit_text'] . '</DIRECTDEBITTEXT>';
-               }
-
-               $expected .=                    '</PAYMENT>';
-               $expected .=            '</PARAMS>';
-               $expected .=    '</REQUEST>';
-               $expected .= '</XML>';
-               
-               return $expected;
-               
-       }
-
-       /**
-        * Get a fresh gateway object of the type specified in the variable
-        * $this->testAdapterClass.
-        * @param array $external_data If you want to shoehorn in some external
-        * data, do that here.
-        * @param array $setup_hacks An array of things that override stuff in
-        * the constructor of the gateway object that I can't get to without
-        * refactoring the whole thing. @TODO: Refactor the gateway adapter
-        * constructor.
-        * @return GatewayAdapter The new relevant gateway adapter object.
-        */
-       function getFreshGatewayObject( $external_data = null, $setup_hacks = 
array() ) {
-               $data = null;
-               if ( !is_null( $external_data ) ) {
-                       $data = array (
-                               'external_data' => $external_data,
-                       );
-               }
-
-               if ( $setup_hacks ) {
-                       if ( !is_null( $data ) ) {
-                               $data = array_merge( $data, $setup_hacks );
-                       } else {
-                               $data = $setup_hacks;
-                       }
-               }
-
-               $class = $this->testAdapterClass;
-               $gateway = new $class( $data );
-
-               $classReflection = new ReflectionClass( $gateway );
-
-               // FIXME: Find a more elegant way to hackity hacken hack.
-               // We want to override any define- functions with hacky values.
-               foreach ( $setup_hacks as $field => $value ) {
-                       if ( property_exists( $class, $field ) ) {
-                               $propertyReflection = 
$classReflection->getProperty( $field );
-                               $propertyReflection->setAccessible( true );
-                               $propertyReflection->setValue( $gateway, $value 
);
-                       }
-               }
-
-               return $gateway;
-       }
-
-       function resetAllEnv() {
-               // TODO: reset PDO/sqlite queues
-               $_SESSION = array ( );
-               $_GET = array ( );
-               $_POST = array ( );
-
-               $_SERVER = array ( );
-               $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-               $_SERVER['HTTP_HOST'] = TESTS_HOSTNAME;
-               $_SERVER['SERVER_NAME'] = TESTS_HOSTNAME;
-               $_SERVER['SCRIPT_NAME'] = __FILE__;
-
-               RequestContext::resetMain();
-
-               // Wipe out the $instance of these classes to make sure they're
-               // re-created with fresh gateway instances for the next test
-               $singleton_classes = array(
-                       'Gateway_Extras_ConversionLog',
-                       'Gateway_Extras_CustomFilters',
-                       'Gateway_Extras_CustomFilters_Functions',
-                       'Gateway_Extras_CustomFilters_IP_Velocity',
-                       'Gateway_Extras_CustomFilters_MinFraud',
-                       'Gateway_Extras_CustomFilters_Referrer',
-                       'Gateway_Extras_CustomFilters_Source',
-                       'Gateway_Extras_SessionVelocityFilter',
-               );
-               foreach( $singleton_classes as $singleton_class ) {
-                       $unwrapped = TestingAccessWrapper::newFromClass( 
$singleton_class );
-                       $unwrapped->instance = null;
-               }
-               // Reset SmashPig context
-               Context::set( null );
-       }
-
-       /**
-        * Instantiates the $special_page_class with supplied $initial_vars,
-        * yoinks the html output from the output buffer, loads that into a
-        * DomDocument and performs asserts on the results per the checks
-        * supplied in $perform_these_checks.
-        * Optional: Asserts that the gateway has logged nothing at ERROR level.
-        *
-        * @param string $special_page_class A testing descendant of GatewayPage
-        * @param array $initial_vars Array that will be loaded straight into a
-        * test version of the http request.
-        * @param array $perform_these_checks Array of checks to perform in the
-        * following format:
-        * 
$perform_these_checks[$element_id][$check_to_perform][$expected_result]
-        * So far, $check_to_perform can be either 'nodename' or 'innerhtml'
-        * @param boolean $fail_on_log_errors When true, this will fail the
-        * current test if there are entries in the gateway's error log.
-        * @param array $session pre-existing session data.
-        */
-       function verifyFormOutput( $special_page_class, $initial_vars, 
$perform_these_checks, $fail_on_log_errors = false, $session = null ) {
-               // Nasty hack to clear output from any previous tests.
-               $mainContext = RequestContext::getMain();
-               $newOutput = new OutputPage( $mainContext );
-               $newRequest = new TestingRequest( $initial_vars, false, 
$session );
-               $newTitle = Title::newFromText( 'nonsense is apparently fine' );
-               $mainContext->setRequest( $newRequest );
-               $mainContext->setOutput( $newOutput );
-               $mainContext->setTitle( $newTitle );
-
-               $globals = array (
-                       'wgTitle' => $newTitle,
-                       'wgOut' => $newOutput,
-               );
-
-               $this->setMwGlobals( $globals );
-
-               $this->setLanguage( $initial_vars['language'] );
-
-               ob_start();
-               $formpage = new $special_page_class();
-               $formpage->execute( NULL );
-               $formpage->getOutput()->output();
-               $form_html = ob_get_contents();
-               ob_end_clean();
-
-               // In the event that something goes crazy, uncomment the next 
line for much easier local debugging
-               // file_put_contents( '/tmp/xmlout.txt', $form_html );
-
-               if ( $fail_on_log_errors ) {
-                       $this->verifyNoLogErrors();
-               }
-
-               $dom_thingy = new DomDocument();
-               //// DEBUGGING, foo
-               // if (property_exists($this, 'FOO')) {
-               //      
error_log(var_export($formpage->getRequest()->response()->getheader('Location'),
 true));
-               //      error_log(var_export($form_html, true));
-               // }
-
-               if ( $form_html ) {
-                       // p.s. i'm SERIOUS about the character encoding.
-                       $dom_thingy->loadHTML( '<?xml encoding="UTF-8">' . 
$form_html );
-                       $dom_thingy->encoding = 'UTF-8';
-               }
-
-               foreach ( $perform_these_checks as $id => $checks ) {
-                       if ( $id == 'headers' ) {
-                               foreach ( $checks as $name => $expected ) {
-                                       $actual = 
$formpage->getRequest()->response()->getheader( $name );
-                                       $this->performCheck( $actual, 
$expected, "header '$name'");
-                                       break;
-                               }
-                               continue;
-                       }
-                       unset( $perform_these_checks['headers'] );
-
-                       $input_node = $dom_thingy->getElementById( $id );
-                       $this->assertNotNull( $input_node, "Couldn't find the 
'$id' element" );
-                       foreach ( $checks as $name => $expected ) {
-                               switch ( $name ) {
-                                       case 'nodename':
-                                               $this->performCheck( 
$input_node->nodeName, $expected, "name of node with id '$id'");
-                                               break;
-                                       case 'innerhtml':
-                                               $actual_html = 
self::getInnerHTML( $input_node );
-                                               // Strip comments
-                                               $actual_html = preg_replace( 
'/<!--[^>]*-->/', '', $actual_html );
-                                               $this->performCheck( 
$actual_html, $expected, "innerHTML of node '$id'");
-                                               break;
-                                       case 'innerhtmlmatches':
-                                               $this->assertEquals( 1, 
preg_match( $expected, self::getInnerHTML( $input_node ) ), "Value of the node 
with id '$id' does not match pattern '$expected'. It has value " . 
self::getInnerHTML( $input_node ) );
-                                               break;
-                                       case 'value':
-                                               $this->performCheck( 
$input_node->getAttribute('value'), $expected, "value of node with id '$id'");
-                                               break;
-                                       case 'selected':
-                                               $selected = null;
-                                               if ( $input_node->nodeName === 
'select' ) {
-                                                       $options = 
$input_node->getElementsByTagName( 'option' );
-                                                       foreach ( $options as 
$option ) {
-                                                               if ( 
$option->hasAttribute( 'selected' ) ) {
-                                                                       
$selected = $option->getAttribute( 'value' );
-                                                                       break;
-                                                               }
-                                                       }
-                                                       $this->performCheck( 
$selected, $expected, "selected option value of node with id '$id'");
-                                               } else {
-                                                       $this->fail( "Attempted 
to test for selected value on non-select node, id '$id'" );
-                                               }
-                                               break;
-                               }
-                       }
-               }
-
-               // Are there untranslated boogers?
-               if ( preg_match_all( '/&lt;[^<]+(&gt;|>)/', $form_html, 
$matches ) ) {
-                       $this->fail( 'Untranslated messages present: ' . 
implode( ', ', $matches[0] ) );
-               }
-       }
-
-       /**
-        * Performs some sort of assertion on a value.
-        *
-        * @param string $value the value to test
-        * @param string|callable $check
-        *  if $check is callable, it is called with argument $value
-        *  otherwise, $value is asserted to be equal to $check
-        * @param string $label identifies the value in assertion failures
-        * @return void
-        */
-       function performCheck( $value, $check, $label = 'Tested value' ) {
-               if ( is_callable( $check ) ) {
-                       $check( $value );
-                       return;
-               }
-               $this->assertEquals( $check, $value, "Expected $label to be 
$check, found $value instead.");
-       }
-       /**
-        * Asserts that there are no log entries of LOG_ERR or worse.
-        */
-       function verifyNoLogErrors( ) {
-               $log = $this->testLogger->messages;
-
-               $this->assertTrue( is_array( $log ), "Missing the test log" );
-
-               //for our purposes, an "error" is LOG_ERR or less.
-               $checklogs = array (
-                       LogLevel::ERROR => "Oops: We've got LOG_ERRors.",
-                       LogLevel::CRITICAL => "Critical errors!",
-                       LogLevel::ALERT => "Log Alerts!",
-                       LogLevel::EMERGENCY => "Logs says the servers are 
actually on fire.",
-               );
-
-               $message = false;
-               foreach ( $checklogs as $level => $levelmessage ) {
-                       if ( array_key_exists( $level, $log ) ) {
-                               $message = $levelmessage . ' ' . print_r( 
$log[$level], true ) . "\n";
-                       }
-               }
-
-               $this->assertFalse( $message, $message ); //ha
-       }
-
-       /**
-        * Finds a relevant line/lines in a gateway's log array
-        * @param string $log_level One of the constants in \Psr\Log\LogLevel
-        * @param string $match A regex to match against the log lines.
-        * @return array All log lines that match $match.
-        *     FIXME: Or false.  Return an empty array or throw an exception 
instead.
-        */
-       public function getLogMatches( $log_level, $match ) {
-               $log = $this->testLogger->messages;
-               if ( !array_key_exists( $log_level, $log ) ) {
-                       return false;
-               }
-               $return = array ( );
-               foreach ( $log[$log_level] as $line ) {
-                       if ( preg_match( $match, $line ) ) {
-                               $return[] = $line;
-                       }
-               }
-               return $return;
-       }
-
-       static function getInnerHTML( $node ) {
-               $innerHTML = '';
-               $children = $node->childNodes;
-               foreach ( $children as $child ) {
-                       $innerHTML .= $child->ownerDocument->saveXML( $child );
-               }
-               return $innerHTML;
-       }
-}
->>>>>>> BRANCH (161081 Fix error serialization in payments.api)
diff --git a/tests/phpunit/FraudFiltersTest.php 
b/tests/phpunit/FraudFiltersTest.php
deleted file mode 100644
index cfb2f32..0000000
--- a/tests/phpunit/FraudFiltersTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<<<<<<< HEAD   (91ac51 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-use Wikimedia\TestingAccessWrapper;
-
-/**
- * @group Fundraising
- * @group DonationInterface
- * @group FormChooser
- */
-class DonationInterface_FraudFiltersTest extends DonationInterfaceTestCase {
-
-       /**
-        * @param $name string The name of the test case
-        * @param $data array Any parameters read from a dataProvider
-        * @param $dataName string|int The name or index of the data set
-        */
-       public function __construct( $name = null, array $data = array(), 
$dataName = '' ) {
-               $adapterclass = TESTS_ADAPTER_DEFAULT;
-               $this->testAdapterClass = $adapterclass;
-
-               parent::__construct( $name, $data, $dataName );
-               self::setupFraudMaps( $this );
-       }
-
-       public static function setupFraudMaps( $testContext ) {
-               // Declare so setMwGlobals can override.
-               global $wgGlobalCollectGatewayCustomFiltersFunctions;
-               $wgGlobalCollectGatewayCustomFiltersFunctions = null;
-
-
-               // Declare here cos reused.
-               $customFilters = array(
-                       'getScoreCountryMap' => 50,
-                       'getScoreUtmCampaignMap' => 50,
-                       'getScoreUtmSourceMap' => 15,
-                       'getScoreUtmMediumMap' => 15,
-                       'getScoreEmailDomainMap' => 75,
-               );
-
-               $testContext->setMwGlobals( array(
-                       'wgDonationInterfaceCustomFiltersActionRanges' => array 
(
-                               'process' => array ( 0, 25 ),
-                               'review' => array ( 25, 50 ),
-                               'challenge' => array ( 50, 75 ),
-                               'reject' => array ( 75, 100 ),
-                       ),
-
-                       'wgDonationInterfaceCustomFiltersRefRules' => array (
-                               '/donate-error/i' => 5,
-                       ),
-
-                       'wgDonationInterfaceCustomFiltersSrcRules' => array ( 
'/wikimedia\.org/i' => 80 ),
-
-                       'wgDonationInterfaceCustomFiltersFunctions' => 
$customFilters,
-
-                       'wgGlobalCollectGatewayCustomFiltersFunctions' => array(
-                               'getCVVResult' => 20,
-                               'getAVSResult' => 25,
-                       ) + $customFilters,
-
-                       'wgDonationInterfaceCountryMap' => array (
-                               'US' => 40,
-                               'CA' => 15,
-                               'RU' => -4,
-                       ),
-
-                       'wgDonationInterfaceUtmCampaignMap' => array (
-                               '/^(C14_)/' => 14,
-                               '/^(spontaneous)/' => 5
-                       ),
-                       'wgDonationInterfaceUtmSourceMap' => array (
-                               '/somethingmedia/' => 70
-                       ),
-                       'wgDonationInterfaceUtmMediumMap' => array (
-                               '/somethingmedia/' => 80
-                       ),
-                       'wgDonationInterfaceEmailDomainMap' => array (
-                               'wikimedia.org' => 42,
-                               'wikipedia.org' => 50,
-                       ),
-               ) );
-       }
-
-       function testGCFraudFilters() {
-               $this->setMwGlobals( array(
-                       'wgGlobalCollectGatewayEnableMinfraud' => true,
-                       'wgDonationInterfaceMinFraudServers' => 
array('0.0.0.0'),
-               ) );
-
-               $options = $this->getDonorTestData();
-               $options['email'] = 'someb...@wikipedia.org';
-               $class = $this->testAdapterClass;
-
-               $gateway = $this->getFreshGatewayObject( $options );
-
-               $gateway->runAntifraudFilters();
-
-               $this->assertEquals( 'reject', $gateway->getValidationAction(), 
'Validation action is not as expected' );
-               $exposed = TestingAccessWrapper::newFromObject( $gateway );
-               $this->assertEquals( 107.5, $exposed->risk_score, 'RiskScore is 
not as expected for failure mode' );
-       }
-}
-// Stub out Minfraud class for CI tests
-if ( !class_exists( 'CreditCardFraudDetection' ) ) {
-       class CreditCardFraudDetection{
-               public $server;
-               public function filter_field( $a, $b ) {
-                       return 'blah';
-               }
-               public function query() {}
-               public function input( $a ) {}
-               public function output() {
-                       return array();
-               }
-       }
-}
-
->>>>>>> BRANCH (161081 Fix error serialization in payments.api)

-- 
To view, visit https://gerrit.wikimedia.org/r/356883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafce72c09cbf7e5b2767fade28923ccab9207cbe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <ej...@ejegg.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to