Changeset 286 for elixir/trunk/tests/test_versioning.py

Timestamp:

01/07/08 18:35:12 (4 years ago)

Author:

cleverdevil

Message:

Applied a patch, closing ticket 29, where the versioning extension was not appropriately handling versioned entities with onupdate events. Patch contributed by Remi Jolin <remi.jolin@…>.

Files:

• elixir/trunk/tests/test_versioning.py (modified) (7 diffs)

elixir/trunk/tests/test_versioning.py

@@ -5 +5 @@
 import time
 
+nextOneValue = 0
+def nextOne():
+    global nextOneValue
+    nextOneValue += 2
+    return nextOneValue
 
 def setup():
@@ -21 +26 @@
         releasedate = Field(DateTime)
         ignoreme = Field(Integer, default=0)
+        autoupd = Field(Integer, default=nextOne, onupdate=nextOne)
         director = ManyToOne('Director', inverse='movies')
         actors = ManyToMany('Actor', inverse='movies', tablename='movie_casting')
         using_options(tablename='movies')
-        acts_as_versioned(ignore=['ignoreme'])
+        acts_as_versioned(ignore=['ignoreme', 'autoupd'])
 
 
@@ -62 +68 @@
         assert movie.title == '12 Monkeys'
         assert movie.director.name == 'Terry Gilliam'
+        assert movie.autoupd == 2, movie.autoupd
         movie.description = 'description two'
         session.flush(); session.clear()
@@ -72 +79 @@
         movie.description = 'description three'
         session.flush(); session.clear()
-    
+
         # Edit the ignored field, this shouldn't change the version
         monkeys = Movie.get_by(title='12 Monkeys')
@@ -83 +90 @@
     
         movie = Movie.get_by(title='12 Monkeys')
+        assert movie.autoupd == 8, movie.autoupd
         oldest_version = movie.get_as_of(after_create)
         middle_version = movie.get_as_of(after_update_one)
@@ -92 +100 @@
         assert oldest_version.description == 'draft description'
         assert oldest_version.ignoreme == 0
+        assert oldest_version.autoupd is not None
+        assert oldest_version.autoupd > 0
     
         assert middle_version.version == 2
         assert middle_version.description == 'description two'
+        assert middle_version.autoupd > oldest_version.autoupd
     
-        assert latest_version.version == 3
+        assert latest_version.version == 3, 'version=%i' % latest_version.version
         assert latest_version.description == 'description three'
         assert latest_version.ignoreme == 1
+        assert latest_version.autoupd > middle_version.autoupd
     
         differences = latest_version.compare_with(oldest_version)
@@ -106 +118 @@
         assert movie.versions[0] == oldest_version
         assert movie.versions[1] == middle_version
-    
-        movie.revert_to(1)
+        assert [v.version for v in movie.versions] == [1, 2, 3]
+
+        movie.description = 'description four'
+
+        movie.revert_to(2)
         session.flush(); session.clear()
     
         movie = Movie.get_by(title='12 Monkeys')
-        assert movie.version == 1
-        assert movie.timestamp == initial_timestamp
-        assert movie.title == '12 Monkeys'
-        assert movie.director.name == 'Terry Gilliam'
+        assert movie.version == 2, "version=%i, should be 2" % movie.version
+        assert movie.description == 'description two', movie.description
+
+        movie.description = "description 3"
+        session.flush(); session.clear();
+
+        movie = Movie.get_by(title='12 Monkeys')
+        movie.description = "description 4"
+        session.flush(); session.clear();
+
+        movie = Movie.get_by(title='12 Monkeys')
+        assert movie.version == 4
+        movie.revert_to(movie.versions[-2])
+        movie.description = "description 5"
+        session.flush(); session.clear();
+
+        movie = Movie.get_by(title='12 Monkeys')
+        assert movie.version == 4
+        assert movie.versions[-2].description == "description 3"