test break fixes

[civicrm-core.git] / tests / phpunit / api / v3 / CountryTest.php

diff --git a/tests/phpunit/api/v3/CountryTest.php b/tests/phpunit/api/v3/CountryTest.php
index 694e24cf8ec0393ce56a9acc7d56d2bb42083173..f4e913e91d5eed63bb8a61edb44d950f2c871944 100644 (file)
--- a/tests/phpunit/api/v3/CountryTest.php
+++ b/tests/phpunit/api/v3/CountryTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -32,30 +32,30 @@ require_once 'CiviTest/CiviUnitTestCase.php';
 /**
  *  Test APIv3 civicrm_country* functions
  *
- *  @package CiviCRM_APIv3
- *  @subpackage API_Contact
+ * @package CiviCRM_APIv3
+ * @subpackage API_Contact
  */
 class api_v3_CountryTest extends CiviUnitTestCase {
   protected $_apiversion;
   protected $_params;
 
 
-  function setUp() {
+  public function setUp() {
     $this->_apiversion = 3;
     parent::setUp();
-    $this->quickCleanup(array('civicrm_country'));
+    $this->useTransaction(TRUE);
     $this->_params = array(
-      'id' => 1152,
-      'name' => 'Netherlands',
-      'iso_code' => 'NL',
+      'name' => 'Made Up Land',
+      'iso_code' => 'ZZ',
+      'region_id' => 1,
     );
   }
 
   public function testCreateCountry() {
 
     $result = $this->callAPIAndDocument('country', 'create', $this->_params, __FUNCTION__, __FILE__);
-    $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
-    $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__);
+    $this->assertEquals(1, $result['count']);
+    $this->assertNotNull($result['values'][$result['id']]['id']);
 
     $this->callAPISuccess('country', 'delete', array('id' => $result['id']));
   }
@@ -64,12 +64,12 @@ class api_v3_CountryTest extends CiviUnitTestCase {
     //create one
     $create = $this->callAPISuccess('country', 'create', $this->_params);
 
-    $result = $this->callAPIAndDocument('country', 'delete', array('id' => $create['id'],), __FUNCTION__, __FILE__);
-    $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
+    $result = $this->callAPIAndDocument('country', 'delete', array('id' => $create['id']), __FUNCTION__, __FILE__);
+    $this->assertEquals(1, $result['count']);
     $get = $this->callAPISuccess('country', 'get', array(
       'id' => $create['id'],
     ));
-    $this->assertEquals(0, $get['count'], 'Country not successfully deleted In line ' . __LINE__);
+    $this->assertEquals(0, $get['count'], 'Country not successfully deleted');
   }
 
   /**
@@ -92,11 +92,11 @@ class api_v3_CountryTest extends CiviUnitTestCase {
   public function testGet() {
     $country = $this->callAPISuccess('Country', 'create', $this->_params);
     $params = array(
-      'iso_code' =>  $this->_params['iso_code'],
+      'iso_code' => $this->_params['iso_code'],
     );
     $result = $this->callAPIAndDocument('Country', 'Get', $params, __FUNCTION__, __FILE__);
-    $this->assertEquals($country['values'][$country['id']]['name'], $result['values'][$country['id']]['name'], 'In line ' . __LINE__);
-    $this->assertEquals($country['values'][$country['id']]['iso_code'], $result['values'][$country['id']]['iso_code'], 'In line ' . __LINE__);
+    $this->assertEquals($country['values'][$country['id']]['name'], $result['values'][$country['id']]['name']);
+    $this->assertEquals($country['values'][$country['id']]['iso_code'], $result['values'][$country['id']]['iso_code']);
   }
 
   ///////////////// civicrm_country_create methods
@@ -104,17 +104,15 @@ class api_v3_CountryTest extends CiviUnitTestCase {
   /**
    * If a new country is created and it is created again it should not create a second one.
    * We check on the iso code (there should be only one iso code
-   *
    */
-  public function testCreatePhonePrimaryHandlingChangeExisting() {
+  public function testCreateDuplicateFail() {
     $params = $this->_params;
     unset($params['id']);
-    $phone1 = $this->callAPISuccess('country', 'create', $params);
-    $phone2 = $this->callAPISuccess('country', 'create', $params);
+    $this->callAPISuccess('country', 'create', $params);
+    $this->callAPIFailure('country', 'create', $params);
     $check = $this->callAPISuccess('country', 'getcount', array(
       'iso_code' => $params['iso_code'],
     ));
     $this->assertEquals(1, $check);
   }
 }
-