#13899 Improve unit test

magento · Mar 20, 2018 · bda63c7 · bda63c7
1 parent ac37727
commit bda63c7
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
@@ -50,13 +50,10 @@ public function testInvalidCanadaZipCode($countryId, $invalidPostCode) {
  }
 
  /**
- *
+ * @dataProvider getCanadaValidPostCodes
  */
- public function testValidCanadaZipCode() {
- $resultPattern1 = $this->validator->validate('A1B2C3', 'CA');
- $resultPattern2 = $this->validator->validate('A1B 2C3', 'CA');
- $this->assertTrue($resultPattern1);
- $this->assertTrue($resultPattern2);
+ public function testValidCanadaZipCode($countryId, $validPostCode) {
+ $this->assertTrue($this->validator->validate($validPostCode, $countryId));
  }
 
  /**
@@ -71,6 +68,18 @@ public function getCanadaInvalidPostCodes() {
  ];
  }
 
+ /**
+ * @return array
+ */
+ public function getCanadaValidPostCodes() {
+ return [
+ ['countryId' => 'CA', 'postcode' => 'A1B2C3'],
+ ['countryId' => 'CA', 'postcode' => 'A1B 2C3'],
+ ['countryId' => 'CA', 'postcode' => 'Z9Y 8X7'],
+ ['countryId' => 'CA', 'postcode' => 'Z9Y8X7'],
+ ];
+ }
+
  /**
  * @return array
  * @SuppressWarnings(PHPMD.ExcessiveMethodLength)