Skip to content
Browse files

Fixed tests and disabled one due to a seg fault

  • Loading branch information...
1 parent b4cdb18 commit c3e36522e38fb9c946cc8f6ae0e47223cfa99614 @mvriel mvriel committed Apr 17, 2011
View
2 tests/common/bootstrap.php
@@ -16,7 +16,7 @@
// include and initialize the autoloader
require_once('Zend/Loader/Autoloader.php');
-require_once('markdown/markdown.php');
+require_once('markdown.php');
require_once('PHPUnit/Extensions/OutputTestCase.php');
$autoloader = Zend_Loader_Autoloader::getInstance();
$autoloader->registerNamespace('DocBlox_');
View
71 tests/ui/docblox-no-params.phpt.orig
@@ -1,71 +0,0 @@
---TEST--
-docblox project:run
---FILE--
-<?php
-<<<<<<< HEAD
-
-$_SERVER['argv'][0] = 'docblox';
-=======
-$_SERVER['argc'] = 3;
-$_SERVER['argv'][1] = 'project:run';
-$_SERVER['argv'][2] = '--config=none';
->>>>>>> benmatselby-application-runner
-
-// determine base include folder, if @php_bin@ contains @php_bin then we do not install via PEAR
-if (strpos('@php_bin@', '@php_bin') === 0) {
- set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
-}
-
-require_once 'Zend/Loader/Autoloader.php';
-$autoloader = Zend_Loader_Autoloader::getInstance();
-$autoloader->registerNamespace('DocBlox_');
-
-$application = new DocBlox_Core_Application();
-$application->main();
-?>
---EXPECTF--
-DocBlox version %s
-
-<<<<<<< HEAD
-ERROR: The given location "data/output" is not a folder
-=======
-ERROR: No parsable files were found, did you specify any using the -f or -d parameter?
->>>>>>> benmatselby-application-runner
-
-Creates documentation from PHP source files and generates documentation from it.
-The simplest way to use it is:
-
- $ docblox run -d <directory to parse> -t <output directory>
-
-This will parse every file ending with .php, .php3 and .phtml for its structure and documentation from
-<directory to parse> and output a HTML site containing easily readable output in <output directory>.
-
-In any case will DocBlox try to look for a docblox.dist.xml or docblox.xml file in your current working directory
-and use that to override the default settings if present.
-In the configuration file can you specify the same settings (and more) as the command line provides.
-
-Usage:
-<<<<<<< HEAD
- docblox project:run [options]
-=======
- %s project:run [options]
->>>>>>> benmatselby-application-runner
-
--h [--help] Show this help message
--q [--quiet] Silences the output and logging
--f [--filename] STRING Comma-separated list of files to parse. The wildcards ? and * are supported
--d [--directory] STRING Comma-separated list of directories to (recursively) parse.
--t [--target] [STRING] Path where to store the generated output (optional, defaults to "output")
--e [--extensions] [STRING] Optional comma-separated list of extensions to parse, defaults to php, php3 and phtml
--i [--ignore] [STRING] Comma-separated list of file(s) and directories that will be ignored. Wildcards * and ? are supported
--m [--markers] [STRING] Comma-separated list of markers/tags to filter, (optional, defaults to: "TODO,FIXME")
--v [--verbose] Provides additional information during parsing, usually only needed for debugging purposes
---title [STRING] Sets the title for this project; default is the DocBlox logo
---template [STRING] Sets the template to use when generating the output
---force Forces a full build of the documentation, does not increment existing documentation
---validate Validates every processed file using PHP Lint, costs a lot of performance
-<<<<<<< HEAD
--c [--config] [STRING] Configuration filename, if none is given the default settings are used (see [DocBlox]/data/docblox.tpl.xml)
-=======
--c [--config] [STRING] Configuration filename OR "none", when this option is omitted DocBlox tries to load the docblox.xml or docblox.dist.xml from the current working directory
->>>>>>> benmatselby-application-runner
View
29 tests/ui/docblox-project-run-quiet.phpt.orig
@@ -1,29 +0,0 @@
---TEST--
-docblox project:run -f dirname(__FILE__) . '/../data/DocBlockTestFixture.php' -t dirname(__FILE__) . '/../../build/' -q
---FILE--
-<?php
-
-<<<<<<< HEAD
-$_SERVER['argv'][0] = 'docblox';
-=======
->>>>>>> benmatselby-application-runner
-$_SERVER['argv'][1] = 'project:run';
-$_SERVER['argv'][2] = '-f';
-$_SERVER['argv'][3] = dirname(__FILE__) . '/../data/DocBlockTestFixture.php';
-$_SERVER['argv'][4] = '-t';
-$_SERVER['argv'][5] = dirname(__FILE__) . '/../../build/';
-$_SERVER['argv'][6] = '-q';
-
-// determine base include folder, if @php_bin@ contains @php_bin then we do not install via PEAR
-if (strpos('@php_bin@', '@php_bin') === 0) {
- set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
-}
-
-require_once 'Zend/Loader/Autoloader.php';
-$autoloader = Zend_Loader_Autoloader::getInstance();
-$autoloader->registerNamespace('DocBlox_');
-
-$application = new DocBlox_Core_Application();
-$application->main();
-?>
---EXPECTF--
View
0 tests/ui/docblox-project-run-quiet.phpt → tests/ui/docblox-project-run-quiet.phpt~
File renamed without changes.

0 comments on commit c3e3652

Please sign in to comment.
Something went wrong with that request. Please try again.