ZF-10651: don't run Zend_Mail tests multiple times

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23307 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/AllTests.php

@@ -65,7 +65,6 @@ require_once 'Zend/Loader/AllTests.php';
 require_once 'Zend/LocaleTest.php';
 require_once 'Zend/Locale/AllTests.php';
 require_once 'Zend/Log/AllTests.php';
-require_once 'Zend/MailTest.php';
 require_once 'Zend/Mail/AllTests.php';
 require_once 'Zend/Markup/AllTests.php';
 require_once 'Zend/Measure/AllTests.php';
@@ -202,7 +201,6 @@ class Zend_AllTests
         $suite->addTestSuite('Zend_LocaleTest');
         $suite->addTest(Zend_Locale_AllTests::suite());
         $suite->addTest(Zend_Log_AllTests::suite());
-        $suite->addTestSuite('Zend_MailTest');
         $suite->addTest(Zend_Mail_AllTests::suite());
         $suite->addTest(Zend_Markup_AllTests::suite());
         $suite->addTest(Zend_Measure_AllTests::suite());

tests/Zend/MailTest.php

@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id $
- */
-
-/**
- * Test helper
- */
-require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
-require_once "Mail/MailTest.php";
-require_once "Mail/AllTests.php";
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Mail
- */
-class Zend_MailTest
-{
-    /**
-     * Notice: Moved all functionality of this testcass to Zend_Mail_MailTest
-     * to merge both testsuites of Zend_Mail.
-     */
-    public static function main()
-    {
-        PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Mail');
-
-        $suite->addTestSuite('Zend_Mail_MailTest');
-        $suite->addTest(Zend_Mail_AllTests::suite());
-
-        return $suite;
-    }
-}

tests/Zend/MimeTest.php

@@ -34,9 +34,6 @@ require_once 'Zend/Mime.php';
 /** PHPUnit test case */
 require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_MailTest */
-require_once dirname(__FILE__) . '/MailTest.php';
-
 /**
  * @category   Zend
  * @package    Zend_Mime