add validate about the plugin is null

Bench4Q-Master/src/main/java/org/bench4q/master/api/PluginController.java

@@ -29,8 +29,7 @@ public class PluginController extends BaseController {
 	public void setPluginService(PluginService pluginService) {
 		this.pluginService = pluginService;
 	}
-	
+
-	
 	@RequestMapping("/loadPluginList")
 	@ResponseBody
 	public PluginResponseModel loadPluginList() throws Bench4QException {
@@ -92,8 +91,12 @@ public class PluginController extends BaseController {
 			throws Bench4QException {
 		if (!this.checkScope(UserService.SUPER_AUTHENTICATION)) {
 			throw new Bench4QException(400 + "", "not permitted",
-					"loadMethodParams/{pluginName}/{methodName}");
+					"addPlugin/{pluginName}/{methodName}");
 		}
+		if (pluginGUI.getPlugin() == null) {
+			throw new Bench4QException(400 + "", "plugin is null", "addPlugin");
+		}
+
 		PluginResponseModel pluginResponseModel = new PluginResponseModel();
 		pluginResponseModel.setSuccess(this.getPluginService().addPlugin(
 				pluginGUI.getPlugin()));

Bench4Q-Master/src/main/java/org/bench4q/master/domain/factory/PluginFactory.java

@@ -41,10 +41,10 @@ public class PluginFactory {
 				plugin.getPluginMethods().add(
 						createMethodEntity(methodModel, plugin));
 			}
-		}
+			plugin.setName(pluginModel.getName());
-
+			return plugin;
-		plugin.setName(pluginModel.getName());
+		} else
-		return plugin;
+			throw new Bench4QException("", "no method in plugin", "");
 
 	}
 
@@ -56,7 +56,8 @@ public class PluginFactory {
 		if (methodModel.getMethodParams() != null) {
 			for (MethodParamModel methodParamModel : methodModel
 					.getMethodParams()) {
-			Logger.getLogger(PluginFactory.class).info("method model:" + methodModel.getName());
+				Logger.getLogger(PluginFactory.class).info(
+						"method model:" + methodModel.getName());
 				method.getMethodParams().add(
 						createMethodParamEntity(methodParamModel, method));
 			}

Bench4Q-Master/src/main/java/org/bench4q/master/domain/service/PluginService.java

@@ -55,8 +55,17 @@ public class PluginService {
 	}
 
 	public boolean addPlugin(PluginModel pluginModel) throws Bench4QException {
-		return this.getPluginRepository().attatch(
+		if (validatePlugin(pluginModel))
-				this.getPluginFactory().createPluginEntity(pluginModel));
+			return this.getPluginRepository().attatch(
+					this.getPluginFactory().createPluginEntity(pluginModel));
+		else {
+			throw new Bench4QException("", "invalidate plugin file", "");
+		}
+	}
+
+	private boolean validatePlugin(PluginModel pluginModel) {
+
+		return true;
 	}
 
 	public boolean deletePlugin(String pluginName) throws Bench4QException {

Bench4Q-Master/src/main/java/org/bench4q/master/domain/service/TestPlanEngine.java

@@ -81,7 +81,6 @@ public class TestPlanEngine implements TaskCompleteCallback,
 		this.getScheduleExecutor().scheduleAtFixedRate(new Runnable() {
 			public void run() {
 				TestPlan testPlan = pickATestPlan();
-
 				if (testPlan == null) {
 					logger.info("testPlan by pick is null");
 					return;

Bench4Q-Master/src/test/java/org/bench4q/master/test/service/Test_TestPlanEngine.java

@@ -23,7 +23,8 @@ public class Test_TestPlanEngine extends TestBase_MakeUpTestPlan {
 
 	@Before
 	public void prepare() {
-
+		prepareForTestPlanRunning();
+		submitATestPlanWithOneScript();
 	}
 
 	@After
@@ -42,6 +43,10 @@ public class Test_TestPlanEngine extends TestBase_MakeUpTestPlan {
 		testForStatus(TestPlanStatus.InRunning);
 	}
 
+	@Test
+	public void testPickTestPlan(){
+		
+	}
 	@Test
 	public void testRunTestPlanRightly() throws InterruptedException {
 		assertNotNull(this.getAgentMessenger().askLiving(Test_AGENT_HOSTNAME,