Discussion:
[22953] laboratory/Zend_Cloud/trunk: Working SimpleDb tests
matthew
2010-09-16 20:22:48 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][22953] laboratory/Zend_Cloud/trunk: Working SimpleDb tests</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>22953</dd>
<dt>Author</dt> <dd>matthew</dd>
<dt>Date</dt> <dd>2010-09-16 13:22:48 -0700 (Thu, 16 Sep 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Working SimpleDb tests

- All tests now pass.
That said, it's next to impossible to run them all at the same time. In a
single run, I've experienced:
- Service unavailable (test error due to exception)
- Service returns unexpected response (resulting in test failure)
- Service returns properly (test passes)
As such, I'm not sure if we can automate these tests in any way.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterSimpleDbQueryphp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php</a></li>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterSimpleDbphp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php</a></li>
<li><a href="#laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceQueryphp">laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Query.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_CloudtrunktestsZendCloudDocumentServiceTestCasephp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/TestCase.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#laboratoryZend_CloudtrunktestsZendCloudDocumentServiceAdapterSkipphp">laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/Adapter/Skip.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterSimpleDbQueryphp"></a>
<div class="modfile"><h4>Modified: laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php (22952 => 22953)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php 2010-09-16 20:22:46 UTC (rev 22952)
+++ laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php 2010-09-16 20:22:48 UTC (rev 22953) </span><span class="lines">@@ -102,7 +102,7 @@ </span><span class="cx"> } </span><span class="cx"> break; </span><span class="cx"> case self::QUERY_WHEREID: </span><del>- $statement = $this-&gt;_parseWhere('ItemName() = ?', array($args[0])); </del><ins>+ $statement = $this-&gt;_parseWhere('ItemName() = ?', array($args));
</ins><span class="cx"> if (null === $where) {
</span><span class="cx"> $where = $statement;
</span><span class="cx"> } else {
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case self::QUERY_LIMIT:
</span><del>- $limit = $args[0];
</del><ins>+ $limit = $args;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> // Ignore unknown clauses
</span></span></pre></div>
<a id="laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceAdapterSimpleDbphp"></a>
<div class="modfile"><h4>Modified: laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php (22952 => 22953)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php 2010-09-16 20:22:46 UTC (rev 22952)
+++ laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php 2010-09-16 20:22:48 UTC (rev 22953) </span><span class="lines">@@ -239,7 +239,9 @@ </span><span class="cx"> { </span><span class="cx"> if (null === $fieldset &amp;&amp; $documentId instanceof Zend_Cloud_DocumentService_Document) { </span><span class="cx"> $fieldset = $documentId-&gt;getFields(); </span><del>- $documentId = $documentId-&gt;getId();
</del><ins>+ if (empty($documentId)) {
+ $documentId = $documentId-&gt;getId();
+ } </ins><span class="cx"> } elseif ($fieldset instanceof Zend_Cloud_DocumentService_Document) { </span><span class="cx"> if (empty($documentId)) { </span><span class="cx"> $documentId = $fieldset-&gt;getId(); </span><span class="lines">@@ -416,7 +418,7 @@ </span><span class="cx"> // Return as document object? </span><span class="cx"> if ($returnDocument) { </span><span class="cx"> $documentClass = $this-&gt;getDocumentClass(); </span><del>- return new $documentClass($attr-&gt;getItemName(), $result); </del><ins>+ return new $documentClass($result, $attr-&gt;getItemName()); </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> return $result; </span><span class="lines">@@ -443,7 +445,7 @@ </span><span class="cx"> } </span><span class="cx"> </span><span class="cx"> $documentClass = $this-&gt;getDocumentClass();
</span><del>- return new $documentClass($key, $document);
</del><ins>+ return new $documentClass($document, $key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="laboratoryZend_CloudtrunklibraryZendCloudDocumentServiceQueryphp"></a>
<div class="modfile"><h4>Modified: laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Query.php (22952 => 22953)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Query.php 2010-09-16 20:22:46 UTC (rev 22952)
+++ laboratory/Zend_Cloud/trunk/library/Zend/Cloud/DocumentService/Query.php 2010-09-16 20:22:48 UTC (rev 22953)
</span><span class="lines">@@ -72,11 +72,14 @@
</span><span class="cx"> /**
</span><span class="cx"> * SELECT clause (fields to be selected)
</span><span class="cx"> *
</span><del>- * @param mixed $select
- * @return void
</del><ins>+ * @param null|string|array $select
+ * @return Zend_Cloud_DocumentService_Query
</ins><span class="cx"> */
</span><span class="cx"> public function select($select)
</span><span class="cx"> {
</span><ins>+ if (empty($select)) {
+ return $this;
+ } </ins><span class="cx"> if (!is_string($select) &amp;&amp; !is_array($select)) { </span><span class="cx"> require_once 'Zend/Cloud/DocumentService/Exception.php'; </span><span class="cx"> throw new Zend_Cloud_DocumentService_Exception(&quot;SELECT argument must be a string or an array of strings&quot;); </span><span class="lines">@@ -131,7 +134,7 @@ </span><span class="cx"> require_once 'Zend/Cloud/DocumentService/Exception.php'; </span><span class="cx"> throw new Zend_Cloud_DocumentService_Exception(&quot;WHEREID argument must be a scalar&quot;); </span><span class="cx"> } </span><del>- $this-&gt;clauses[] = array(self::QUERY_WHEREID, $value); </del><ins>+ $this-&gt;_clauses[] = array(self::QUERY_WHEREID, $value); </ins><span class="cx"> return $this; </span><span class="cx"> } </span><span class="cx"> </span><span class="lines">@@ -147,7 +150,7 @@ </span><span class="cx"> require_once 'Zend/Cloud/DocumentService/Exception.php'; </span><span class="cx"> throw new Zend_Cloud_DocumentService_Exception(&quot;LIMIT argument must be an integer&quot;); </span><span class="cx"> } </span><del>- $this-&gt;clauses[] = array(self::QUERY_LIMIT, $value); </del><ins>+ $this-&gt;_clauses[] = array(self::QUERY_LIMIT, $limit);
</ins><span class="cx"> return $this;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="laboratoryZend_CloudtrunktestsZendCloudDocumentServiceAdapterSimpleDbTestphp"></a>
<div class="modfile"><h4>Modified: laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php (22952 => 22953)</h4>
<pre class="diff"><span>
<span class="info">--- laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php 2010-09-16 20:22:46 UTC (rev 22952)
+++ laboratory/Zend_Cloud/trunk/tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php 2010-09-16 20:22:48 UTC (rev 22953)
</span><span class="lines">@@ -35,11 +35,15 @@
</span><span class="cx"> */
</span><span class="cx"> require_once 'Zend/Cloud/DocumentService/TestCase.php';
</span><span class="cx">
</span><del>-/**
- * @see Zend_Cloud_DocumenteService_Adapter_SimpleDb
- */
</del><ins>+/** @see Zend_Cloud_DocumenteService_Factory */
+require_once 'Zend/Cloud/DocumentService/Factory.php';
+
+/** @see Zend_Cloud_DocumenteService_Adapter_SimpleDb */
</ins><span class="cx"> require_once 'Zend/Cloud/DocumentService/Adapter/SimpleDb.php';
</span><span class="cx">
</span><ins>+/** @see Zend_Config */
+require_once 'Zend/Config.php';
+
</ins><span class="cx"> /**
</span><span class="cx"> * @category Zend
</span><span class="cx"> * @package Zend_Cloud
</span><span class="lines">@@ -47,7 +51,8 @@
</span><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><span class="cx"> */
</span><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...