mikaelkael
2010-08-08 17:53:52 UTC
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22818] standard/trunk/tests/TestHelper.php: [ZF-10283]: properly integrate unit test configuration for WindowsAzure without erasing all the file</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22818</dd>
<dt>Author</dt> <dd>mikaelkael</dd>
<dt>Date</dt> <dd>2010-08-08 10:53:51 -0700 (Sun, 08 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-10283]: properly integrate unit test configuration for WindowsAzure without erasing all the file</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunktestsTestHelperphp">standard/trunk/tests/TestHelper.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunktestsTestHelperphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/tests/TestHelper.php (22817 => 22818)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/tests/TestHelper.php 2010-08-08 17:30:19 UTC (rev 22817)
+++ standard/trunk/tests/TestHelper.php 2010-08-08 17:53:51 UTC (rev 22818)
</span><span class="lines">@@ -13,18 +13,14 @@
</span><span class="cx"> * to license-C1q0ot2/***@public.gmane.org so we can send you a copy immediately.
</span><span class="cx"> *
</span><span class="cx"> * @category Zend
</span><del>- * @package UnitTests
- * @version $Id$
</del><ins>+ * @package Zend
+ * @subpackage UnitTests
</ins><span class="cx"> * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
</span><span class="cx"> * @license http://framework.zend.com/license/new-bsd New BSD License
</span><ins>+ * @version $Id$
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Start output buffering
- */
-ob_start();
-
-/*
</del><span class="cx"> * Include PHPUnit dependencies
</span><span class="cx"> */
</span><span class="cx"> require_once 'PHPUnit/Framework.php';
</span><span class="lines">@@ -36,7 +32,7 @@
</span><span class="cx"> require_once 'PHPUnit/Util/Filter.php';
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Set error reporting to the highest level.
</del><ins>+ * Set error reporting to the level to which Zend Framework code must comply.
</ins><span class="cx"> */
</span><span class="cx"> error_reporting( E_ALL | E_STRICT );
</span><span class="cx">
</span><span class="lines">@@ -44,20 +40,13 @@
</span><span class="cx"> * Determine the root, library, and tests directories of the framework
</span><span class="cx"> * distribution.
</span><span class="cx"> */
</span><del>-$zfRoot = dirname(__FILE__) . '/..';
</del><ins>+$zfRoot = realpath(dirname(dirname(__FILE__)));
</ins><span class="cx"> $zfCoreLibrary = "$zfRoot/library";
</span><span class="cx"> $zfCoreTests = "$zfRoot/tests";
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Omit from code coverage reports the contents of the tests directory
- */
-foreach (array('php', 'phtml', 'csv') as $suffix) {
- PHPUnit_Util_Filter::addDirectoryToFilter($zfCoreTests, ".$suffix");
-}
-
-/*
- * Prepend the library/ and tests/ directories to the include_path.
- * This allows the tests to run out of the box and helps prevent
</del><ins>+ * Prepend the Zend Framework library/ and tests/ directories to the
+ * include_path. This allows the tests to run out of the box and helps prevent
</ins><span class="cx"> * loading other copies of the framework code and tests that would supersede
</span><span class="cx"> * this copy.
</span><span class="cx"> */
</span><span class="lines">@@ -78,17 +67,35 @@
</span><span class="cx"> require_once $zfCoreTests . DIRECTORY_SEPARATOR . 'TestConfiguration.php.dist';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/*
- * Add library/ directory to the PHPUnit code coverage whitelist.
- * This has the effect that only production code source files appear
- * in the code coverage report and that all production code source files, even
- * those that are not covered by a test yet, are processed.
- */
-if (defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_GENERATE_REPORT') && TESTS_ZEND_SERVICE_WINDOWSAZURE_GENERATE_REPORT === true && </del><ins>+if (defined('TESTS_GENERATE_REPORT') && TESTS_GENERATE_REPORT === true && </ins><span class="cx"> version_compare(PHPUnit_Runner_Version::id(), '3.1.6', '>=')) {
</span><ins>+
+ /*
+ * Add Zend Framework library/ directory to the PHPUnit code coverage
+ * whitelist. This has the effect that only production code source files
+ * appear in the code coverage report and that all production code source
+ * files, even those that are not covered by a test yet, are processed.
+ */
</ins><span class="cx"> PHPUnit_Util_Filter::addDirectoryToWhitelist($zfCoreLibrary);
</span><ins>+
+ /*
+ * Omit from code coverage reports the contents of the tests directory
+ */
+ foreach (array('.php', '.phtml', '.csv', '.inc') as $suffix) {
+ PHPUnit_Util_Filter::addDirectoryToFilter($zfCoreTests, $suffix);
+ }
+ PHPUnit_Util_Filter::addDirectoryToFilter(PEAR_INSTALL_DIR);
+ PHPUnit_Util_Filter::addDirectoryToFilter(PHP_LIBDIR);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
+/**
+ * Start output buffering, if enabled
+ */
+if (defined('TESTS_ZEND_OB_ENABLED') && constant('TESTS_ZEND_OB_ENABLED')) {
+ ob_start();
+}
+
</ins><span class="cx"> /*
</span><span class="cx"> * Unset global variables that are no longer needed.
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22818] standard/trunk/tests/TestHelper.php: [ZF-10283]: properly integrate unit test configuration for WindowsAzure without erasing all the file</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22818</dd>
<dt>Author</dt> <dd>mikaelkael</dd>
<dt>Date</dt> <dd>2010-08-08 10:53:51 -0700 (Sun, 08 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-10283]: properly integrate unit test configuration for WindowsAzure without erasing all the file</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunktestsTestHelperphp">standard/trunk/tests/TestHelper.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunktestsTestHelperphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/tests/TestHelper.php (22817 => 22818)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/tests/TestHelper.php 2010-08-08 17:30:19 UTC (rev 22817)
+++ standard/trunk/tests/TestHelper.php 2010-08-08 17:53:51 UTC (rev 22818)
</span><span class="lines">@@ -13,18 +13,14 @@
</span><span class="cx"> * to license-C1q0ot2/***@public.gmane.org so we can send you a copy immediately.
</span><span class="cx"> *
</span><span class="cx"> * @category Zend
</span><del>- * @package UnitTests
- * @version $Id$
</del><ins>+ * @package Zend
+ * @subpackage UnitTests
</ins><span class="cx"> * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
</span><span class="cx"> * @license http://framework.zend.com/license/new-bsd New BSD License
</span><ins>+ * @version $Id$
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Start output buffering
- */
-ob_start();
-
-/*
</del><span class="cx"> * Include PHPUnit dependencies
</span><span class="cx"> */
</span><span class="cx"> require_once 'PHPUnit/Framework.php';
</span><span class="lines">@@ -36,7 +32,7 @@
</span><span class="cx"> require_once 'PHPUnit/Util/Filter.php';
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Set error reporting to the highest level.
</del><ins>+ * Set error reporting to the level to which Zend Framework code must comply.
</ins><span class="cx"> */
</span><span class="cx"> error_reporting( E_ALL | E_STRICT );
</span><span class="cx">
</span><span class="lines">@@ -44,20 +40,13 @@
</span><span class="cx"> * Determine the root, library, and tests directories of the framework
</span><span class="cx"> * distribution.
</span><span class="cx"> */
</span><del>-$zfRoot = dirname(__FILE__) . '/..';
</del><ins>+$zfRoot = realpath(dirname(dirname(__FILE__)));
</ins><span class="cx"> $zfCoreLibrary = "$zfRoot/library";
</span><span class="cx"> $zfCoreTests = "$zfRoot/tests";
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * Omit from code coverage reports the contents of the tests directory
- */
-foreach (array('php', 'phtml', 'csv') as $suffix) {
- PHPUnit_Util_Filter::addDirectoryToFilter($zfCoreTests, ".$suffix");
-}
-
-/*
- * Prepend the library/ and tests/ directories to the include_path.
- * This allows the tests to run out of the box and helps prevent
</del><ins>+ * Prepend the Zend Framework library/ and tests/ directories to the
+ * include_path. This allows the tests to run out of the box and helps prevent
</ins><span class="cx"> * loading other copies of the framework code and tests that would supersede
</span><span class="cx"> * this copy.
</span><span class="cx"> */
</span><span class="lines">@@ -78,17 +67,35 @@
</span><span class="cx"> require_once $zfCoreTests . DIRECTORY_SEPARATOR . 'TestConfiguration.php.dist';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/*
- * Add library/ directory to the PHPUnit code coverage whitelist.
- * This has the effect that only production code source files appear
- * in the code coverage report and that all production code source files, even
- * those that are not covered by a test yet, are processed.
- */
-if (defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_GENERATE_REPORT') && TESTS_ZEND_SERVICE_WINDOWSAZURE_GENERATE_REPORT === true && </del><ins>+if (defined('TESTS_GENERATE_REPORT') && TESTS_GENERATE_REPORT === true && </ins><span class="cx"> version_compare(PHPUnit_Runner_Version::id(), '3.1.6', '>=')) {
</span><ins>+
+ /*
+ * Add Zend Framework library/ directory to the PHPUnit code coverage
+ * whitelist. This has the effect that only production code source files
+ * appear in the code coverage report and that all production code source
+ * files, even those that are not covered by a test yet, are processed.
+ */
</ins><span class="cx"> PHPUnit_Util_Filter::addDirectoryToWhitelist($zfCoreLibrary);
</span><ins>+
+ /*
+ * Omit from code coverage reports the contents of the tests directory
+ */
+ foreach (array('.php', '.phtml', '.csv', '.inc') as $suffix) {
+ PHPUnit_Util_Filter::addDirectoryToFilter($zfCoreTests, $suffix);
+ }
+ PHPUnit_Util_Filter::addDirectoryToFilter(PEAR_INSTALL_DIR);
+ PHPUnit_Util_Filter::addDirectoryToFilter(PHP_LIBDIR);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
+/**
+ * Start output buffering, if enabled
+ */
+if (defined('TESTS_ZEND_OB_ENABLED') && constant('TESTS_ZEND_OB_ENABLED')) {
+ ob_start();
+}
+
</ins><span class="cx"> /*
</span><span class="cx"> * Unset global variables that are no longer needed.
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>