From 059103da2069a4e7ac588e95ef8e67ae634a9d88 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 12 May 2015 17:23:04 +1200
Subject: [PATCH] update MembershipForm test to be less clobbery

fix merge errors
---
 .../CRM/Member/Form/MembershipTest.php        | 47 +------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index fb57392d60..cf1a2e06f3 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -102,53 +102,10 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
       )
     );
 
-    $this->_apiversion = 3;
-    $this->_individualId = $this->individualCreate();
-    $this->_paymentProcessorID = $this->processorCreate();
-    $this->_params = array(
-      'contact_id' => $this->_individualId,
-      'receive_date' => '20120511',
-      'total_amount' => 100.00,
-      'financial_type_id' => $this->_financialTypeId,
-      'non_deductible_amount' => 10.00,
-      'fee_amount' => 5.00,
-      'net_amount' => 95.00,
-      'source' => 'SSF',
-      'contribution_status_id' => 1,
-    );
-    $this->_processorParams = array(
-      'domain_id' => 1,
-      'name' => 'Dummy',
-      'payment_processor_type_id' => 10,
-      'financial_account_id' => 12,
-      'is_active' => 1,
-      'user_name' => '',
-      'url_site' => 'http://dummy.com',
-      'url_recur' => 'http://dummy.com',
-      'billing_mode' => 1,
-    );
-    $this->_pageParams = array(
-      'title' => 'Test Contribution Page',
-      'financial_type_id' => 1,
-      'currency' => 'USD',
-      'financial_account_id' => 1,
-      'payment_processor' => $paymentProcessor->id,
-      'is_active' => 1,
-      'is_allow_other_amount' => 1,
-      'min_amount' => 10,
-      'max_amount' => 1000,
-    );
     $instruments = $this->callAPISuccess('contribution', 'getoptions', array('field' => 'payment_instrument_id'));
     $this->paymentInstruments = $instruments['values'];
   }
 
-  /**
-   * Clean up after each test.
-   */
-  public function tearDown() {
-    $this->quickCleanUpFinancialEntities();
-  }
-
   /**
    * Clean up after each test.
    */
@@ -482,13 +439,13 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase {
       'join_date' => date('m/d/Y', time()),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => array('13'),
+      'membership_type_id' => array('25'),
       'auto_renew' => '0',
       'max_related' => '',
       'num_terms' => '1',
       'source' => '',
       'total_amount' => '50.00',
-      'financial_type_id' => '5', //Member dues, see data.xml
+      'financial_type_id' => '2', //Member dues, see data.xml
       'soft_credit_type_id' => '',
       'soft_credit_contact_id' => '',
       'from_email_address' => '"Demonstrators Anonymous" <info@example.org>',
-- 
2.25.1