Merge branch 'hotfix/zendframework/zendframework#6941-zendframework/z…

…endframework#6943-undefined-constant-check-in-test-suite' into develop Close zendframework/zendframework#6941 Close zendframework/zendframework#6943 Forward port zendframework/zendframework#6941 Forward port zendframework/zendframework#6943
zendframework · Nov 28, 2014 · 84abb5d · 84abb5d
2 parents bfe4ccf + 4715fbe
commit 84abb5d
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/test/EmailAddressTest.php b/test/EmailAddressTest.php
@@ -272,7 +272,7 @@ public function testBasicInvalid()
         }
     }
 
-   /**
+    /**
      * Ensures that the validator follows expected behavior for valid email addresses with complex local parts
      *
      * @return void
@@ -300,9 +300,7 @@ public function testComplexLocalValid()
      */
     public function testMXRecords()
     {
-        if (!constant('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
-            $this->markTestSkipped('Testing MX records has been disabled');
-        }
+        $this->skipIfOnlineTestsDisabled();
 
         $validator = new EmailAddress(Hostname::ALLOW_DNS, true);
 
@@ -342,9 +340,7 @@ public function testMXRecords()
      */
     public function testNoMxRecordARecordFallback()
     {
-        if (!constant('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
-            $this->markTestSkipped('Testing MX records has been disabled');
-        }
+        $this->skipIfOnlineTestsDisabled();
 
         $validator = new EmailAddress(Hostname::ALLOW_DNS, true);
 
@@ -645,10 +641,9 @@ public function testNotSetHostnameValidator()
      */
     public function testGetMXRecord()
     {
-        if (!constant('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
-            $this->markTestSkipped('Testing MX records has been disabled');
-        }
+        $this->skipIfOnlineTestsDisabled();
 
+        $validator = new EmailAddress(array('useMxCheck' => true, 'allow' => Hostname::ALLOW_ALL));
         $validator = new EmailAddress(array('useMxCheck' => true, 'allow' => Hostname::ALLOW_ALL));
 
         if (!$validator->isMxSupported()) {
@@ -679,9 +674,8 @@ public function testEqualsMessageVariables()
      */
     public function testUseMxCheckBasicValid()
     {
-        if (!constant('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
-            $this->markTestSkipped('Testing MX records has been disabled');
-        }
+        $this->skipIfOnlineTestsDisabled();
+
         $validator = new EmailAddress(array(
             'useMxCheck'        => true,
             'useDeepMxCheck'    => true
@@ -807,4 +801,16 @@ public function testIpRangeValidationOnRangesNoLongerMarkedAsReserved()
         $this->assertFalse($validator->isReserved('223.255.255.0'));
         $this->assertFalse($validator->isReserved('223.255.255.255'));
     }
+
+    /**
+     * @throws \PHPUnit_Framework_SkippedTestError
+     *
+     * @return void
+     */
+    private function skipIfOnlineTestsDisabled()
+    {
+        if (! (defined('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED') && \TESTS_ZEND_VALIDATOR_ONLINE_ENABLED)) {
+            $this->markTestSkipped('Testing MX records has been disabled');
+        }
+    }
 }