Catch std::exception before ... and output e.what()

2 files changed, 3 insertions, 3 deletions

diff --git a/test/src/test-flat-stateid.cpp b/test/src/test-flat-stateid.cpp
index 7bc826c..6eb1ed8 100644
--- a/test/src/test-flat-stateid.cpp
+++ b/test/src/test-flat-stateid.cpp
@@ -5,7 +5,7 @@ int main(int argc, char** argv) {
 	std::list<std::string>::const_iterator listIter;
 
 	{
-		std::string stateId = "active:{};entered:{};history:{}";
+		std::string stateId = "active:{}";
 		uscxml::FlatStateIdentifier flat1(stateId);
 		assert(flat1.getActive().size() == 0);
 		assert(flat1.getVisited().size() == 0);
@@ -16,7 +16,7 @@ int main(int argc, char** argv) {
 	}
 
 	{
-		std::string stateId = "active:{s1};entered:{s1,s2};history:{}";
+		std::string stateId = "active:{s1};entered:{s1,s2}";
 		uscxml::FlatStateIdentifier flat1(stateId);
 		assert(flat1.getActive().size() == 1);
 		assert(flat1.getVisited().size() == 2);
diff --git a/test/src/test-w3c.cpp b/test/src/test-w3c.cpp
index 7eb54a7..6a3294d 100644
--- a/test/src/test-w3c.cpp
+++ b/test/src/test-w3c.cpp
@@ -145,7 +145,7 @@ class W3CStatusMonitor : public uscxml::InterpreterMonitor {
 		if (config.size() == 1) {
 			if (withFlattening) {
 				std::cout << ATTR_CAST(config[0], "id") << std::endl;
-				if (boost::starts_with(ATTR_CAST(config[0], "id"), "active-pass")) {
+				if (boost::starts_with(ATTR_CAST(config[0], "id"), "active:{pass")) {
 					std::cout << "TEST SUCCEEDED" << std::endl;
 					exit(EXIT_SUCCESS);
 				}