Changeset 7443

Timestamp:

02/09/08 22:12:13 (10 months ago)

Author:

francois

Message:

sfPropelVersionableBehaviorPlugin Fixed two bugs (and added unit tests for them)

Files:

• plugins/sfPropelVersionableBehaviorPlugin/trunk/README (modified) (1 diff)
• plugins/sfPropelVersionableBehaviorPlugin/trunk/lib/sfPropelVersionableBehavior.class.php (modified) (4 diffs)
• plugins/sfPropelVersionableBehaviorPlugin/trunk/test/unit/PropelVersionableBehaviorTest.php (modified) (4 diffs)

plugins/sfPropelVersionableBehaviorPlugin/trunk/README

@@ -304 +304 @@
-== Changelog ==
-
-8
+9
-
- * francois: Added `getCurrentResourceVersion`, `setResourceCreatedBy`, `getResourceCreatedBy`, `setResourceComment` and `getResourceComment` methods to the public API

plugins/sfPropelVersionableBehaviorPlugin/trunk/lib/sfPropelVersionableBehavior.class.php

@@ -173 +173 @@
-    }
-    self::incrementVersion($resource);
+    if(!$createdBy && isset($resource->versionCreatedBy) && $resource->versionCreatedBy != '')
+    {
+      $createdBy = $resource->versionCreatedBy;
+      $resource->versionCreatedBy = '';
+    }
+    if(!$comment && isset($resource->versionComment) && $resource->versionComment != '')
+    {
+      $comment = $resource->versionComment;
+      $resource->versionComment = '';
+    }
-    self::createResourceVersion($resource, $createdBy, $comment);
-  }
@@ -222 +232 @@
-  public function getVersionComment(BaseObject $resource)
-  {
-
+ && $resource->versionComment
-    {
-      return $resource->versionComment;
@@ -253 +263 @@
-  public function getVersionCreatedBy(BaseObject $resource)
-  {
-
+ && $resource->versionCreatedBy
-    {
-      return $resource->versionCreatedBy;
@@ -300 +310 @@
-    if (self::versionConditionMet($resource))
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    if(isset($resource->resourceVersion) && $resource->resourceVersion instanceOf ResourceVersion)

plugins/sfPropelVersionableBehaviorPlugin/trunk/test/unit/PropelVersionableBehaviorTest.php

@@ -78 +78 @@
-))));
-
-3
+9
-
-// save()
@@ -125 +125 @@
-$t->is($r2->getVersionCreatedBy(), 'foo', 'getVersionCreatedBy() returns the creation date of the revision');
-$t->is($r3->getVersionCreatedBy(), 'foo', 'getVersionCreatedBy() is a proxy method for getCurrentResourceVersion()->getCreatedBy()');
-Las
+Curren
-$t->is($r2->getVersionComment(), 'bar', 'getVersionComment() is a proxy method for getCurrentResourceVersion()->getComment()');
-$t->is($r3->getVersionComment(), 'bar', 'getVersionComment() is a proxy method for getCurrentResourceVersion()->getComment()');
+$r2->setByName($test_class_title_column, 'v0', BasePeer::TYPE_FIELDNAME);
+$r2->save();
+$resourceVersion = $r2->getCurrentResourceVersion();
+$t->is($resourceVersion->getCreatedBy(), '', 'setVersionCreatedBy() only affects the next version saved');
+$t->is($resourceVersion->getComment(), '', 'setVersionComment() only affects the next version saved');
-
-// conditional versioning
@@ -153 +158 @@
-{
-  $r2->setByName($test_class_title_column, 'v0', BasePeer::TYPE_FIELDNAME);
-'author1'
+
-  $r2->save();
-  $t->pass('calling addVersion() on an unsaved object does not throw an exception');
@@ -160 +165 @@
-}
-$t->is($r2->getLastResourceVersion()->getNumber(), 1, 'addVersion() creates a version object even on unsaved objects');
+
+$r2->setByName($test_class_title_column, 'v1', BasePeer::TYPE_FIELDNAME);
+$r2->setVersionCreatedBy('author2');
+$r2->setVersionComment('baz');
+$r2->addVersion();
+$r2->save();
+$resourceVersion = $r2->getCurrentResourceVersion();
+$t->is($resourceVersion->getCreatedBy(), 'author2', 'addVersion() allows for use of setVersionCreatedBy()');
+$t->is($resourceVersion->getComment(), 'baz', 'addVersion() allows for use of setVersionComment()');
+
+$r2->setByName($test_class_title_column, 'v2', BasePeer::TYPE_FIELDNAME);
+$r2->addVersion('author3', 'bazz');
+$r2->save();
+$resourceVersion = $r2->getCurrentResourceVersion();
+$t->is($resourceVersion->getCreatedBy(), 'author3', 'addVersion() accepts a version author name as first parameter');
+$t->is($resourceVersion->getComment(), 'bazz', 'addVersion() accepts a version comment as second parameter');
-
-