added test for invalid parameter

Author: tillschumann

neuromapp/nest/synapse/main.cpp

@@ -84,11 +84,13 @@ namespace nest
 			const double x = vm["x"].as<double>();
 			const double tau_rec = vm["tau_rec"].as<double>();
 			const double tau_fac = vm["tau_fac"].as<double>();
+
 			try {
-				tsodyks2 syn tsodyks2(delay, weight, U, u, x, tau_rec, tau_fac);
+				tsodyks2 syn(delay, weight, U, u, x, tau_rec, tau_fac);
 			}
-			catch std::invalid_argument& e {
+			catch (std::invalid_argument& e) {
 				std::cout << "Error in model parameters: " << e.what() << std::endl;
+				return mapp::MAPP_BAD_DATA;
 			}
 		}
 		/* else if ( more models ) */
@@ -134,6 +136,7 @@ namespace nest
 		double dt = vm["dt"].as<double>();
 		int iterations = vm["iterations"].as<int>();
 
+		//will turn into ptr to base class if more synapse are implemented
 		boost::scoped_ptr<tsodyks2> syn;
 
 		if (vm["model"].as<std::string>() == "tsodyks2") {
@@ -145,11 +148,16 @@ namespace nest
 			const double tau_rec = vm["tau_rec"].as<double>();
 			const double tau_fac = vm["tau_fac"].as<double>();
 
-			syn.reset(new tsodyks2(delay, weight, U, u, x, tau_rec, tau_fac));
+			try {
+				syn.reset(new tsodyks2(delay, weight, U, u, x, tau_rec, tau_fac));
+			}
+			catch (std::invalid_argument& e) {
+				std::cout << "Error in model parameters: " << e.what() << std::endl;
+			}
 		}
 		/* else if () .. further synapse models*/
 		else {
-			std::cerr << "synapse model implementation missing" << std::endl;
+			std::cout << "Error: Synapse model implementation missing" << std::endl;
 		}
 
 		//preallocate vector for results

test/nest/synapse.cpp

@@ -46,14 +46,24 @@ BOOST_AUTO_TEST_CASE(nest_synapse_test)
 	error = mapp::execute(command_v,nest::synapse_execute);
 	BOOST_CHECK(error==mapp::MAPP_OK);
 
-	//trying out wrong model parameter
+	//trying out wrong model
 	command_v.clear();
 	command_v.push_back("synapse_execute"); // dummy argument to be compliant with getopt
 	command_v.push_back("--model");
 	command_v.push_back("synnotthere"); // model does not exist
 	error = mapp::execute(command_v,nest::synapse_execute);
 	BOOST_CHECK(error==mapp::MAPP_BAD_DATA);
 
+	//trying out wrong model parameters
+	command_v.clear();
+	command_v.push_back("synapse_execute"); // dummy argument to be compliant with getopt
+	command_v.push_back("--model");
+	command_v.push_back("tsodyks2");
+	command_v.push_back("--U");
+	command_v.push_back("2.0"); // model does not exist
+	error = mapp::execute(command_v,nest::synapse_execute);
+	BOOST_CHECK(error==mapp::MAPP_BAD_DATA);
+
 	//trying out invalid dt
 	command_v.clear();
 	command_v.push_back("synapse_execute"); // dummy argument to be compliant with getopt