Permalink
Browse files

Updated phpunit.xml.dist to match the new directory structure

  • Loading branch information...
1 parent 7d8808d commit 07595c1c4b1744a4525f36805bc1344672fc370a @mvriel mvriel committed Apr 29, 2011
Showing with 14 additions and 7 deletions.
  1. +10 −6 phpunit.xml.dist
  2. +4 −1 tests/common/bootstrap.php
View
@@ -1,17 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<phpunit bootstrap="tests/common/bootstrap.php" colors="true">
<testsuites>
<testsuite name="DocBlox">
<directory>./tests/unit/</directory>
- <directory suffix=".phpt">./tests/ui/</directory>
+<!-- <directory suffix=".phpt">./tests/ui/</directory> -->
</testsuite>
</testsuites>
<filter>
<whitelist>
- <directory suffix=".php">./</directory>
+ <directory suffix=".php">.</directory>
<exclude>
- <directory suffix=".php">src/lib/symfony</directory>
- <directory suffix=".php">src/lib/Zend</directory>
- <directory suffix=".php">src/lib/pear</directory>
+ <directory suffix=".php">build</directory>
+ <directory suffix=".php">src/markdown</directory>
+ <file>src/markdown.php</file>
+ <directory suffix=".php">src/Zend</directory>
+ <directory suffix=".php">src/Image</directory>
<directory suffix=".php">data/output</directory>
<directory suffix=".php">data/log</directory>
<directory suffix=".php">tests</directory>
@@ -32,4 +36,4 @@
<log type="coverage-clover" target="build/logs/clover.xml" />
<log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false" />
</logging>
-</phpunit>
+</phpunit>
@@ -16,7 +16,10 @@
// include and initialize the autoloader
require_once('Zend/Loader/Autoloader.php');
-require_once('markdown.php');
+if(!class_exists('Markdown'))
+{
+ require_once('markdown.php');
+}
require_once('PHPUnit/Extensions/OutputTestCase.php');
$autoloader = Zend_Loader_Autoloader::getInstance();
$autoloader->registerNamespace('DocBlox_');

0 comments on commit 07595c1

Please sign in to comment.