From b9161e6e332cb0279ef8616dbbce4c90b60bce15 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 3 Aug 2010 14:12:48 +0200 Subject: New tests --- common/lifecycle/driver.cxx | 117 ++++++++++++++++++++++++++++++++++++++++++++ common/lifecycle/makefile | 82 +++++++++++++++++++++++++++++++ common/lifecycle/test.hxx | 29 +++++++++++ common/lifecycle/test.std | 0 4 files changed, 228 insertions(+) create mode 100644 common/lifecycle/driver.cxx create mode 100644 common/lifecycle/makefile create mode 100644 common/lifecycle/test.hxx create mode 100644 common/lifecycle/test.std (limited to 'common/lifecycle') diff --git a/common/lifecycle/driver.cxx b/common/lifecycle/driver.cxx new file mode 100644 index 0000000..4b43129 --- /dev/null +++ b/common/lifecycle/driver.cxx @@ -0,0 +1,117 @@ +// file : common/lifecycle/driver.cxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Test object state transistions. +// + +#include // std::auto_ptr +#include +#include + +#include +#include + +#include + +#include "test.hxx" +#include "test-odb.hxx" + +using namespace std; +using namespace odb; + +using odb::shared_ptr; + +int +main (int argc, char* argv[]) +{ + try + { + auto_ptr db (create_database (argc, argv)); + + // transient + // + try + { + transaction t (db->begin_transaction ()); + auto_ptr o (db->load (1)); + assert (false); + t.commit (); + } + catch (const object_not_persistent&) + { + } + + // persistent + // + { + object o (1); + o.str_ = "value 1"; + + transaction t (db->begin_transaction ()); + db->persist (o); + t.commit (); + + try + { + transaction t (db->begin_transaction ()); + db->persist (o); + assert (false); + t.commit (); + } + catch (const object_already_persistent&) + { + } + } + + { + transaction t (db->begin_transaction ()); + auto_ptr o (db->load (1)); + assert (o->str_ == "value 1"); + t.commit (); + } + + // modified + // + { + transaction t (db->begin_transaction ()); + auto_ptr o (db->load (1)); + o->str_ = "value 2"; + db->store (*o); + t.commit (); + } + + { + transaction t (db->begin_transaction ()); + auto_ptr o (db->load (1)); + assert (o->str_ == "value 2"); + t.commit (); + } + + // transient + // + { + transaction t (db->begin_transaction ()); + auto_ptr o (db->load (1)); + db->erase (*o); + t.commit (); + } + + try + { + transaction t (db->begin_transaction ()); + auto_ptr o (db->load (1)); + assert (false); + t.commit (); + } + catch (const object_not_persistent&) + { + } + } + catch (const odb::exception& e) + { + cerr << e.what () << endl; + return 1; + } +} diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile new file mode 100644 index 0000000..21278fc --- /dev/null +++ b/common/lifecycle/makefile @@ -0,0 +1,82 @@ +# file : common/lifecycle/makefile +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make + +cxx_tun := driver.cxx +odb_hdr := test.hxx +cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o)) +cxx_od := $(cxx_obj:.o=.o.d) + +common.l := $(out_root)/libcommon/common.l +common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options + +driver := $(out_base)/driver +test := $(out_base)/.test +clean := $(out_base)/.clean + +# Import. +# +$(call import,\ + $(scf_root)/import/odb/stub.make,\ + odb: odb,odb-rules: odb_rules) + +# Build. +# +$(driver): $(cxx_obj) $(common.l) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): $(common.l.cpp-options) + +genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): $(odb) +$(gen): odb := $(odb) +$(gen): odb_options += --database $(db_id) --generate-schema +$(gen): cpp_options := -I$(out_base) +$(gen): $(common.l.cpp-options) + +$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) + +# Alias for default target. +# +$(out_base)/: $(driver) + +# Test. +# +$(test): $(driver) $(src_base)/test.std + $(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql) + $(call message,test $<,$< --options-file $(dcf_root)/db.options \ +| diff -u $(src_base)/test.std -) + +# Clean. +# +$(clean): \ + $(driver).o.clean \ + $(addsuffix .cxx.clean,$(cxx_obj)) \ + $(addsuffix .cxx.clean,$(cxx_od)) \ + $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean)) + +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif + +# How to. +# +$(call include,$(odb_rules)) +$(call include,$(bld_root)/cxx/cxx-d.make) +$(call include,$(bld_root)/cxx/cxx-o.make) +$(call include,$(bld_root)/cxx/o-e.make) + +# Dependencies. +# +$(call import,$(src_root)/libcommon/makefile) diff --git a/common/lifecycle/test.hxx b/common/lifecycle/test.hxx new file mode 100644 index 0000000..268678c --- /dev/null +++ b/common/lifecycle/test.hxx @@ -0,0 +1,29 @@ +// file : common/lifecycle/test.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef TEST_HXX +#define TEST_HXX + +#include +#include + +#pragma odb object +struct object +{ + object (unsigned long id) + : id_ (id) + { + } + + object () + { + } + + #pragma odb id + unsigned long id_; + std::string str_; +}; + +#endif // TEST_HXX diff --git a/common/lifecycle/test.std b/common/lifecycle/test.std new file mode 100644 index 0000000..e69de29 -- cgit v1.1