Changeset 11371

Timestamp:

2008-09-05 12:06:47 (3 months ago)

Author:

richard

Message:

python/pythontest2.py,python/pythontest3.py: Add test for
get_uuid() (not really python specific, but I can't easily add
this test to smoketest because it needs an on-disk database,
which there's no infrastructure in smoketest to clean up).

Location:

trunk/xapian-bindings

Files:

• ChangeLog (modified) (1 diff)
• python/pythontest2.py (modified) (1 diff)
• python/pythontest3.py (modified) (1 diff)

trunk/xapian-bindings/ChangeLog

@@ +1 @@
+Fri Sep 05 11:03:38 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
+
+        * python/pythontest2.py,python/pythontest3.py: Add test for
+          get_uuid() (not really python specific, but I can't easily add
+          this test to smoketest because it needs an on-disk database,
+          which there's no infrastructure in smoketest to clean up).
+
 Fri Sep 05 09:59:02 GMT 2008  Richard Boulton <richard@lemurconsulting.com>
 

trunk/xapian-bindings/python/pythontest2.py

@@ -993 +993 @@
     shutil.rmtree(dbpath)
 
+def test_get_uuid():
+    """Test getting UUIDs from databases.
+
+    """
+    dbpath = 'db_test_get_uuid'
+    db1 = xapian.WritableDatabase(dbpath + "1", xapian.DB_CREATE_OR_OVERWRITE)
+    db2 = xapian.WritableDatabase(dbpath + "2", xapian.DB_CREATE_OR_OVERWRITE)
+    dbr1 = xapian.Database(dbpath + "1")
+    dbr2 = xapian.Database(dbpath + "2")
+    expect(db1.get_uuid() != db2.get_uuid(), True)
+    expect(db1.get_uuid(), dbr1.get_uuid())
+    expect(db2.get_uuid(), dbr2.get_uuid())
+
+    db = xapian.Database()
+    db.add_database(db1)
+    expect(db1.get_uuid(), db.get_uuid())
+
 def test_director_exception():
     """Test handling of an exception raised in a director.
 
     """
-    dbpath = 'db_test_value_stats'
     db = setup_database()
     query = xapian.Query('it')

trunk/xapian-bindings/python/pythontest3.py

@@ -993 +993 @@
     shutil.rmtree(dbpath)
 
+def test_get_uuid():
+    """Test getting UUIDs from databases.
+
+    """
+    dbpath = 'db_test_get_uuid'
+    db1 = xapian.WritableDatabase(dbpath + "1", xapian.DB_CREATE_OR_OVERWRITE)
+    db2 = xapian.WritableDatabase(dbpath + "2", xapian.DB_CREATE_OR_OVERWRITE)
+    dbr1 = xapian.Database(dbpath + "1")
+    dbr2 = xapian.Database(dbpath + "2")
+    expect(db1.get_uuid() != db2.get_uuid(), True)
+    expect(db1.get_uuid(), dbr1.get_uuid())
+    expect(db2.get_uuid(), dbr2.get_uuid())
+
+    db = xapian.Database()
+    db.add_database(db1)
+    expect(db1.get_uuid(), db.get_uuid())
+
 def test_director_exception():
     """Test handling of an exception raised in a director.
 
     """
-    dbpath = 'db_test_value_stats'
     db = setup_database()
     query = xapian.Query('it')