Discussion:
[22928] laboratory/Zend_Cloud/trunk: Test cleanup
matthew
2010-09-09 15:40:30 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][22928] laboratory/Zend_Cloud/trunk: Test cleanup</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>22928</dd>
<dt>Author</dt> <dd>matthew</dd>
<dt>Date</dt> <dd>2010-09-09 08:40:24 -0700 (Thu, 09 Sep 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Test cleanup

- Updated all docblocks (created, when necessary)
- Require TestHelper in all classes
- Changed all main() methods to be more succinct
- Tightened up all &quot;PHPUnit_MAIN_METHOD&quot; declarations and invocations
- Renamed SQS to Sqs (class was already correct; tests and filenames were not)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunktestsTestHelperphp">laboratory/Zend_Cloud/trunk/tests/TestHelper.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudDocumentServiceAdapterAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/Adapter/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudDocumentServiceAdapterSimpleDbTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudDocumentServiceAdapterWindowsAzureTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/Adapter/WindowsAzureTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudDocumentServiceAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudDocumentServiceFactoryTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/FactoryTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudDocumentServiceTestCasephp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/TestCase.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudFactoryTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/FactoryTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudQueueServiceAdapterAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/QueueService/Adapter/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudQueueServiceAdapterWindowsAzureTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/QueueService/Adapter/WindowsAzureTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudQueueServiceAdapterZendQueueTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/QueueService/Adapter/ZendQueueTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudQueueServiceAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/QueueService/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudQueueServiceFactoryTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/QueueService/FactoryTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudQueueServiceTestCasephp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/QueueService/TestCase.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudStorageServiceAdapterAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/StorageService/Adapter/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudStorageServiceAdapterFileSystemTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudStorageServiceAdapterNirvanixTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/StorageService/Adapter/NirvanixTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudStorageServiceAdapterS3Testphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/StorageService/Adapter/S3Test.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudStorageServiceAdapterWindowsAzureTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/StorageService/Adapter/WindowsAzureTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudStorageServiceAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/StorageService/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudStorageServiceFactoryTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/StorageService/FactoryTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudStorageServiceTestCasephp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/StorageService/TestCase.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendServiceAmazonAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Service/Amazon/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendServiceAmazonAuthenticationS3Testphp">laboratory/Zend_Cloud/trunk/tests/Zend/Service/Amazon/Authentication/S3Test.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendServiceAmazonAuthenticationV1Testphp">laboratory/Zend_Cloud/trunk/tests/Zend/Service/Amazon/Authentication/V1Test.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendServiceAmazonAuthenticationV2Testphp">laboratory/Zend_Cloud/trunk/tests/Zend/Service/Amazon/Authentication/V2Test.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendServiceAmazonSimpleDbAllTestsphp">laboratory/Zend_Cloud/trunk/tests/Zend/Service/Amazon/SimpleDb/AllTests.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendServiceAmazonSimpleDbOfflineTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Service/Amazon/SimpleDb/OfflineTest.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendServiceAmazonSimpleDbOnlineTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Service/Amazon/SimpleDb/OnlineTest.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudQueueServiceAdapterSqsphp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/QueueService/Adapter/Sqs.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudQueueServiceAdapterSqsTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/QueueService/Adapter/SqsTest.php</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudQueueServiceAdapterSQSphp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/QueueService/Adapter/SQS.php</a></li>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudQueueServiceAdapterSQSTestphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/QueueService/Adapter/SQSTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="laboratoryZend_CloudtrunklibraryZendCloudQueueServiceAdapterSQSphp"></a>
<div class="delfile"><h4>Deleted: laboratory/Zend_Cloud/trunk/library/Zend/Cloud/QueueService/Adapter/SQS.php (22927 => 22928)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/library/Zend/Cloud/QueueService/Adapter/SQS.php 2010-09-09 01:48:42 UTC (rev 22927)
+++ laboratory/Zend_Cloud/trunk/library/Zend/Cloud/QueueService/Adapter/SQS.php 2010-09-09 15:40:24 UTC (rev 22928)
</span><span class="lines">@@ -1,267 +0,0 @@
</span><del>-&lt;?php
-/**
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license-C1q0ot2/***@public.gmane.org so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_Cloud
- * @subpackage QueueService
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-require_once 'Zend/Service/Amazon/Sqs.php';
-require_once 'Zend/Cloud/QueueService/Adapter.php';
-require_once 'Zend/Cloud/QueueService/Exception.php';
-require_once 'Zend/Cloud/QueueService/Message.php';
-
-/**
- * SQS adapter for simple queue service.
- *
- * @category Zend
- * @package Zend_Cloud
- * @subpackage QueueService
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-class Zend_Cloud_QueueService_Adapter_Sqs implements Zend_Cloud_QueueService_Adapter
-{
- /*
- * Options array keys for the SQS adapter.
- */
- const AWS_ACCESS_KEY = 'aws_accesskey';
- const AWS_SECRET_KEY = 'aws_secretkey';
-
- /**
- * Defaults
- */
- const CREATE_TIMEOUT = 30;
-
- /**
- * SQS service instance.
- * @var Zend_Service_Amazon_Sqs
- */
- protected $_sqs;
-
- /**
- * Constructor
- *
- * @param array|Zend_Config $options
- * @return void
- */
- public function __construct($options = array())
- {
- if ($options instanceof Zend_Config) {
- $options = $options-&gt;toArray();
- }
-
- if (!is_array($options)) {
- throw new Zend_Cloud_QueueService_Exception('Invalid options provided');
- }
-
- try {
- $this-&gt;_sqs = new Zend_Service_Amazon_Sqs(
- $options[self::AWS_ACCESS_KEY], $options[self::AWS_SECRET_KEY]
- );
- } catch(Zend_Service_Amazon_Exception $e) {
- throw new Zend_Cloud_QueueService_Exception('Error on create: '.$e-&gt;getMessage(), $e-&gt;getCode(), $e);
- }
-
- if(isset($options[self::HTTP_ADAPTER])) {
- $this-&gt;_sqs-&gt;getHttpClient()-&gt;setAdapter($options[self::HTTP_ADAPTER]);
- }
- }
-
- /**
- * Create a queue. Returns the ID of the created queue (typically the URL).
- * It may take some time to create the queue. Check your vendor's
- * documentation for details.
- *
- * @param string $name
- * @param array $options
- * @return string Queue ID (typically URL)
- */
- public function createQueue($name, $options = null)
- {
- try {
- return $this-&gt;_sqs-&gt;create($name, $options[self::CREATE_TIMEOUT]);
- } catch(Zend_Service_Amazon_Exception $e) {
- throw new Zend_Cloud_QueueService_Exception('Error on queue creation: '.$e-&gt;getMessage(), $e-&gt;getCode(), $e);
- }
- }
-
- /**
- * Delete a queue. All messages in the queue will also be deleted.
- *
- * @param string $queueId
- * @param array $options
- * @return boolean true if successful, false otherwise
- */
- public function deleteQueue($queueId, $options = null)
-{
- try {
- return $this-&gt;_sqs-&gt;delete($queueId);
- } catch(Zend_Service_Amazon_Exception $e) {
- throw Zend_Cloud_QueueService_Exception('Error on queue deletion: '.$e-&gt;getMessage(), $e-&gt;getCode(), $e);
- }
- }
-
- /**
- * List all queues.
- *
- * @param array $options
- * @return array Queue IDs
- */
- public function listQueues($options = null)
- {
- try {
- return $this-&gt;_sqs-&gt;getQueues();
- } catch(Zend_Service_Amazon_Exception $e) {
</del><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...