Fixed webtest of export and testAdvanceSearch of Contact_AdavanceSearchTest

[civicrm-core.git] / tests / phpunit / WebTest / Contact / AddressParsingTest.php

diff --git a/tests/phpunit/WebTest/Contact/AddressParsingTest.php b/tests/phpunit/WebTest/Contact/AddressParsingTest.php
index 82bfc80cec6ff12ace257cc17fc2f565873a2669..26ff03e10ecad27248705b8a0fe2b7638d374f85 100644 (file)
--- a/tests/phpunit/WebTest/Contact/AddressParsingTest.php
+++ b/tests/phpunit/WebTest/Contact/AddressParsingTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -35,7 +35,7 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
     parent::setUp();
   }
 
-  function teststreetAddressParsing() {
+  public function teststreetAddressParsing() {
     // Logging in.
     $this->webtestLogin();
 
@@ -96,7 +96,7 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
     $this->type("address_4_street_address", "121 SW Sherman Way Suite 15");
     $this->type("address_4_city", "Birmingham");
     $this->type("address_4_postal_code", "5491");
-    $this->assertTrue($this->isTextPresent("- select - United States"));
+    $this->assertSelected('address_4_country_id', "United States");
     $this->select("address_4_state_province_id", "value=1002");
 
     // Store location type of each address
@@ -121,7 +121,9 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
       $this->waitForElementPresent("address_{$i}_street_address");
       $address[$i] = $location[$this->getSelectedLabel("address_{$i}_location_type_id")];
       // Open "Edit Address Elements"
-      $this->click("//table[@id='address_{$i}']//a[text()='Edit Address Elements']");
+      $this->waitForElementPresent('addressBlockId');
+      $this->click('addressBlockId');
+      $this->click("//table[@id='address_table_{$i}']//a[text()='Edit Address Elements']");
     }
 
     //verify all the address fields were parsed correctly
@@ -155,4 +157,3 @@ class WebTest_Contact_AddressParsingTest extends CiviSeleniumTestCase {
     }
   }
 }
-