little refa

src/main/java/org/bench4q/master/domain/RunningScript.java

@@ -46,7 +46,6 @@ public class RunningScript extends Observable implements RunningScriptInterface
 	private AgentService agentService;
 	private ScriptService scriptService;
 	private static Logger logger = Logger.getLogger(RunningScript.class);
-	private ScriptBriefResultModel latestScriptBriefModel;
 
 	public int getScriptId() {
 		return scriptId;
@@ -144,20 +143,7 @@ public class RunningScript extends Observable implements RunningScriptInterface
 		this.timer = timer;
 	}
 
-	public ScriptBriefResultModel getLatestScriptBriefModel() {
-		return latestScriptBriefModel;
-	}
-
-	private void setLatestScriptBriefModel(
-			ScriptBriefResultModel latestScriptBriefModel) {
-		this.latestScriptBriefModel = latestScriptBriefModel;
-	}
-
 	private RunningScript() {
-		ScriptBriefResultModel scriptBriefResultModel = new ScriptBriefResultModel();
-		scriptBriefResultModel.setAverageResponseTime(-1);
-		this.setLatestScriptBriefModel(scriptBriefResultModel);
-
 		this.setRunningAgents(new HashSet<RunningAgent>());
 		this.setTimer(new Timer());
 		this.setRunningAgentService(ApplicationContextHelper.getContext()
@@ -191,7 +177,6 @@ public class RunningScript extends Observable implements RunningScriptInterface
 	private ScriptBriefResultModel getScriptBrief() {
 		ScriptBriefResultModel result = this.getSampler().getScriptBrief();
 		result.setFinished(isFinished());
-		this.setLatestScriptBriefModel(result);
 		notifyObserver(result);
 		return result;
 	}

src/main/java/org/bench4q/master/domain/entity/TestPlan.java

@@ -126,9 +126,9 @@ public class TestPlan implements IAggregate {
 		this.loadDistribute = loadDistribute;
 	}
 
-	public TestPlanScript extracSpecifiedScript(Script script) {
+	public TestPlanScript extracSpecifiedScript(int scriptId) {
 		for (TestPlanScript testPlanScript : testPlanScripts) {
-			if (testPlanScript.getScript().getId() == script.getId()) {
+			if (testPlanScript.getScript().getId() == scriptId) {
 				return testPlanScript;
 			}
 		}

src/main/java/org/bench4q/master/domain/service/TestPlanScriptResultService.java

@@ -29,7 +29,6 @@ import org.springframework.stereotype.Component;
 public class TestPlanScriptResultService {
 	private TestPlanScriptService testPlanScriptService;
 	private TestPlanRepository testPlanRepository;
-	private ScriptService scriptService;
 	private SessionHelper sessionHelper;
 	private static Logger logger = Logger
 			.getLogger(TestPlanScriptResultService.class);
@@ -62,15 +61,6 @@ public class TestPlanScriptResultService {
 		this.testPlanRepository = testPlanRepository;
 	}
 
-	private ScriptService getScriptService() {
-		return scriptService;
-	}
-
-	@Autowired
-	private void setScriptService(ScriptService scriptService) {
-		this.scriptService = scriptService;
-	}
-
 	/**
 	 * Here I just use the Time that createDateTime in testplanscriptResult, If
 	 * it's not accuracy, i just need to modify the way of pick createDateTime
@@ -145,13 +135,8 @@ public class TestPlanScriptResultService {
 	private List<TestPlanScriptResult> doGetTestPlanScriptResults(
 			UUID testPlanId, int scriptId, long startTime, Class<?> resultType,
 			Session session) {
-		// TestPlanScript testPlanScript = this.getTestPlanScriptService()
+		TestPlanScript testPlanScript = this.getTestPlanRepository()
-		// .doGetTestPlanScript(scriptId, testPlanId, session);
+				.getTestPlanBy(testPlanId).extracSpecifiedScript(scriptId);
-		TestPlanScript testPlanScript = this
-				.getTestPlanRepository()
-				.getTestPlanBy(testPlanId)
-				.extracSpecifiedScript(
-						this.getScriptService().getScript(scriptId));
 		@SuppressWarnings("unchecked")
 		List<TestPlanScriptResult> results = (List<TestPlanScriptResult>) session
 				.createCriteria(TestPlanScriptResult.class)
@@ -183,11 +168,8 @@ public class TestPlanScriptResultService {
 
 	private TestPlanScriptResult doGetLastSampleResult(UUID testPlanId,
 			int scriptId, Class<?> resultType, Session session) {
-		TestPlanScript testPlanScript = this
+		TestPlanScript testPlanScript = this.getTestPlanRepository()
-				.getTestPlanRepository()
+				.getTestPlanBy(testPlanId).extracSpecifiedScript(scriptId);
-				.getTestPlanBy(testPlanId)
-				.extracSpecifiedScript(
-						this.getScriptService().getScript(scriptId));
 		@SuppressWarnings("unchecked")
 		List<TestPlanScriptResult> results = (List<TestPlanScriptResult>) session
 				.createCriteria(TestPlanScriptResult.class)

src/main/java/org/bench4q/master/domain/service/TestPlanScriptService.java

@@ -34,7 +34,6 @@ import org.springframework.stereotype.Component;
 public class TestPlanScriptService implements Observer {
 	private static Logger logger = Logger.getLogger(TestPlanService.class);
 	private SessionHelper sessionHelper;
-	private ScriptService scriptService;
 	private TestPlanRepository testPlanRepository;
 
 	private SessionHelper getSessionHelper() {
@@ -46,15 +45,6 @@ public class TestPlanScriptService implements Observer {
 		this.sessionHelper = sessionHelper;
 	}
 
-	private ScriptService getScriptService() {
-		return scriptService;
-	}
-
-	@Autowired
-	private void setScriptService(ScriptService scriptService) {
-		this.scriptService = scriptService;
-	}
-
 	private TestPlanRepository getTestPlanRepository() {
 		return testPlanRepository;
 	}
@@ -67,8 +57,8 @@ public class TestPlanScriptService implements Observer {
 	public TestPlanScript getTestPlanScript(int scriptId, UUID testPlanRunId) {
 		TestPlan testPlan = this.getTestPlanRepository().getTestPlanBy(
 				testPlanRunId);
-		return testPlan == null ? null : testPlan.extracSpecifiedScript(this
+		return testPlan == null ? null : testPlan
-				.getScriptService().getScript(scriptId));
+				.extracSpecifiedScript(scriptId);
 	}
 
 	public boolean saveScriptBriefResult(final UUID testPlanRunId,
@@ -118,7 +108,7 @@ public class TestPlanScriptService implements Observer {
 			}
 
 			TestPlanScript testPlanScript = testPlanDB
-					.extracSpecifiedScript(script);
+					.extracSpecifiedScript(script.getId());
 			if (testPlanScript == null) {
 				return;
 			}

src/test/java/org/bench4q/master/test/TestBase_MakeUpTestPlan.java

@@ -203,8 +203,8 @@ public class TestBase_MakeUpTestPlan extends TestBase {
 		TestPlan testPlan = this.getTestPlanRepository().getTestPlanBy(
 				getTestPlanRunIdUuid());
 		RunningAgentDB runningAgent = testPlan.extracSpecifiedScript(
-				this.getScriptService().getScript(getScriptId()))
+				getScriptId()).extractSpecificRunningAgentDB(
-				.extractSpecificRunningAgentDB(Test_AGENT_HOSTNAME);
+				Test_AGENT_HOSTNAME);
 		this.getAgentMessenger().stop(runningAgent.getAgent(),
 				runningAgent.getAgentRunId());
 		runningAgent.getAgent().setRemainLoad(

src/test/java/org/bench4q/master/test/domain/Test_RunningScript.java

@@ -7,49 +7,55 @@ import java.util.List;
 
 import org.bench4q.master.domain.RunningAgent;
 import org.bench4q.master.domain.RunningScript;
+import org.bench4q.master.domain.RunningTestPlanContainer;
 import org.bench4q.master.domain.entity.Agent;
+import org.bench4q.master.domain.entity.TestPlan;
 import org.bench4q.master.domain.factory.BusinessModelMapFactory;
 import org.bench4q.master.test.TestBase_MakeUpTestPlan;
+import org.bench4q.share.helper.TestHelper;
+import org.bench4q.share.models.master.statistics.ScriptBriefResultModel;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = { "classpath:service-test-context.xml" })
 public class Test_RunningScript extends TestBase_MakeUpTestPlan {
+	private RunningTestPlanContainer runningTestPlanContainer;
 
-	private RunningScript runningScript;
+	private RunningTestPlanContainer getRunningTestPlanContainer() {
-
+		return runningTestPlanContainer;
-	private RunningScript getRunningScript() {
-		return runningScript;
 	}
 
-	private void setRunningScript(RunningScript runningScript) {
+	@Autowired
-		this.runningScript = runningScript;
+	private void setRunningTestPlanContainer(
+			RunningTestPlanContainer runningTestPlanContainer) {
+		this.runningTestPlanContainer = runningTestPlanContainer;
 	}
 
-	public Test_RunningScript() {
+	@Before
-		this.setRunningScript(BusinessModelMapFactory
+	public void prepare() {
-				.toBusiness(buildScriptModel(USE_SCRIPT)));
+		submitATestPlanWithOneScript();
-		List<RunningAgent> runningAgents = new ArrayList<RunningAgent>();
+		prepareForTestPlanRunning();
-		RunningAgent runningAgent = new RunningAgent();
+	}
-		runningAgent.setLoadInUse(40);
+
-		runningAgent.setScriptId(this.getScriptId());
+	@After
-		runningAgent.setAgent(new Agent());
+	public void cleanUp() {
-		runningAgents.add(runningAgent);
+		cleanUpForTestPlanRunning();
-		this.getRunningScript().doAfterDistributeLoad(runningAgents);
 	}
 
 	@Test
-	public void testDoForComplete() {
+	public void testGetScriptBrief() throws Exception {
-		assertEquals(false, this.getRunningScript().isFinished());
+		RunningScript runningScript = this.getRunningTestPlanContainer()
-		assertEquals(1, this.getRunningScript()
+				.getRunningTestPlans().get(getTestPlanRunIdUuid())
-				.queryRunningAgentsUnModifiable().size());
+				.queryRunningScript(getScriptId());
-		this.getRunningScript().doForComplete();
+		runningScript.doPeriodicBrief();
-		assertEquals(0, this.getRunningScript()
+		Thread.sleep(11000);
-				.queryRunningAgentsUnModifiable().size());
+		TestPlan testPlan = this.getTestPlanRepository().getTestPlanBy(
-		assertEquals(true, this.getRunningScript().isFinished());
+				getTestPlanRunIdUuid());
 	}
-
 }

src/test/java/org/bench4q/master/test/domain/Test_RunningScriptSampler.java

@@ -40,8 +40,7 @@ public class Test_RunningScriptSampler extends TestBase_MakeUpTestPlan {
 		this.getTestPlanRepository().updateEntity(testPlan);
 		TestPlan testPlanInRunning = fetchTestPlan();
 		TestPlanScript testPlanScript = testPlanInRunning
-				.extracSpecifiedScript(this.getScriptService().getScript(
+				.extracSpecifiedScript(getScriptId());
-						getScriptId()));
 		this.setRunningScriptSampler(new RunningScriptSampler(testPlanScript
 				.getRunningAgentsDB()));
 	}

src/test/java/org/bench4q/master/test/domain/Test_TestPlan.java

@@ -59,8 +59,7 @@ public class Test_TestPlan extends TestBase_MakeUpTestPlan {
 		assertNotNull(testPlanScripts);
 		assertEquals(1, testPlanScripts.size());
 		TestPlanScript testPlanScript = testPlanAfterRun
-				.extracSpecifiedScript(this.getScriptService().getScript(
+				.extracSpecifiedScript(getScriptId());
-						getScriptId()));
 		assertNotNull(testPlanScript);
 		assertEquals(EACH_SCRIPT_LOAD_SMALLSCALE,
 				testPlanScript.getRequireLoad());

src/test/java/org/bench4q/master/test/testplan/Test_LoadDistribute.java

@@ -60,12 +60,9 @@ public class Test_LoadDistribute extends TestBase_MakeUpTestPlan {
 
 	@After
 	public void cleanUp() {
-		for (RunningAgentDB runningAgentDB : this
+		for (RunningAgentDB runningAgentDB : this.getTestPlanRepository()
-				.getTestPlanRepository()
 				.getTestPlanBy(getTestPlanRunIdUuid())
-				.extracSpecifiedScript(
+				.extracSpecifiedScript(getScriptId()).getRunningAgentsDB()) {
-						this.getScriptService().getScript(getScriptId()))
-				.getRunningAgentsDB()) {
 			this.getAgentMessenger().stop(runningAgentDB.getAgent(),
 					runningAgentDB.getAgentRunId());
 		}
@@ -86,9 +83,7 @@ public class Test_LoadDistribute extends TestBase_MakeUpTestPlan {
 		assertTrue(this.getLoadDistribute().generateLoadForTestPlan(
 				testPlanInDomain));
 		Set<RunningAgentDB> runningAgents = testPlanInDomain
-				.extracSpecifiedScript(
+				.extracSpecifiedScript(getScriptId()).getRunningAgentsDB();
-						this.getScriptService().getScript(getScriptId()))
-				.getRunningAgentsDB();
 		assertNotNull(runningAgents);
 		assertTrue(runningAgents.size() > 0);
 		for (RunningAgentDB runningAgentDB : runningAgents) {
@@ -97,9 +92,7 @@ public class Test_LoadDistribute extends TestBase_MakeUpTestPlan {
 		testPlanInDomain = this.getTestPlanRepository().getTestPlanBy(
 				getTestPlanRunIdUuid());
 		Set<RunningAgentDB> runningAgentsAfterRefetch = testPlanInDomain
-				.extracSpecifiedScript(
+				.extracSpecifiedScript(getScriptId()).getRunningAgentsDB();
-						this.getScriptService().getScript(getScriptId()))
-				.getRunningAgentsDB();
 		assertTrue(runningAgentsAfterRefetch.size() == 0);
 	}
 

src/test/java/org/bench4q/master/test/transaction/Test_ScriptLoadCommand.java

@@ -84,11 +84,9 @@ public class Test_ScriptLoadCommand extends TestBase_MakeUpTestPlan {
 	@Test
 	public void testExecuteWithTestPlanScript() {
 		submitATestPlanWithOneScript();
-		TestPlanScript testPlanScript = this
+		TestPlanScript testPlanScript = this.getTestPlanRepository()
-				.getTestPlanRepository()
 				.getTestPlanBy(getTestPlanRunIdUuid())
-				.extracSpecifiedScript(
+				.extracSpecifiedScript(this.getScriptId());
-						this.getScriptService().getScript(this.getScriptId()));
 		ScriptLoadCommand scriptLoadCommand = new ScriptLoadCommand(
 				testPlanScript, testPlanScript.getTestPlanID());
 		List<RunningAgent> runningAgents = scriptLoadCommand.execute();