From 5390aa5c05df1cadee46acc9d1ae6f2a9bb30002 Mon Sep 17 00:00:00 2001
From: coderfengyun <chentienan@yeah.net>
Date: Thu, 4 Sep 2014 14:45:42 +0800
Subject: [PATCH] ok, i can run it now

ok, i can run it now
---
 .../master/domain/entity/TestPlanScript.java    | 17 +++++++++--------
 .../master/integrated/Test_TestPlan.java        |  5 +----
 .../unitTest/TestBase_MakeUpTestPlan.java       |  6 +++---
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
index 5b74b635..84f66206 100644
--- a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
+++ b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
@@ -73,6 +73,15 @@ public class TestPlanScript implements RunningScriptInterface {
 		this.script = script;
 	}
 
+	@Column(name = "filteredScriptContent", columnDefinition = "LONGTEXT", nullable = true)
+	public String getFilteredScriptCnt() {
+		return filteredScriptCnt;
+	}
+
+	public void setFilteredScriptCnt(String filteredScriptCnt) {
+		this.filteredScriptCnt = filteredScriptCnt;
+	}
+
 	@Column(name = "requireLoad", nullable = false)
 	public int getRequireLoad() {
 		return requireLoad;
@@ -307,12 +316,4 @@ public class TestPlanScript implements RunningScriptInterface {
 		return this.getPlanedConfig().getScheduleContent();
 	}
 
-	@Transient
-	public String getFilteredScriptCnt() {
-		return filteredScriptCnt;
-	}
-
-	public void setFilteredScriptCnt(String filteredScriptCnt) {
-		this.filteredScriptCnt = filteredScriptCnt;
-	}
 }
diff --git a/Bench4Q-Master/src/test/java/org/bench4q/master/integrated/Test_TestPlan.java b/Bench4Q-Master/src/test/java/org/bench4q/master/integrated/Test_TestPlan.java
index 8cb830f2..ac4f6d1a 100644
--- a/Bench4Q-Master/src/test/java/org/bench4q/master/integrated/Test_TestPlan.java
+++ b/Bench4Q-Master/src/test/java/org/bench4q/master/integrated/Test_TestPlan.java
@@ -54,11 +54,8 @@ public class Test_TestPlan extends TestBase_MakeUpTestPlan {
 	@Test
 	public void testRun() throws InterruptedException {
 		assertTrue(this.getHaPool().getCurrentAvailableLoad() >= 500);
-		TestPlan testPlanFromRepo = this.getTestPlanRepository()
+		TestPlan testPlanInDomain = this.getTestPlanRepository()
 				.getTestPlanInDomainBy(getTestPlanRunIdUuid());
-		TestPlan testPlanInDomain = this.getTestPlanFactory().convertToDomain(
-				testPlanFromRepo);
-		this.getTestPlanRepository().attachRunningTestPlan(testPlanInDomain);
 		testPlanInDomain.run();
 		this.getTestPlanRepository().attachRunningTestPlan(testPlanInDomain);
 		assertEquals(TestPlanStatus.InRunning.name(),
diff --git a/Bench4Q-Master/src/test/java/org/bench4q/master/unitTest/TestBase_MakeUpTestPlan.java b/Bench4Q-Master/src/test/java/org/bench4q/master/unitTest/TestBase_MakeUpTestPlan.java
index 84a4b31c..41a429d5 100644
--- a/Bench4Q-Master/src/test/java/org/bench4q/master/unitTest/TestBase_MakeUpTestPlan.java
+++ b/Bench4Q-Master/src/test/java/org/bench4q/master/unitTest/TestBase_MakeUpTestPlan.java
@@ -28,6 +28,7 @@ import org.bench4q.master.infrastructure.communication.AgentMessenger;
 import org.bench4q.master.infrastructure.highavailable.HighAvailablePool;
 import org.bench4q.master.unitTest.controller.TestBase;
 import org.bench4q.share.enums.master.TestPlanStatus;
+import org.bench4q.share.models.agent.ScriptFilterOptionsModel;
 import org.bench4q.share.models.agent.scriptrecord.ScheduleModel;
 import org.bench4q.share.models.agent.scriptrecord.ScheduleModel.PointModel;
 import org.bench4q.share.models.master.MonitorModel;
@@ -290,9 +291,7 @@ public class TestBase_MakeUpTestPlan extends TestBase {
 			model = createATestPlanWithOneScript(scriptOne);
 		}
 		try {
-			this.getTestPlanRepository().attach(
-					this.testPlanFactory.createATestPlanWithoutId(model, user,
-							testPlanRunId));
+			this.getTestPlanEngine().submitTestPlan(model, user, testPlanRunId);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -396,6 +395,7 @@ public class TestBase_MakeUpTestPlan extends TestBase {
 	public static RunningScriptModel buildScriptModel(int scriptID) {
 		RunningScriptModel model = new RunningScriptModel();
 		model.setScriptId(scriptID);
+		model.setScriptFilterOptionsModel(new ScriptFilterOptionsModel());
 		model.setRequireLoad(EACH_SCRIPT_LOAD_SMALLSCALE);
 		ScheduleModel schedule = new ScheduleModel();
 		schedule.getPoints().add(new PointModel(0, 0));