From 0f20544be37177642d33845fa05486ad27ed88e7 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 23 Dec 2009 15:48:01 +0000 Subject: [PATCH] Changes to allow GrampsDb tests to run svn: r13893 --- src/cli/clidbman.py | 7 +++-- test/GrampsDb/GrampsDbBase_Test.py | 44 +++++++----------------------- test/GrampsDb/GrampsDbTestBase.py | 30 ++++++++++---------- 3 files changed, 30 insertions(+), 51 deletions(-) diff --git a/src/cli/clidbman.py b/src/cli/clidbman.py index ba82ee701..ec093f27c 100644 --- a/src/cli/clidbman.py +++ b/src/cli/clidbman.py @@ -94,7 +94,8 @@ class CLIDbManager(object): self.active = None self.current_names = [] - self._populate_cli() + if dbstate: + self._populate_cli() def empty(self, val): """Callback that does nothing @@ -234,7 +235,7 @@ class CLIDbManager(object): name_file.close() # write the version number into metadata - newdb = gen.db.GrampsDBDir() + newdb = gen.db.DbBsddb() newdb.write_version(new_path) (tval, last) = time_val(new_path) @@ -269,7 +270,7 @@ class CLIDbManager(object): # Create a new database self.__start_cursor(_("Importing data...")) - dbclass = gen.db.GrampsDBDir + dbclass = gen.db.DbBsddb dbase = dbclass() dbase.load(new_path, callback) diff --git a/test/GrampsDb/GrampsDbBase_Test.py b/test/GrampsDb/GrampsDbBase_Test.py index 6c355d35f..cb6c51e8c 100644 --- a/test/GrampsDb/GrampsDbBase_Test.py +++ b/test/GrampsDb/GrampsDbBase_Test.py @@ -15,35 +15,12 @@ except NameError: from sets import Set as set import const -import RelLib +import gen.lib logger = logging.getLogger('Gramps.GrampsDbBase_Test') from GrampsDbTestBase import GrampsDbBaseTest -import GrampsDb -class FactoryTest(unittest.TestCase): - """Test the GrampsDb Factory classes.""" - - def test_gramps_db_factory(self): - """test than gramps_db_factory returns the correct classes.""" - - cls = GrampsDb.gramps_db_factory(db_type = const.app_gramps) - assert cls.__name__ == "GrampsBSDDB", \ - "Returned class is %s " % str(cls.__class__.__name__) - - cls = GrampsDb.gramps_db_factory(db_type = const.app_gramps_xml) - assert cls.__name__ == "GrampsXMLDB", \ - "Returned class is %s " % str(cls.__class__.__name__) - - cls = GrampsDb.gramps_db_factory(db_type = const.app_gedcom) - assert cls.__name__ == "GrampsGEDDB", \ - "Returned class is %s " % str(cls.__class__.__name__) - - self.assertRaises(GrampsDb.GrampsDbException, GrampsDb.gramps_db_factory, "gibberish") - - - class ReferenceMapTest (GrampsDbBaseTest): """Test methods on the GrampsDbBase class that are related to the reference_map index implementation.""" @@ -59,7 +36,7 @@ class ReferenceMapTest (GrampsDbBaseTest): references = [ ref for ref in self._db.find_backlink_handles(source.get_handle()) ] assert len(references) == 1 - assert references[0] == (RelLib.Person.__name__,person.get_handle()) + assert references[0] == (gen.lib.Person.__name__,person.get_handle()) def test_backlink_for_repository(self): """check that the source / repos backlink lookup works.""" @@ -70,7 +47,7 @@ class ReferenceMapTest (GrampsDbBaseTest): references = [ ref for ref in self._db.find_backlink_handles(repos.get_handle()) ] assert len(references) == 1 - assert references[0] == (RelLib.Source.__name__,source.get_handle()) + assert references[0] == (gen.lib.Source.__name__,source.get_handle()) def test_class_limited_lookup(self): """check that class limited lookups work.""" @@ -89,16 +66,16 @@ class ReferenceMapTest (GrampsDbBaseTest): assert len(references) == 5, "len(references) == %s " % str(len(references)) # should just return the person reference - references = [ ref for ref in self._db.find_backlink_handles(source.get_handle(),(RelLib.Person.__name__,)) ] + references = [ ref for ref in self._db.find_backlink_handles(source.get_handle(),(gen.lib.Person.__name__,)) ] assert len(references) == 1, "len(references) == %s " % str(len(references)) - assert references[0][0] == RelLib.Person.__name__, "references = %s" % repr(references) + assert references[0][0] == gen.lib.Person.__name__, "references = %s" % repr(references) # should just return the person and event reference - references = [ ref for ref in self._db.find_backlink_handles(source.get_handle(),(RelLib.Person.__name__, - RelLib.Event.__name__)) ] + references = [ ref for ref in self._db.find_backlink_handles(source.get_handle(),(gen.lib.Person.__name__, + gen.lib.Event.__name__)) ] assert len(references) == 2, "len(references) == %s " % str(len(references)) - assert references[0][0] == RelLib.Person.__name__, "references = %s" % repr(references) - assert references[1][0] == RelLib.Event.__name__, "references = %s" % repr(references) + assert references[0][0] == gen.lib.Person.__name__, "references = %s" % repr(references) + assert references[1][0] == gen.lib.Event.__name__, "references = %s" % repr(references) @@ -130,7 +107,7 @@ class ReferenceMapTest (GrampsDbBaseTest): # unhook the reference_map update function so that we # can insert some records without the reference_map being updated. - update_method = self._db._update_reference_map + update_method = self._db.update_reference_map self._db._update_reference_map = lambda x,y: 1 # Insert a person/source pair. @@ -216,7 +193,6 @@ class ReferenceMapTest (GrampsDbBaseTest): def testSuite(): suite = unittest.makeSuite(ReferenceMapTest,'test') - suite.addTests(unittest.makeSuite(FactoryTest,'test')) return suite def perfSuite(): diff --git a/test/GrampsDb/GrampsDbTestBase.py b/test/GrampsDb/GrampsDbTestBase.py index 427909f14..2392feda2 100644 --- a/test/GrampsDb/GrampsDbTestBase.py +++ b/test/GrampsDb/GrampsDbTestBase.py @@ -14,9 +14,10 @@ try: except NameError: from sets import Set as set -import GrampsDb +from gen.db import DbBsddb +from cli.clidbman import CLIDbManager import const -import RelLib +import gen.lib logger = logging.getLogger('Gramps.GrampsDbTestBase') @@ -28,12 +29,13 @@ class GrampsDbBaseTest(unittest.TestCase): def dummy_callback(dummy): pass self._tmpdir = tempfile.mkdtemp() - self._filename = os.path.join(self._tmpdir,'test.grdb') + #self._filename = os.path.join(self._tmpdir,'test.grdb') - self._db = GrampsDb.gramps_db_factory(const.app_gramps)() + self._db = DbBsddb() + dbman = CLIDbManager(None) + self._filename, title = dbman.create_new_db_cli(title="Test") self._db.load(self._filename, dummy_callback, "w") - def tearDown(self): self._db.close() shutil.rmtree(self._tmpdir) @@ -84,9 +86,9 @@ class GrampsDbBaseTest(unittest.TestCase): # Add a Source tran = self._db.transaction_begin() - source = RelLib.Source() + source = gen.lib.Source() if repos is not None: - repo_ref = RelLib.RepoRef() + repo_ref = gen.lib.RepoRef() repo_ref.set_reference_handle(repos.get_handle()) source.add_repo_reference(repo_ref) self._db.add_source(source,tran) @@ -99,7 +101,7 @@ class GrampsDbBaseTest(unittest.TestCase): # Add a Repository tran = self._db.transaction_begin() - repos = RelLib.Repository() + repos = gen.lib.Repository() self._db.add_repository(repos,tran) self._db.commit_repository(repos,tran) self._db.transaction_commit(tran, "Add Repository") @@ -112,7 +114,7 @@ class GrampsDbBaseTest(unittest.TestCase): object = object_class() for source in sources: - src_ref = RelLib.SourceRef() + src_ref = gen.lib.SourceRef() src_ref.set_reference_handle(source.get_handle()) object.add_source_reference(src_ref) @@ -127,34 +129,34 @@ class GrampsDbBaseTest(unittest.TestCase): def _add_person_with_sources(self,sources): return self._add_object_with_source(sources, - RelLib.Person, + gen.lib.Person, self._db.add_person, self._db.commit_person) def _add_family_with_sources(self,sources): return self._add_object_with_source(sources, - RelLib.Family, + gen.lib.Family, self._db.add_family, self._db.commit_family) def _add_event_with_sources(self,sources): return self._add_object_with_source(sources, - RelLib.Event, + gen.lib.Event, self._db.add_event, self._db.commit_event) def _add_place_with_sources(self,sources): return self._add_object_with_source(sources, - RelLib.Place, + gen.lib.Place, self._db.add_place, self._db.commit_place) def _add_media_object_with_sources(self,sources): return self._add_object_with_source(sources, - RelLib.MediaObject, + gen.lib.MediaObject, self._db.add_object, self._db.commit_media_object)