Move tests from Simpletest to PHPUnit and Mockery.

Author: realityking

.travis.yml

@@ -9,11 +9,13 @@ php:
 before_script:
     - cp tests/acceptance.conf.php.default tests/acceptance.conf.php
     - cp tests/smoke.conf.php.default tests/smoke.conf.php
+    - composer self-update
+    - composer update --no-interaction --prefer-source
     - gem install mailcatcher
     - mailcatcher --smtp-port 4456
 
 script:
-    - php test-suite/run.php
+    - phpunit
 
 matrix:
   allow_failures:

build.xml

@@ -23,21 +23,12 @@
   <property name="src.readmefile" value="${path}/README" />
   <property name="src.changesfile" value="${path}/CHANGES" />
   <property name="src.libdir" value="${path}/lib" />
-  <property name="src.testsuite" value="${path}/test-suite" />
   <property name="src.tests" value="${path}/tests" />
   <property name="builddir.package" value="${builddir}/${bundle.name}" />
   <property name="runtests" value="" />
   <filelist id="src.licenses" dir="${path}">
     <file name="LICENSE" />
   </filelist>
-  <fileset id="build.simpletest.unneeded"
-    dir="${builddir.package}/test-suite/lib/simpletest">
-    <include name="docs/" />
-    <include name="tutorials/" />
-    <include name="extensions/" />
-    <include name="test/" />
-    <include name="packages/" />
-  </fileset>
 
 
   <!-- Bundle all files into a central location -->
@@ -79,15 +70,9 @@
         </replacetokens>
       </filterchain>
     </copy>
-    <copy todir="${builddir.package}/test-suite">
-      <fileset dir="${src.testsuite}" />
-    </copy>
     <copy todir="${builddir.package}/tests">
       <fileset dir="${src.tests}" />
     </copy>
-    <delete includeemptydirs="true">
-      <fileset refid="build.simpletest.unneeded" />
-    </delete>
   </target>
 
   <!-- Package up the project as a gzip file -->
@@ -102,11 +87,7 @@
 
   <!-- Run the included unit tests -->
   <target name="test" depends="prepare, clean, copy-classes">
-    <exec executable="php" failonerror="true">
-      <env key="_" value="php" />
-      <arg value="${builddir.package}/test-suite/run.php" />
-      <arg value="${runtests}" />
-    </exec>
+    <exec executable="phpunit" failonerror="true" />
   </target>
 
 </project>

composer.json

@@ -17,6 +17,9 @@
     "require": {
         "php": ">=5.2.4"
     },
+    "require-dev": {
+        "mockery/mockery": "~0.9@dev"
+    },
     "autoload": {
         "files": ["lib/swift_required.php"]
     },

phpunit.xml.dist

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="tests/bootstrap.php"
+>
+    <php>
+        <ini name="intl.default_locale" value="en"/>
+        <ini name="intl.error_level" value="0"/>
+        <ini name="memory_limit" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="SwiftMailer unit tests">
+            <directory>tests/unit</directory>
+        </testsuite>
+        <testsuite name="SwiftMailer acceptance tests">
+            <directory>tests/acceptance</directory>
+        </testsuite>
+        <testsuite name="SwiftMailer bug">
+            <directory>tests/bug</directory>
+        </testsuite>
+        <testsuite name="SwiftMailer smoke tests">
+            <directory>tests/smoke</directory>
+        </testsuite>
+    </testsuites>
+
+    <listeners>
+        <listener class="\Mockery\Adapter\Phpunit\TestListener"></listener>
+    </listeners>
+</phpunit>

tests/IdenticalBinaryConstraint.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * A binary safe string comparison.
+ * @package Swift
+ * @subpackage Tests
+ * @author Chris Corbyn
+ */
+class IdenticalBinaryConstraint extends \PHPUnit_Framework_Constraint
+{
+    protected $value;
+
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns TRUE if the
+     * constraint is met, FALSE otherwise.
+     *
+     * @param mixed $other Value or object to evaluate.
+     * @return bool
+     */
+    public function matches($other)
+    {
+        $aHex = $this->asHexString($this->value);
+        $bHex = $this->asHexString($other);
+
+        return $aHex === $bHex;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'indentical binary';
+    }
+
+    /**
+     * Get the given string of bytes as a stirng of Hexadecimal sequences.
+     *
+     * @param  string $binary
+     *
+     * @return string
+     */
+    private function asHexString($binary)
+    {
+        $hex = '';
+
+        $bytes = unpack('H*', $binary);
+
+        foreach ($bytes as &$byte) {
+            $byte = strtoupper($byte);
+        }
+
+        return implode('', $bytes);
+    }
+}

tests/StreamCollector.php

@@ -0,0 +1,11 @@
+<?php
+
+class Swift_StreamCollector
+{
+    public $content = '';
+
+    public function __invoke($arg)
+    {
+        $this->content .= $arg;
+    }
+}

tests/helpers/Swift/Tests/SwiftSmokeTestCase.php renamed to tests/SwiftMailerSmokeTestCase.php

@@ -1,21 +1,21 @@
 <?php
 
-require_once 'Swift/Tests/SwiftUnitTestCase.php';
-require_once 'swift_required.php';
-
 /**
- * Smoke test helper class.
- * @package Swift
- * @subpackage Tests
- * @author Chris Corbyn
+ * Base test for smoke tests.
+ *
+ * @package     Swift
+ * @subpackage  Tests
+ * @author      Rouven Weßling
  */
-class Swift_Tests_SwiftSmokeTestCase extends Swift_Tests_SwiftUnitTestCase
+class SwiftMailerSmokeTestCase extends SwiftMailerTestCase
 {
-    public function skip()
+    public function setUp()
     {
-        $this->skipUnless(SWIFT_SMOKE_TRANSPORT_TYPE,
-            '%s: Smoke tests are skipped if tests/smoke.conf.php is not edited'
-            );
+        if (!defined('SWIFT_SMOKE_TRANSPORT_TYPE')) {
+            $this->markTestSkipped(
+                'Smoke tests are skipped if tests/smoke.conf.php is not edited'
+             );
+        }
     }
 
     protected function _getMailer()
@@ -45,9 +45,4 @@ protected function _getMailer()
 
         return new Swift_Mailer($transport);
     }
-
-    protected function _visualCheck($url)
-    {
-        $this->dump('{image @ ' . $url . '}');
-    }
 }

tests/SwiftMailerTestCase.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * A base test case with some custom expectations.
+ * @package     Swift
+ * @subpackage  Tests
+ * @author      Rouven Weßling
+ */
+class SwiftMailerTestCase extends \PHPUnit_Framework_TestCase
+{
+    public static function regExp($pattern)
+    {
+        if (!is_string($pattern)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        return new PHPUnit_Framework_Constraint_PCREMatch($pattern);
+    }
+
+    public function assertIdenticalBinary($expected, $actual, $message = '')
+    {
+        $constraint = new IdenticalBinaryConstraint($expected);
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    protected function tearDown()
+    {
+        \Mockery::close();
+    }
+
+    protected function getMockery($class)
+    {
+        return \Mockery::mock($class);
+    }
+}

tests/acceptance/Swift/AttachmentAcceptanceTest.php

@@ -1,10 +1,9 @@
 <?php
 
 require_once 'swift_required.php';
-require_once 'Swift/Mime/AttachmentAcceptanceTest.php';
+require_once __DIR__ .  '/Mime/AttachmentAcceptanceTest.php';
 
-class Swift_AttachmentAcceptanceTest
-    extends Swift_Mime_AttachmentAcceptanceTest
+class Swift_AttachmentAcceptanceTest extends Swift_Mime_AttachmentAcceptanceTest
 {
     protected function _createAttachment()
     {