|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62523 - trunk/libs/msm/test
From: christophe.j.henry_at_[hidden]
Date: 2010-06-07 17:07:16
Author: chenry
Date: 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
New Revision: 62523
URL: http://svn.boost.org/trac/boost/changeset/62523
Log:
corrected inspection report warnings
Text files modified:
trunk/libs/msm/test/Anonymous.cpp | 12 +++++++++++-
trunk/libs/msm/test/AnonymousEuml.cpp | 12 +++++++++++-
trunk/libs/msm/test/CompositeEuml.cpp | 24 +++++++++++++++++-------
trunk/libs/msm/test/CompositeMachine.cpp | 16 +++++++++++++---
trunk/libs/msm/test/Constructor.cpp | 12 +++++++++++-
trunk/libs/msm/test/History.cpp | 20 +++++++++++++++-----
trunk/libs/msm/test/OrthogonalDeferred.cpp | 10 ++++++++++
trunk/libs/msm/test/OrthogonalDeferred2.cpp | 14 ++++++++++++--
trunk/libs/msm/test/OrthogonalDeferredEuml.cpp | 16 +++++++++++++---
trunk/libs/msm/test/SimpleEuml.cpp | 14 ++++++++++++--
trunk/libs/msm/test/SimpleEuml2.cpp | 14 ++++++++++++--
trunk/libs/msm/test/SimpleInternal.cpp | 16 +++++++++++++---
trunk/libs/msm/test/SimpleInternalEuml.cpp | 14 ++++++++++++--
trunk/libs/msm/test/SimpleInternalFunctors.cpp | 16 +++++++++++++---
trunk/libs/msm/test/SimpleMachine.cpp | 16 +++++++++++++---
trunk/libs/msm/test/SimpleWithFunctors.cpp | 28 +++++++++++++++++++---------
16 files changed, 207 insertions(+), 47 deletions(-)
Modified: trunk/libs/msm/test/Anonymous.cpp
==============================================================================
--- trunk/libs/msm/test/Anonymous.cpp (original)
+++ trunk/libs/msm/test/Anonymous.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -132,7 +142,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- my_machine p;
+ my_machine p;
// needed to start the highest-level SM. This will call on_entry and mark the start of the SM
// in this case it will also immediately trigger all anonymous transitions
Modified: trunk/libs/msm/test/AnonymousEuml.cpp
==============================================================================
--- trunk/libs/msm/test/AnonymousEuml.cpp (original)
+++ trunk/libs/msm/test/AnonymousEuml.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -102,7 +112,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- my_machine p;
+ my_machine p;
// needed to start the highest-level SM. This will call on_entry and mark the start of the SM
// in this case it will also immediately trigger all anonymous transitions
Modified: trunk/libs/msm/test/CompositeEuml.cpp
==============================================================================
--- trunk/libs/msm/test/CompositeEuml.cpp (original)
+++ trunk/libs/msm/test/CompositeEuml.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
#include <boost/msm/back/state_machine.hpp>
#include <boost/msm/front/euml/euml.hpp>
@@ -12,7 +22,7 @@
namespace
{
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
@@ -41,14 +51,14 @@
BOOST_MSM_EUML_STATE(( ++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),Stopped)
BOOST_MSM_EUML_STATE(( ++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),Paused)
- // Playing is now a state machine itself.
+ // Playing is now a state machine itself.
BOOST_MSM_EUML_DECLARE_ATTRIBUTE(unsigned int,start_next_song_counter)
BOOST_MSM_EUML_DECLARE_ATTRIBUTE(unsigned int,start_prev_song_guard_counter)
// It has 5 substates
BOOST_MSM_EUML_STATE(( ++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),Song1)
BOOST_MSM_EUML_STATE(( ++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),Song2)
BOOST_MSM_EUML_STATE(( ++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),Song3)
- BOOST_MSM_EUML_STATE(( ++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),Region2State1)
+ BOOST_MSM_EUML_STATE(( ++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),Region2State1)
BOOST_MSM_EUML_STATE(( ++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),Region2State2)
// Playing has a transition table
@@ -67,8 +77,8 @@
++state_(entry_counter), // Entry
++state_(exit_counter), // Exit
attributes_ << entry_counter << exit_counter
- << start_next_song_counter
- << start_prev_song_guard_counter // Attributes
+ << start_next_song_counter
+ << start_prev_song_guard_counter // Attributes
),Playing_)
// choice of back-end
typedef msm::back::state_machine<Playing_> Playing_type;
@@ -138,7 +148,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<BOOST_MSM_EUML_STATE_NAME(Empty)&>().get_attribute(entry_counter) == 1,
@@ -188,7 +198,7 @@
BOOST_CHECK_MESSAGE(
p.get_state<Playing_type&>().get_state<BOOST_MSM_EUML_STATE_NAME(Region2State1)&>().get_attribute(entry_counter) == 1,
"Region2State1 entry not called correctly");
- BOOST_CHECK_MESSAGE(
+ BOOST_CHECK_MESSAGE(
p.get_state<Playing_type&>().get_state<BOOST_MSM_EUML_STATE_NAME(Song2)&>().get_attribute(entry_counter) == 1,
"Song2 entry not called correctly");
BOOST_CHECK_MESSAGE(
Modified: trunk/libs/msm/test/CompositeMachine.cpp
==============================================================================
--- trunk/libs/msm/test/CompositeMachine.cpp (original)
+++ trunk/libs/msm/test/CompositeMachine.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -139,7 +149,7 @@
}
};
// back-end
- typedef msm::back::state_machine<Playing_> Playing;
+ typedef msm::back::state_machine<Playing_> Playing;
// state not defining any entry or exit
struct Paused : public msm::front::state<>
@@ -233,7 +243,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().entry_counter == 1,"Empty entry not called correctly");
@@ -254,7 +264,7 @@
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().exit_counter == 2,"Empty exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().entry_counter == 1,"Stopped entry not called correctly");
- p.process_event(play());
+ p.process_event(play());
BOOST_CHECK_MESSAGE(p.current_state()[0] == 3,"Playing should be active"); //Playing
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().exit_counter == 1,"Stopped exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().entry_counter == 1,"Playing entry not called correctly");
Modified: trunk/libs/msm/test/Constructor.cpp
==============================================================================
--- trunk/libs/msm/test/Constructor.cpp (original)
+++ trunk/libs/msm/test/Constructor.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -19,7 +29,7 @@
struct open_close {};
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
Modified: trunk/libs/msm/test/History.cpp
==============================================================================
--- trunk/libs/msm/test/History.cpp (original)
+++ trunk/libs/msm/test/History.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -139,7 +149,7 @@
}
};
// back-end
- typedef msm::back::state_machine<Playing_,msm::back::ShallowHistory<mpl::vector<end_pause> > > Playing;
+ typedef msm::back::state_machine<Playing_,msm::back::ShallowHistory<mpl::vector<end_pause> > > Playing;
// state not defining any entry or exit
struct Paused : public msm::front::state<>
@@ -233,7 +243,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().entry_counter == 1,"Empty entry not called correctly");
@@ -254,7 +264,7 @@
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().exit_counter == 2,"Empty exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().entry_counter == 1,"Stopped entry not called correctly");
- p.process_event(play());
+ p.process_event(play());
BOOST_CHECK_MESSAGE(p.current_state()[0] == 3,"Playing should be active"); //Playing
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().exit_counter == 1,"Stopped exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().entry_counter == 1,"Playing entry not called correctly");
@@ -313,7 +323,7 @@
BOOST_CHECK_MESSAGE(p.current_state()[0] == 3,"Playing should be active"); //Playing
BOOST_CHECK_MESSAGE(p.get_state<player_::Paused&>().exit_counter == 1,"Paused exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().entry_counter == 2,"Playing entry not called correctly");
- BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().current_state()[0] == 1,"Song2 should be active");
+ BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().current_state()[0] == 1,"Song2 should be active");
BOOST_CHECK_MESSAGE(
p.get_state<player_::Playing&>().get_state<player_::Playing::Song2&>().entry_counter == 3,
"Song2 entry not called correctly");
@@ -334,7 +344,7 @@
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().entry_counter == 3,"Stopped entry not called correctly");
p.process_event(play());
- BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().current_state()[0] == 0,"Song1 should be active");
+ BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().current_state()[0] == 0,"Song1 should be active");
BOOST_CHECK_MESSAGE(
p.get_state<player_::Playing&>().get_state<player_::Playing::Song1&>().entry_counter == 2,
"Song1 entry not called correctly");
Modified: trunk/libs/msm/test/OrthogonalDeferred.cpp
==============================================================================
--- trunk/libs/msm/test/OrthogonalDeferred.cpp (original)
+++ trunk/libs/msm/test/OrthogonalDeferred.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
Modified: trunk/libs/msm/test/OrthogonalDeferred2.cpp
==============================================================================
--- trunk/libs/msm/test/OrthogonalDeferred2.cpp (original)
+++ trunk/libs/msm/test/OrthogonalDeferred2.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -248,11 +258,11 @@
_row < Stopped , stop , Stopped >,
// +---------+-------------+---------+---------------------+----------------------+
g_row < Open , open_close , Empty , &p::can_close_drawer >,
- Row < Open , play , none , Defer , none >,
+ Row < Open , play , none , Defer , none >,
// +---------+-------------+---------+---------------------+----------------------+
a_row < Empty , open_close , Open , &p::open_drawer >,
a_row < Empty , cd_detected , Stopped , &p::store_cd_info >,
- Row < Empty , play , none , Defer , none >,
+ Row < Empty , play , none , Defer , none >,
// +---------+-------------+---------+---------------------+----------------------+
a_row < Playing , stop , Stopped , &p::stop_playback >,
a_row < Playing , pause , Paused , &p::pause_playback >,
Modified: trunk/libs/msm/test/OrthogonalDeferredEuml.cpp
==============================================================================
--- trunk/libs/msm/test/OrthogonalDeferredEuml.cpp (original)
+++ trunk/libs/msm/test/OrthogonalDeferredEuml.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -55,7 +65,7 @@
BOOST_MSM_EUML_INTERRUPT_STATE(( end_error,++state_(entry_counter),++state_(exit_counter),attributes_ << entry_counter << exit_counter),
ErrorMode)
- // Playing is now a state machine itself.
+ // Playing is now a state machine itself.
BOOST_MSM_EUML_DECLARE_ATTRIBUTE(unsigned int,start_next_song_counter)
BOOST_MSM_EUML_DECLARE_ATTRIBUTE(unsigned int,start_prev_song_guard_counter)
@@ -79,8 +89,8 @@
++state_(entry_counter), // Entry
++state_(exit_counter), // Exit
attributes_ << entry_counter << exit_counter
- << start_next_song_counter
- << start_prev_song_guard_counter, // Attributes
+ << start_next_song_counter
+ << start_prev_song_guard_counter, // Attributes
configure_<< PlayingPaused << CDLoaded //flags
),Playing_)
Modified: trunk/libs/msm/test/SimpleEuml.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleEuml.cpp (original)
+++ trunk/libs/msm/test/SimpleEuml.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
#include <boost/msm/back/state_machine.hpp>
#include <boost/msm/front/euml/euml.hpp>
@@ -12,7 +22,7 @@
namespace
{
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
@@ -102,7 +112,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<BOOST_MSM_EUML_STATE_NAME(Empty)&>().get_attribute(entry_counter) == 1,
Modified: trunk/libs/msm/test/SimpleEuml2.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleEuml2.cpp (original)
+++ trunk/libs/msm/test/SimpleEuml2.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
#include <boost/msm/back/state_machine.hpp>
#include <boost/msm/front/euml/euml.hpp>
@@ -12,7 +22,7 @@
namespace
{
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
@@ -102,7 +112,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<BOOST_MSM_EUML_STATE_NAME(Empty)&>().get_attribute(entry_counter) == 1,
Modified: trunk/libs/msm/test/SimpleInternal.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleInternal.cpp (original)
+++ trunk/libs/msm/test/SimpleInternal.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -21,7 +31,7 @@
struct to_ignore {};
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
@@ -193,7 +203,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().entry_counter == 1,"Empty entry not called correctly");
@@ -228,7 +238,7 @@
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().entry_counter == 1,"Stopped entry not called correctly");
BOOST_CHECK_MESSAGE(p.internal_guard_counter == 3,"Internal guard not called correctly");
- p.process_event(play());
+ p.process_event(play());
BOOST_CHECK_MESSAGE(p.current_state()[0] == 3,"Playing should be active"); //Playing
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().exit_counter == 1,"Stopped exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().entry_counter == 1,"Playing entry not called correctly");
Modified: trunk/libs/msm/test/SimpleInternalEuml.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleInternalEuml.cpp (original)
+++ trunk/libs/msm/test/SimpleInternalEuml.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
#include <boost/msm/back/state_machine.hpp>
#include <boost/msm/front/euml/euml.hpp>
@@ -12,7 +22,7 @@
namespace
{
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
@@ -148,7 +158,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<Empty_impl&>().get_attribute(entry_counter) == 1,
Modified: trunk/libs/msm/test/SimpleInternalFunctors.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleInternalFunctors.cpp (original)
+++ trunk/libs/msm/test/SimpleInternalFunctors.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -26,7 +36,7 @@
struct to_ignore {};
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
@@ -248,7 +258,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().entry_counter == 1,"Empty entry not called correctly");
@@ -285,7 +295,7 @@
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().entry_counter == 1,"Stopped entry not called correctly");
BOOST_CHECK_MESSAGE(p.internal_guard_counter == 3,"Internal guard not called correctly");
- p.process_event(play());
+ p.process_event(play());
BOOST_CHECK_MESSAGE(p.current_state()[0] == 3,"Playing should be active"); //Playing
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().exit_counter == 1,"Stopped exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().entry_counter == 1,"Playing entry not called correctly");
Modified: trunk/libs/msm/test/SimpleMachine.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleMachine.cpp (original)
+++ trunk/libs/msm/test/SimpleMachine.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -19,7 +29,7 @@
struct open_close {};
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
@@ -181,7 +191,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().entry_counter == 1,"Empty entry not called correctly");
@@ -209,7 +219,7 @@
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().exit_counter == 2,"Empty exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().entry_counter == 1,"Stopped entry not called correctly");
- p.process_event(play());
+ p.process_event(play());
BOOST_CHECK_MESSAGE(p.current_state()[0] == 3,"Playing should be active"); //Playing
BOOST_CHECK_MESSAGE(p.get_state<player_::Stopped&>().exit_counter == 1,"Stopped exit not called correctly");
BOOST_CHECK_MESSAGE(p.get_state<player_::Playing&>().entry_counter == 1,"Playing entry not called correctly");
Modified: trunk/libs/msm/test/SimpleWithFunctors.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleWithFunctors.cpp (original)
+++ trunk/libs/msm/test/SimpleWithFunctors.cpp 2010-06-07 17:07:14 EDT (Mon, 07 Jun 2010)
@@ -1,3 +1,13 @@
+// Copyright 2010 Christophe Henry
+// henry UNDERSCORE christophe AT hotmail DOT com
+// This is an extended version of the state machine available in the boost::mpl library
+// Distributed under the same license as the original.
+// Copyright for the original version:
+// Copyright 2005 David Abrahams and Aleksey Gurtovoy. Distributed
+// under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
#include <iostream>
// back-end
#include <boost/msm/back/state_machine.hpp>
@@ -29,7 +39,7 @@
struct open_close {};
// A "complicated" event type that carries some data.
- enum DiskTypeEnum
+ enum DiskTypeEnum
{
DISK_CD=0,
DISK_DVD=1
@@ -50,12 +60,12 @@
{
unsigned int start_playback_counter;
unsigned int can_close_drawer_counter;
- unsigned int test_fct_counter;
+ unsigned int test_fct_counter;
player_():
start_playback_counter(0),
can_close_drawer_counter(0),
- test_fct_counter(0)
+ test_fct_counter(0)
{}
// The list of FSM states
@@ -114,12 +124,12 @@
typedef Empty initial_state;
// transition actions
- struct TestFct
+ struct TestFct
{
template <class EVT,class FSM,class SourceState,class TargetState>
void operator()(EVT const&, FSM& fsm,SourceState& ,TargetState& )
{
- ++fsm.test_fct_counter;
+ ++fsm.test_fct_counter;
}
};
struct start_playback
@@ -127,7 +137,7 @@
template <class EVT,class FSM,class SourceState,class TargetState>
void operator()(EVT const& ,FSM& fsm,SourceState& ,TargetState& )
{
- ++fsm.start_playback_counter;
+ ++fsm.start_playback_counter;
}
};
struct open_drawer
@@ -217,12 +227,12 @@
return true;
}
};
- struct can_close_drawer
+ struct can_close_drawer
{
template <class EVT,class FSM,class SourceState,class TargetState>
bool operator()(EVT const& evt ,FSM& fsm,SourceState& ,TargetState& )
{
- ++fsm.can_close_drawer_counter;
+ ++fsm.can_close_drawer_counter;
return true;
}
};
@@ -287,7 +297,7 @@
BOOST_AUTO_TEST_CASE( my_test )
{
- player p;
+ player p;
p.start();
BOOST_CHECK_MESSAGE(p.get_state<player_::Empty&>().entry_counter == 1,"Empty entry not called correctly");
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk