| Index: trunk/extensions/DonationInterface/tests/TestHelper.php |
| — | — | @@ -76,6 +76,11 @@ |
| 77 | 77 | require_once dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'globalcollect_gateway/globalcollect.adapter.php'; |
| 78 | 78 | |
| 79 | 79 | /** |
| | 80 | + * @see GlobalCollectTestAdapter |
| | 81 | + */ |
| | 82 | +require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'Adapter/GlobalCollect/GlobalCollectTestAdapter.php'; |
| | 83 | + |
| | 84 | +/** |
| 80 | 85 | * @see ContributionTrackingProcessor |
| 81 | 86 | */ |
| 82 | 87 | require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'ContributionTracking/ContributionTracking.processor.php'; |
| Index: trunk/extensions/DonationInterface/tests/DonationInterfaceTestCase.php |
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | * - Do not consider this a complete test! |
| 52 | 52 | * |
| 53 | 53 | * @covers GatewayAdapter::__construct |
| 54 | | - * @covers GatewayAdapter::currentTransaction |
| | 54 | + * @covers GatewayAdapter::setCurrentTransaction |
| 55 | 55 | * @covers GatewayAdapter::buildRequestXML |
| 56 | 56 | * @covers GatewayAdapter::getData |
| 57 | 57 | */ |
| — | — | @@ -60,11 +60,11 @@ |
| 61 | 61 | |
| 62 | 62 | $wgGlobalCollectGatewayTest = true; |
| 63 | 63 | |
| 64 | | - $this->gatewayAdapter = new GlobalCollectAdapter( $options ); |
| | 64 | + $this->gatewayAdapter = new GlobalCollectTestAdapter( $options ); |
| 65 | 65 | |
| 66 | 66 | $this->gatewayAdapter->setCurrentTransaction('INSERT_ORDERWITHPAYMENT'); |
| 67 | 67 | |
| 68 | | - $request = trim( $this->gatewayAdapter->buildRequestXML() ); |
| | 68 | + $request = trim( $this->gatewayAdapter->executeBuildRequestXML() ); |
| 69 | 69 | |
| 70 | 70 | $expected = $this->getExpectedXmlRequestForGlobalCollect( $optionsForTestData, $options ); |
| 71 | 71 | |
| — | — | @@ -281,7 +281,7 @@ |
| 282 | 282 | $expected .= '<XML>'; |
| 283 | 283 | $expected .= '<REQUEST>'; |
| 284 | 284 | $expected .= '<ACTION>INSERT_ORDERWITHPAYMENT</ACTION>'; |
| 285 | | - $expected .= '<META><MERCHANTID>' . $this->gatewayAdapter->getGlobal( 'MerchantId' ) . '</MERCHANTID><VERSION>1.0</VERSION></META>'; |
| | 285 | + $expected .= '<META><MERCHANTID>' . $this->gatewayAdapter->getGlobal( 'MerchantID' ) . '</MERCHANTID><VERSION>1.0</VERSION></META>'; |
| 286 | 286 | $expected .= '<PARAMS>'; |
| 287 | 287 | $expected .= '<ORDER>'; |
| 288 | 288 | $expected .= '<ORDERID>' . $orderId . '</ORDERID>'; |