From 76c0e2db649ac7adace0802c0ae80e8b0032f122 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 7 Oct 2010 21:07:26 +0000 Subject: [PATCH] Suppress a warning and in the process move the common function for testing into a header file of its own. git-svn-id: https://svn.dealii.org/trunk@22290 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/serialization/point.cc | 36 +--------------- tests/serialization/serialization.h | 52 +++++++++++++++++++++++ tests/serialization/symmetric_tensor.cc | 38 +---------------- tests/serialization/tensor_base.cc | 36 +--------------- tests/serialization/tensor_base_scalar.cc | 37 +--------------- 5 files changed, 58 insertions(+), 141 deletions(-) create mode 100644 tests/serialization/serialization.h diff --git a/tests/serialization/point.cc b/tests/serialization/point.cc index efb3230a41..d989e4e974 100644 --- a/tests/serialization/point.cc +++ b/tests/serialization/point.cc @@ -13,42 +13,8 @@ // check serialization for Tensor<1,dim> -#include "../tests.h" +#include "serialization.h" #include -#include -#include -#include -#include -#include -#include - - -template -void verify (T &t1, - T &t2) -{ - // save data to archive - std::ostringstream oss; - { - boost::archive::text_oarchive oa(oss); - oa << t1; - // archive and stream closed when - // destructors are called - } - deallog << oss.str() << std::endl; - - // verify correctness of the - // serialization - { - std::istringstream iss(oss.str()); - boost::archive::text_iarchive ia(iss); - - - ia >> t2; - - Assert (t1 == t2, ExcInternalError()); - } -} void test () diff --git a/tests/serialization/serialization.h b/tests/serialization/serialization.h new file mode 100644 index 0000000000..b761371b26 --- /dev/null +++ b/tests/serialization/serialization.h @@ -0,0 +1,52 @@ +//---------------------------- serialization.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 2010 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- serialization.h --------------------------- + +// common include file for all serialization tests + +#include "../tests.h" +#include +#include +#include +#include +#include +#include + + +template +void verify (const T &t1, + T &t2) +{ + // save data to archive + std::ostringstream oss; + { + boost::archive::text_oarchive oa(oss); + oa << t1; + // archive and stream closed when + // destructors are called + } + deallog << oss.str() << std::endl; + + // verify correctness of the + // serialization + { + std::istringstream iss(oss.str()); + boost::archive::text_iarchive ia(iss); + + + ia >> t2; + + Assert (t1 == t2, ExcInternalError()); + } +} + + diff --git a/tests/serialization/symmetric_tensor.cc b/tests/serialization/symmetric_tensor.cc index 27ba310dfe..79984affef 100644 --- a/tests/serialization/symmetric_tensor.cc +++ b/tests/serialization/symmetric_tensor.cc @@ -11,44 +11,10 @@ // //---------------------------- tensor_base.cc --------------------------- -// check serialization for Tensor<1,dim> +// check serialization for SymmetricTensor<2,dim> -#include "../tests.h" +#include "serialization.h" #include -#include -#include -#include -#include -#include -#include - - -template -void verify (T &t1, - T &t2) -{ - // save data to archive - std::ostringstream oss; - { - boost::archive::text_oarchive oa(oss); - oa << t1; - // archive and stream closed when - // destructors are called - } - deallog << oss.str() << std::endl; - - // verify correctness of the - // serialization - { - std::istringstream iss(oss.str()); - boost::archive::text_iarchive ia(iss); - - - ia >> t2; - - Assert (t1 == t2, ExcInternalError()); - } -} void test () diff --git a/tests/serialization/tensor_base.cc b/tests/serialization/tensor_base.cc index 5c0f51fec9..c19641463e 100644 --- a/tests/serialization/tensor_base.cc +++ b/tests/serialization/tensor_base.cc @@ -13,42 +13,8 @@ // check serialization for Tensor<1,dim> -#include "../tests.h" +#include "serialization.h" #include -#include -#include -#include -#include -#include -#include - - -template -void verify (T &t1, - T &t2) -{ - // save data to archive - std::ostringstream oss; - { - boost::archive::text_oarchive oa(oss); - oa << t1; - // archive and stream closed when - // destructors are called - } - deallog << oss.str() << std::endl; - - // verify correctness of the - // serialization - { - std::istringstream iss(oss.str()); - boost::archive::text_iarchive ia(iss); - - - ia >> t2; - - Assert (t1 == t2, ExcInternalError()); - } -} void test () diff --git a/tests/serialization/tensor_base_scalar.cc b/tests/serialization/tensor_base_scalar.cc index 5513b5a83d..2fe0747c52 100644 --- a/tests/serialization/tensor_base_scalar.cc +++ b/tests/serialization/tensor_base_scalar.cc @@ -11,44 +11,11 @@ // //---------------------------- tensor_base_scalar.cc --------------------------- -// check serialization for Tensor<1,dim> +// check serialization for Tensor<0,dim> +#include "serialization.h" #include "../tests.h" #include -#include -#include -#include -#include -#include -#include - - -template -void verify (T &t1, - T &t2) -{ - // save data to archive - std::ostringstream oss; - { - boost::archive::text_oarchive oa(oss); - oa << t1; - // archive and stream closed when - // destructors are called - } - deallog << oss.str() << std::endl; - - // verify correctness of the - // serialization - { - std::istringstream iss(oss.str()); - boost::archive::text_iarchive ia(iss); - - - ia >> t2; - - Assert (t1 == t2, ExcInternalError()); - } -} void test () -- 2.39.5