Fixed zendframework/zendframework#6941

zendframework · Nov 28, 2014 · ccb76d2 · ccb76d2
1 parent 1c27cbb
commit ccb76d2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/test/EmailAddressTest.php b/test/EmailAddressTest.php
@@ -300,7 +300,7 @@ public function testComplexLocalValid()
      */
     public function testMXRecords()
     {
-        if (!constant('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
+        if (!defined('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
             $this->markTestSkipped('Testing MX records has been disabled');
         }
 
@@ -342,7 +342,7 @@ public function testMXRecords()
      */
     public function testNoMxRecordARecordFallback()
     {
-        if (!constant('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
+        if (!defined('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
             $this->markTestSkipped('Testing MX records has been disabled');
         }
 
@@ -645,10 +645,11 @@ public function testNotSetHostnameValidator()
      */
     public function testGetMXRecord()
     {
-        if (!constant('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
+        if (!defined('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
             $this->markTestSkipped('Testing MX records has been disabled');
         }
 
+        $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 +680,10 @@ public function testEqualsMessageVariables()
      */
     public function testUseMxCheckBasicValid()
     {
-        if (!constant('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
+        if (!defined('TESTS_ZEND_VALIDATOR_ONLINE_ENABLED')) {
             $this->markTestSkipped('Testing MX records has been disabled');
         }
+
         $validator = new EmailAddress(array(
             'useMxCheck'        => true,
             'useDeepMxCheck'    => true