mikaelkael
2010-08-08 19:32:57 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][22820] standard/branches/release-1.10/tests: [ZF-10283]: merge r22817 and r22818 to 1.10 branch</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>22820</dd>
<dt>Author</dt> <dd>mikaelkael</dd>
<dt>Date</dt> <dd>2010-08-08 12:32:56 -0700 (Sun, 08 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-10283]: merge r22817 and r22818 to 1.10 branch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110testsTestConfigurationphpdist">standard/branches/release-1.10/tests/TestConfiguration.php.dist</a></li>
<li><a href="#standardbranchesrelease110testsTestHelperphp">standard/branches/release-1.10/tests/TestHelper.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110testsTestConfigurationphpdist"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/tests/TestConfiguration.php.dist (22819 => 22820)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/tests/TestConfiguration.php.dist 2010-08-08 18:02:22 UTC (rev 22819)
+++ standard/branches/release-1.10/tests/TestConfiguration.php.dist 2010-08-08 19:32:56 UTC (rev 22820)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> <?php
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Zend Framework
</span><span class="cx"> *
</span><span class="lines">@@ -14,12 +15,638 @@
</span><span class="cx"> *
</span><span class="cx"> * @category Zend
</span><span class="cx"> * @package UnitTests
</span><del>- * @version $Id$
</del><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><ins>+ * This file defines configuration for running the unit tests for the Zend
+ * Framework. Some tests have dependencies to PHP extensions or databases
+ * which may not necessary installed on the target system. For these cases,
+ * the ability to disable or configure testing is provided below. Tests for
+ * components which should run universally are always run by the master
+ * suite and cannot be disabled.
+ *
+ * Do not edit this file. Instead, copy this file to TestConfiguration.php,
+ * and edit the new file. Never commit plaintext passwords to the source
+ * code repository.
+ */
+
+/**
+ * GENERAL SETTINGS
+ *
+ * OB_ENABLED should be enabled for some tests to check if all functionality
+ * works as expected. Such tests include those for Zend_Soap and Zend_Session,
+ * which require that headers not be sent in order to work.
+ */
+define('TESTS_ZEND_OB_ENABLED', false);
+
+/**
+ * Zend_Auth_Adapter_DbTable tests
+ */
+define('TESTS_ZEND_AUTH_ADAPTER_DBTABLE_PDO_SQLITE_ENABLED', false);
+define('TESTS_ZEND_AUTH_ADAPTER_DBTABLE_PDO_SQLITE_DATABASE', ':memory:');
+
+/**
+ * Zend_Auth_Adapter_Ldap online tests
+ * (See also TESTS_ZEND_LDAP_* configuration constants below)
+ */
+define('TESTS_ZEND_AUTH_ADAPTER_LDAP_ONLINE_ENABLED', false);
+
+/**
+ * Zend_Cache
+ *
+ * TESTS_ZEND_CACHE_SQLITE_ENABLED => sqlite extension has to be enabled
+ * TESTS_ZEND_CACHE_APC_ENABLED => apc extension has to be enabled
+ * TESTS_ZEND_CACHE_MEMCACHED_ENABLED => memcache extension has to be enabled and
+ * a memcached server has to be available
+ * TESTS_ZEND_CACHE_XCACHE_ENABLED => xcache extension has to be enabled
+ */
+define('TESTS_ZEND_CACHE_SQLITE_ENABLED', false);
+define('TESTS_ZEND_CACHE_APC_ENABLED', false);
+define('TESTS_ZEND_CACHE_XCACHE_ENABLED', true);
+define('TESTS_ZEND_CACHE_XCACHE_USER', null);
+define('TESTS_ZEND_CACHE_XCACHE_PASSWORD', null);
+define('TESTS_ZEND_CACHE_PLATFORM_ENABLED', false);
+define('TESTS_ZEND_CACHE_MEMCACHED_ENABLED', false);
+define('TESTS_ZEND_CACHE_MEMCACHED_HOST', '127.0.0.1');
+define('TESTS_ZEND_CACHE_MEMCACHED_PORT', 11211);
+define('TESTS_ZEND_CACHE_MEMCACHED_PERSISTENT', true);
+
+/**
+ * Zend_Controller
+ *
+ * TESTS_ZEND_CONTROLLER_DISPATCHER_OB => test disabling output buffering in
+ * dispatcher
+ */
+define('TESTS_ZEND_CONTROLLER_DISPATCHER_OB', false);
+
+/**
+ * Zend_Db_Adapter_Pdo_Mysql and Zend_Db_Adapter_Mysqli
+ *
+ * There are separate properties to enable tests for the PDO_MYSQL adapter and
+ * the native Mysqli adapters, but the other properties are shared between the
+ * two MySQL-related Zend_Db adapters.
+ */
+define('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED', false);
+define('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED', false);
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_HOSTNAME', '127.0.0.1');
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_USERNAME', null);
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD', null);
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_DATABASE', 'test');
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_PORT', 3306);
+
+/**
+ * Zend_Db_Adapter_Pdo_Sqlite
+ *
+ * Username and password are irrelevant for SQLite.
+ */
+define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED', false);
+define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_DATABASE', ':memory:');
+
+/**
+ * Zend_Db_Adapter_Pdo_Mssql
+ *
+ * Note that you need to patch your ntwdblib.dll, the one that
+ * comes with PHP does not work. See user comments at
+ * http://us2.php.net/manual/en/ref.mssql.php
+ */
+define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_ENABLED', false);
+define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_HOSTNAME', '127.0.0.1');
+define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_USERNAME', null);
+define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_PASSWORD', null);
</ins><span class="lines">@@ Diff output truncated at 4096 characters. @@
</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][22820] standard/branches/release-1.10/tests: [ZF-10283]: merge r22817 and r22818 to 1.10 branch</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>22820</dd>
<dt>Author</dt> <dd>mikaelkael</dd>
<dt>Date</dt> <dd>2010-08-08 12:32:56 -0700 (Sun, 08 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-10283]: merge r22817 and r22818 to 1.10 branch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110testsTestConfigurationphpdist">standard/branches/release-1.10/tests/TestConfiguration.php.dist</a></li>
<li><a href="#standardbranchesrelease110testsTestHelperphp">standard/branches/release-1.10/tests/TestHelper.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110testsTestConfigurationphpdist"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/tests/TestConfiguration.php.dist (22819 => 22820)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/tests/TestConfiguration.php.dist 2010-08-08 18:02:22 UTC (rev 22819)
+++ standard/branches/release-1.10/tests/TestConfiguration.php.dist 2010-08-08 19:32:56 UTC (rev 22820)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> <?php
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Zend Framework
</span><span class="cx"> *
</span><span class="lines">@@ -14,12 +15,638 @@
</span><span class="cx"> *
</span><span class="cx"> * @category Zend
</span><span class="cx"> * @package UnitTests
</span><del>- * @version $Id$
</del><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><ins>+ * This file defines configuration for running the unit tests for the Zend
+ * Framework. Some tests have dependencies to PHP extensions or databases
+ * which may not necessary installed on the target system. For these cases,
+ * the ability to disable or configure testing is provided below. Tests for
+ * components which should run universally are always run by the master
+ * suite and cannot be disabled.
+ *
+ * Do not edit this file. Instead, copy this file to TestConfiguration.php,
+ * and edit the new file. Never commit plaintext passwords to the source
+ * code repository.
+ */
+
+/**
+ * GENERAL SETTINGS
+ *
+ * OB_ENABLED should be enabled for some tests to check if all functionality
+ * works as expected. Such tests include those for Zend_Soap and Zend_Session,
+ * which require that headers not be sent in order to work.
+ */
+define('TESTS_ZEND_OB_ENABLED', false);
+
+/**
+ * Zend_Auth_Adapter_DbTable tests
+ */
+define('TESTS_ZEND_AUTH_ADAPTER_DBTABLE_PDO_SQLITE_ENABLED', false);
+define('TESTS_ZEND_AUTH_ADAPTER_DBTABLE_PDO_SQLITE_DATABASE', ':memory:');
+
+/**
+ * Zend_Auth_Adapter_Ldap online tests
+ * (See also TESTS_ZEND_LDAP_* configuration constants below)
+ */
+define('TESTS_ZEND_AUTH_ADAPTER_LDAP_ONLINE_ENABLED', false);
+
+/**
+ * Zend_Cache
+ *
+ * TESTS_ZEND_CACHE_SQLITE_ENABLED => sqlite extension has to be enabled
+ * TESTS_ZEND_CACHE_APC_ENABLED => apc extension has to be enabled
+ * TESTS_ZEND_CACHE_MEMCACHED_ENABLED => memcache extension has to be enabled and
+ * a memcached server has to be available
+ * TESTS_ZEND_CACHE_XCACHE_ENABLED => xcache extension has to be enabled
+ */
+define('TESTS_ZEND_CACHE_SQLITE_ENABLED', false);
+define('TESTS_ZEND_CACHE_APC_ENABLED', false);
+define('TESTS_ZEND_CACHE_XCACHE_ENABLED', true);
+define('TESTS_ZEND_CACHE_XCACHE_USER', null);
+define('TESTS_ZEND_CACHE_XCACHE_PASSWORD', null);
+define('TESTS_ZEND_CACHE_PLATFORM_ENABLED', false);
+define('TESTS_ZEND_CACHE_MEMCACHED_ENABLED', false);
+define('TESTS_ZEND_CACHE_MEMCACHED_HOST', '127.0.0.1');
+define('TESTS_ZEND_CACHE_MEMCACHED_PORT', 11211);
+define('TESTS_ZEND_CACHE_MEMCACHED_PERSISTENT', true);
+
+/**
+ * Zend_Controller
+ *
+ * TESTS_ZEND_CONTROLLER_DISPATCHER_OB => test disabling output buffering in
+ * dispatcher
+ */
+define('TESTS_ZEND_CONTROLLER_DISPATCHER_OB', false);
+
+/**
+ * Zend_Db_Adapter_Pdo_Mysql and Zend_Db_Adapter_Mysqli
+ *
+ * There are separate properties to enable tests for the PDO_MYSQL adapter and
+ * the native Mysqli adapters, but the other properties are shared between the
+ * two MySQL-related Zend_Db adapters.
+ */
+define('TESTS_ZEND_DB_ADAPTER_PDO_MYSQL_ENABLED', false);
+define('TESTS_ZEND_DB_ADAPTER_MYSQLI_ENABLED', false);
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_HOSTNAME', '127.0.0.1');
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_USERNAME', null);
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_PASSWORD', null);
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_DATABASE', 'test');
+define('TESTS_ZEND_DB_ADAPTER_MYSQL_PORT', 3306);
+
+/**
+ * Zend_Db_Adapter_Pdo_Sqlite
+ *
+ * Username and password are irrelevant for SQLite.
+ */
+define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_ENABLED', false);
+define('TESTS_ZEND_DB_ADAPTER_PDO_SQLITE_DATABASE', ':memory:');
+
+/**
+ * Zend_Db_Adapter_Pdo_Mssql
+ *
+ * Note that you need to patch your ntwdblib.dll, the one that
+ * comes with PHP does not work. See user comments at
+ * http://us2.php.net/manual/en/ref.mssql.php
+ */
+define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_ENABLED', false);
+define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_HOSTNAME', '127.0.0.1');
+define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_USERNAME', null);
+define('TESTS_ZEND_DB_ADAPTER_PDO_MSSQL_PASSWORD', null);
</ins><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>
</body>
</html>