Discussion:
[22870] standard/trunk/tests: ZF-10354
ralph
2010-08-21 15:10:00 UTC
Permalink
<!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][22870] standard/trunk/tests: ZF-10354</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>22870</dd>
<dt>Author</dt> <dd>ralph</dd>
<dt>Date</dt> <dd>2010-08-21 08:09:59 -0700 (Sat, 21 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>ZF-10354
- Fixed TestConfiguration.php.dist to disable tests
- Fixed AllTests to include all testcase files
- Removed main() functions from tests cases
- Fixed suite creation to not fail tests with __CLASS__ passed as param
- Properly markTestSkipped() when tests are disabled
- Removed superfluous require_onces (PHPUnit assests &amp; TestConfiguration.php.dist)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunktestsTestConfigurationphpdist">standard/trunk/tests/TestConfiguration.php.dist</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureAllTestsphp">standard/trunk/tests/Zend/Service/WindowsAzure/AllTests.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureBlobStorageSharedAccessTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureBlobStorageTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/BlobStorageTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureBlobStreamTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/BlobStreamTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureCredentialsAllTestsphp">standard/trunk/tests/Zend/Service/WindowsAzure/Credentials/AllTests.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureCredentialsSharedAccessSignatureTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureCredentialsSharedKeyLiteTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureCredentialsSharedKeyTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureDiagnosticsAllTestsphp">standard/trunk/tests/Zend/Service/WindowsAzure/Diagnostics/AllTests.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureDiagnosticsManagerTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/Diagnostics/ManagerTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureDynamicTableEntityTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureQueueStorageTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/QueueStorageTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureRetryPolicyTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/RetryPolicyTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureSessionHandlerTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/SessionHandlerTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureStorageTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/StorageTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureTableEntityQueryTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureTableEntityTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/TableEntityTest.php</a></li>
<li><a href="#standardtrunktestsZendServiceWindowsAzureTableStorageTestphp">standard/trunk/tests/Zend/Service/WindowsAzure/TableStorageTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunktestsTestConfigurationphpdist"></a>
<div class="modfile"><h4>Modified: standard/trunk/tests/TestConfiguration.php.dist (22869 => 22870)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/tests/TestConfiguration.php.dist 2010-08-21 13:57:59 UTC (rev 22869)
+++ standard/trunk/tests/TestConfiguration.php.dist 2010-08-21 15:09:59 UTC (rev 22870)
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Blob storage tests
</span><span class="cx"> */
</span><del>-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS', true);
</del><ins>+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS', false);
</ins><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNONPROD', false);
</span><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNLARGEBLOB', true);
</span><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_CONTAINER_PREFIX', 'phpazuretestblob');
</span><span class="lines">@@ -685,28 +685,28 @@
</span><span class="cx"> /**
</span><span class="cx"> * Table storage tests
</span><span class="cx"> */
</span><del>-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNTESTS', true);
</del><ins>+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNTESTS', false);
</ins><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNONPROD', false);
</span><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_TABLENAME_PREFIX', 'phpazuretesttable');
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Queue storage tests
</span><span class="cx"> */
</span><del>-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS', true);
</del><ins>+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS', false);
</ins><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNONPROD', false);
</span><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_PREFIX', 'phpazuretestqueue');
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * SessionHandler tests
</span><span class="cx"> */
</span><del>-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS', true);
</del><ins>+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS', false);
</ins><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNONPROD', false);
</span><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_TABLENAME_PREFIX', 'phpazuretestsession');
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Diagnostics tests
</span><span class="cx"> */
</span><del>-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS', true);
</del><ins>+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS', false);
</ins><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNONPROD', false);
</span><span class="cx"> define('TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_CONTAINER_PREFIX', 'phpazuretestdiag');
</span><span class="cx">
</span></span></pre></div>
<a id="standardtrunktestsZendServiceWindowsAzureAllTestsphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/tests/Zend/Service/WindowsAzure/AllTests.php (22869 => 22870)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/tests/Zend/Service/WindowsAzure/AllTests.php 2010-08-21 13:57:59 UTC (rev 22869)
+++ standard/trunk/tests/Zend/Service/WindowsAzure/AllTests.php 2010-08-21 15:09:59 UTC (rev 22870)
</span><span class="lines">@@ -25,10 +25,6 @@
</span><span class="cx"> */
</span><span class="cx"> require_once dirname(__FILE__) . '/../../../TestHelper.php';
</span><span class="cx">
</span><del>-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_AllTests::main');
-}
-
</del><span class="cx"> require_once 'Zend/Service/WindowsAzure/Credentials/AllTests.php';
</span><span class="cx"> require_once 'Zend/Service/WindowsAzure/Diagnostics/AllTests.php';
</span><span class="cx"> require_once 'Zend/Service/WindowsAzure/RetryPolicyTest.php';
</span><span class="lines">@@ -53,41 +49,26 @@
</span><span class="cx"> */
</span><span class="cx"> class Zend_Service_WindowsAzure_AllTests
</span><span class="cx"> {
</span><del>- public static function main()
- {
- PHPUnit_TextUI_TestRunner::run(self::suite());
- } </del><span class="cx"> </span><span class="cx"> public static function suite() </span><span class="cx"> { </span><del>- $suite = new PHPUnit_Framework_TestSuite(__CLASS__); </del><ins>+ $suite = new PHPUnit_Framework_TestSuite(); </ins><span class="cx"> </span><span class="cx"> $suite-&gt;addTest(Zend_Service_WindowsAzure_Credentials_AllTests::suite()); </span><span class="cx"> $suite-&gt;addTest(Zend_Service_WindowsAzure_Diagnostics_AllTests::suite()); </span><span class="cx"> </span><span class="cx"> $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_RetryPolicyTest'); </span><span class="cx"> $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_StorageTest');
</span><del>- if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
- $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_BlobStorageTest');
- $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_BlobStorageSharedAccessTest');
- $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_BlobStreamTest');
- }
- if (TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNTESTS) {
- $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_TableEntityTest');
- $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_DynamicTableEntityTest');
- $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_TableEntityQueryTest');
- $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_TableStorageTest');
- }
- if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
- $suite-&gt;addTestSuite('Zend_Service_WindowsAzure_QueueStorageTest');
- }
- if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
</del><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...