From 9bdf5bcbeb1b8748cdc269b04f9cbb5ca63630bf Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Wed, 2 Mar 2011 18:02:32 +0200 Subject: Add boost/common/smart-ptr and boost/common/unordered tests --- boost/common/smart-ptr/driver.cxx | 178 ++++++++++++++++++++++++++++++++++++++ boost/common/smart-ptr/makefile | 119 +++++++++++++++++++++++++ boost/common/smart-ptr/test.hxx | 59 +++++++++++++ boost/common/smart-ptr/test.std | 0 4 files changed, 356 insertions(+) create mode 100644 boost/common/smart-ptr/driver.cxx create mode 100644 boost/common/smart-ptr/makefile create mode 100644 boost/common/smart-ptr/test.hxx create mode 100644 boost/common/smart-ptr/test.std (limited to 'boost/common/smart-ptr') diff --git a/boost/common/smart-ptr/driver.cxx b/boost/common/smart-ptr/driver.cxx new file mode 100644 index 0000000..478e4a9 --- /dev/null +++ b/boost/common/smart-ptr/driver.cxx @@ -0,0 +1,178 @@ +// file : boost/common/smart-ptr/driver.cxx +// author : Constantin Michael +// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Test boost smart pointers. +// + +#include // std::auto_ptr +#include +#include + +#include +#include + +#include + +#include "test.hxx" +#include "test-odb.hxx" + +using namespace std; + +using namespace odb::boost; +using namespace odb::core; + +int +main (int argc, char* argv[]) +{ + using boost::shared_ptr; + + try + { + auto_ptr db (create_database (argc, argv)); + + shared_ptr c1 (new cont (1)); + { + transaction t (db->begin ()); + db->persist (c1); + t.commit (); + } + + // Test comparison operators. + // + { + assert (lazy_shared_ptr () == lazy_shared_ptr ()); + assert (lazy_shared_ptr () != lazy_shared_ptr (c1)); + assert (lazy_shared_ptr (c1) == lazy_shared_ptr (c1)); + + lazy_shared_ptr lc1 (*db, 1); + assert (lc1 != lazy_shared_ptr ()); + assert (lc1 == lazy_shared_ptr (*db, c1)); + + shared_ptr c2 (new cont (2)); + assert (lc1 != lazy_shared_ptr (*db, c2)); + } + + // Test swap. + // + { + lazy_shared_ptr lx (*db, 1), ly; + assert (lx == lazy_shared_ptr (*db, c1)); + + swap (lx, ly); + assert (lx == lazy_shared_ptr ()); + assert (ly == lazy_shared_ptr (*db, c1)); + } + + // Test assignment from auto_ptr. + // + { + cont* p = new cont (3); + auto_ptr a (p); + lazy_shared_ptr l; + l = a; + + assert (l.get() == p); + assert (!a.get ()); + } + + shared_ptr o1 (new obj (1)); + shared_ptr o2 (new obj (2)); + shared_ptr o3 (new obj (3)); + shared_ptr o4 (new obj (4)); + shared_ptr c2 (new cont (2)); + + o1->c = c1; + o2->c = c1; + o3->c = c2; + o4->c = c2; + + // Persist. + // + { + transaction t (db->begin ()); + + db->persist (o1); + db->persist (o2); + db->persist (o3); + db->persist (o4); + db->persist (c2); + + t.commit (); + } + + // Load. + // + { + session s; + transaction t (db->begin ()); + + shared_ptr c (db->load (1)); + shared_ptr o (db->load (1)); + + // Ensure that lazy pointers are present but not loaded. + // + assert (c->o.size () == 2); + assert (!c->o[0].loaded ()); + assert (!c->o[1].loaded ()); + assert (!o->c.loaded ()); + + // Ensure that the correct object IDs were loaded. + // + assert (c->o[0].object_id () == 1); + assert (c->o[1].object_id () == 2); + assert (o->c.object_id () == 1); + + // Load the lazy pointer targets ensuring that the loaded + // targets correspond to the cached session objects. + // + shared_ptr cl (o->c.load ()); + shared_ptr ol (c->o[0].load ()); + + assert (c->o[0].loaded ()); + assert (o->c.loaded ()); + + assert (cl == c); + assert (ol == o); + + t.commit (); + } + + // Test lazy weak locking and reloading. + // + { + // No session. + // + transaction t (db->begin ()); + shared_ptr c (db->load (1)); + + // Lock. + // + assert (!c->o[1].loaded ()); + lazy_shared_ptr l (c->o[1].lock ()); + assert (!l.loaded ()); + assert (l.object_id () == c->o[1].object_id ()); + + // Reload. + // + assert (!c->o[1].loaded ()); + + shared_ptr ol (c->o[1].load ()); + assert (c->o[1].loaded ()); + + ol.reset (); + assert (!c->o[1].loaded ()); + + ol = c->o[1].load (); + assert (c->o[1].loaded ()); + + t.commit (); + } + } + catch (const odb::exception& e) + { + cerr << e.what () << endl; + return 1; + } +} diff --git a/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile new file mode 100644 index 0000000..f18c095 --- /dev/null +++ b/boost/common/smart-ptr/makefile @@ -0,0 +1,119 @@ +# file : boost/common/smart-ptr/makefile +# author : Boris Kolpackov +# copyright : Copyright (c) 2009-2011 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/common.l +common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options + +driver := $(out_base)/driver +dist := $(out_base)/.dist +test := $(out_base)/.test +clean := $(out_base)/.clean + +# Import. +# +$(call import,\ + $(scf_root)/import/odb/stub.make,\ + odb: odb,odb-rules: odb_rules) + +$(call import,\ + $(scf_root)/import/libodb-boost/stub.make,\ + l: odb_boost.l,cpp-options: odb_boost.l.cpp-options) + +$(call import,\ + $(scf_root)/import/libboost/header-only/stub.make,\ + cpp-options: boost.l.cpp-options) + +# Build. +# +$(driver): $(cxx_obj) $(odb_boost.l) $(common.l) +$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) +$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \ +$(boost.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) $(dist): export odb_options += --database $(db_id) \ +--profile boost/smart-ptr --generate-schema +$(gen): cpp_options := -I$(out_base) +$(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \ +$(boost.l.cpp-options) + +$(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) + +# Alias for default target. +# +$(out_base)/: $(driver) + +# Dist +# +name := $(subst /,-,$(subst $(src_root)/boost/common/,,$(src_base))) + +$(dist): db_id := @database@ +$(dist): sources := $(cxx_tun) +$(dist): headers := $(odb_hdr) +$(dist): data_dist := test.std +$(dist): export name := $(name) +$(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ +$(call vc10projs,$(name)) +$(dist): + $(call dist-data,$(sources) $(headers) $(data_dist)) + $(call meta-automake,../template/Makefile.am) + $(call meta-vc9projs,../template/template,$(name)) + $(call meta-vc10projs,../template/template,$(name)) + +# 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 \ +>$(out_base)/test.out) + $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) + $(call message,,rm -f $(out_base)/test.out) + +# 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)) + $(call message,,rm -f $(out_base)/test.out) + +# 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,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/vc9proj.make) +$(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/automake.make) + +$(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/boost/common/smart-ptr/test.hxx b/boost/common/smart-ptr/test.hxx new file mode 100644 index 0000000..ea158e7 --- /dev/null +++ b/boost/common/smart-ptr/test.hxx @@ -0,0 +1,59 @@ +// file : boost/common/smart-ptr/test.hxx +// author : Constantin Michael +// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef TEST_HXX +#define TEST_HXX + +#include + +#include +#include + +struct obj; + +using odb::boost::lazy_shared_ptr; +using odb::boost::lazy_weak_ptr; + +#pragma db object +struct cont +{ + cont () + { + } + + cont (unsigned long id) + : id (id) + { + } + + #pragma db id + unsigned long id; + + typedef std::vector > obj_list; + + #pragma db inverse(c) not_null + obj_list o; +}; + +#pragma db object +struct obj +{ + obj () + { + } + + obj (unsigned long id) + : id (id) + { + } + + #pragma db id + unsigned long id; + + #pragma db not_null + lazy_shared_ptr c; +}; + +#endif // TEST_HXX diff --git a/boost/common/smart-ptr/test.std b/boost/common/smart-ptr/test.std new file mode 100644 index 0000000..e69de29 -- cgit v1.1