//
// Copyright (C) 2007
// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-// Stefan Bund <g0dil@berlios.de>
//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// Stefan Bund <g0dil@berlios.de>
/** \file
\brief singleton unit tests */
// Custom includes
#include <iostream>
#include "singleton.hh"
+#include "IgnoreValue.hh"
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
#include <boost/test/test_tools.hpp>
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
namespace {
};
}
-BOOST_AUTO_UNIT_TEST(sInGlEtOn)
+SENF_AUTO_UNIT_TEST(sInGlEtOn)
{
BOOST_CHECK_EQUAL( Test::instance().foo(), 1234 );
BOOST_CHECK( Test::alive() );
~AliveTest2();
};
- AliveTest1::AliveTest1()
+ AliveTest1::AliveTest1()
{
test2Alive = AliveTest2::alive();
}
AliveTest1::~AliveTest1()
{
if (test2Dead) {
- assert( ! AliveTest2::alive() );
- std::cerr << "singleton alive test ok\n";
+ if (! AliveTest2::alive() )
+ std::cerr << "singleton alive test ok\n";
+ else {
+ std::cerr << "singleton alive test 2 NOT ok!\n";
+ throw 1;
+ }
}
test1Dead = true;
}
AliveTest2::~AliveTest2()
{
if (test1Dead) {
- assert( ! AliveTest1::alive() );
- std::cerr << "singleton alive test ok\n";
+ if (! AliveTest1::alive() )
+ std::cerr << "singleton alive test ok\n";
+ else {
+ std::cerr << "singleton alive test 1 NOT ok!\n";
+ throw 1;
+ }
}
test2Dead = true;
}
}
-BOOST_AUTO_UNIT_TEST(singletonAlive)
+SENF_AUTO_UNIT_TEST(singletonAlive)
{
- (void) AliveTest1::instance();
- (void) AliveTest2::instance();
+ senf::IGNORE( AliveTest1::instance() );
+ senf::IGNORE( AliveTest2::instance() );
BOOST_CHECK( (test1Alive && !test2Alive) || (!test1Alive && test2Alive) );
BOOST_CHECK( AliveTest1::alive() );
BOOST_CHECK( AliveTest2::alive() );
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f