Update of /cvsroot/echempp/Experiment/Experiment/test
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1895/Experiment/Experiment/test
Modified Files:
ExperimentTest.cpp Makefile.am
Log Message:
Updated Experiment tests.
Index: ExperimentTest.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/Experiment/test/ExperimentTest.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ExperimentTest.cpp 17 May 2007 14:02:42 -0000 1.7
--- ExperimentTest.cpp 19 Dec 2007 13:32:12 -0000 1.8
***************
*** 1,4 ****
--- 1,8 ----
#include <iostream>
+ // local includes
+ #include "../Experiment.hpp"
+ using namespace experiment;
+
// Boost includes
#include <boost/test/unit_test.hpp>
***************
*** 10,17 ****
#include <boost/archive/xml_oarchive.hpp>
- // local includes
- #include "../Experiment.hpp"
- using namespace experiment;
-
// Note: Compile and link with:
// g++ -o ExperimentTest ExperimentTest.cpp -lboost_unit_test_framework
--- 14,17 ----
***************
*** 67,70 ****
--- 67,71 ----
ep2->add( new RealDynamicEPTAction() );
ep2->add( new RealDynamicTEPObservation() );
+
ep->add( ep2 );
return ep;
***************
*** 464,468 ****
BOOST_REQUIRE_NO_THROW( col.remove(1) );
BOOST_REQUIRE_THROW( col.remove(2), ExperimentException );
! BOOST_CHECK( col.num_elements() == 2 );
}
--- 465,469 ----
BOOST_REQUIRE_NO_THROW( col.remove(1) );
BOOST_REQUIRE_THROW( col.remove(2), ExperimentException );
! BOOST_CHECK( col.size() == 2 );
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/echempp/Experiment/Experiment/test/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.am 6 Apr 2007 17:17:51 -0000 1.14
--- Makefile.am 19 Dec 2007 13:32:12 -0000 1.15
***************
*** 3,7 ****
ExperimentTest_SOURCES = ExperimentTest.cpp
! ExperimentTest_LDADD = -lboost_unit_test_framework \
-lboost_serialization \
-lboost_date_time \
--- 3,8 ----
ExperimentTest_SOURCES = ExperimentTest.cpp
! ExperimentTest_LDADD = ../libeppExperiment.la \
! -lboost_unit_test_framework \
-lboost_serialization \
-lboost_date_time \
***************
*** 13,17 ****
-L$(BSUTILITIESLIB) -lBSUtilities \
-L$(LOKILIB) -lloki
- # ../libeppExperiment.la
INCLUDES = -I../../../Experiment \
--- 14,17 ----
|
