From 260140ba044477169faabc67d5e97d3128738178 Mon Sep 17 00:00:00 2001
From: coderfengyun <chentienan@yeah.net>
Date: Tue, 7 Jan 2014 16:44:47 +0800
Subject: [PATCH] refactor the test, and pass it

---
 .../BehaviorsBriefStatistics.java             |  1 +
 .../master/test/service/Test_UserService.java | 71 +++++++++++--------
 .../master/test/testplan/TestPlanTester.java  |  9 ++-
 3 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/bench4q/master/testplan/datastatistics/BehaviorsBriefStatistics.java b/src/main/java/org/bench4q/master/testplan/datastatistics/BehaviorsBriefStatistics.java
index 48831454..ce53bc28 100644
--- a/src/main/java/org/bench4q/master/testplan/datastatistics/BehaviorsBriefStatistics.java
+++ b/src/main/java/org/bench4q/master/testplan/datastatistics/BehaviorsBriefStatistics.java
@@ -34,6 +34,7 @@ public class BehaviorsBriefStatistics extends ScriptStatistics {
 
 	public BehaviorsBriefStatistics() {
 		this.setMap(new HashMap<Integer, Map<Integer, BehaviorStatusCodeResultModel>>());
+		this.setIdUrlMap(new HashMap<Integer, String>());
 	}
 
 	public ScriptBehaviorsBriefModel getStatistics() {
diff --git a/src/test/java/org/bench4q/master/test/service/Test_UserService.java b/src/test/java/org/bench4q/master/test/service/Test_UserService.java
index 30fe8a43..4680cabb 100644
--- a/src/test/java/org/bench4q/master/test/service/Test_UserService.java
+++ b/src/test/java/org/bench4q/master/test/service/Test_UserService.java
@@ -1,41 +1,50 @@
 package org.bench4q.master.test.service;
 
+import static org.junit.Assert.*;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.bench4q.master.entity.TestPlanDB;
+import org.bench4q.master.service.infrastructure.UserService;
+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_UserService {
-	// private UserService userService;
-	//
-	// private UserService getUserService() {
-	// return userService;
-	// }
-	//
-	// @Autowired
-	// private void setUserService(UserService userService) {
-	// this.userService = userService;
-	// }
-	//
-	// @Test
-	// public void test() {
-	// assertNotNull(this.getUserService());
-	// }
-	//
-	// @Test
-	// public void testQueryTestPlans() {
-	// List<TestPlanDB> testPlanDBs = this.getUserService().querytestPlans(5);
-	// assertNotNull(testPlanDBs);
-	// assertTrue(testPlanDBs.size() > 0);
-	// }
-	//
-	// @Test
-	// public void testQueryTestPlan() {
-	// TestPlanDB testPlan = this.getUserService().queryTestPlan(5,
-	// UUID.fromString("ad10a4be-e6e2-4ffc-9282-3ba5c1a1316b"));
-	// assertNotNull(testPlan);
-	// assertEquals(testPlan.getTestPlanRunId().toString(),
-	// "ad10a4be-e6e2-4ffc-9282-3ba5c1a1316b");
-	// }
+	private UserService userService;
+
+	private UserService getUserService() {
+		return userService;
+	}
+
+	@Autowired
+	private void setUserService(UserService userService) {
+		this.userService = userService;
+	}
+
+	@Test
+	public void test() {
+		assertNotNull(this.getUserService());
+	}
+
+	@Test
+	public void testQueryTestPlans() {
+		List<TestPlanDB> testPlanDBs = this.getUserService().querytestPlans(5);
+		assertNotNull(testPlanDBs);
+		assertTrue(testPlanDBs.size() > 0);
+	}
+
+	@Test
+	public void testQueryTestPlan() {
+		TestPlanDB testPlan = this.getUserService().queryTestPlan(5,
+				UUID.fromString("ad10a4be-e6e2-4ffc-9282-3ba5c1a1316b"));
+		assertNotNull(testPlan);
+		assertEquals(testPlan.getTestPlanRunId().toString(),
+				"ad10a4be-e6e2-4ffc-9282-3ba5c1a1316b");
+	}
 }
diff --git a/src/test/java/org/bench4q/master/test/testplan/TestPlanTester.java b/src/test/java/org/bench4q/master/test/testplan/TestPlanTester.java
index e68283df..906b91ba 100644
--- a/src/test/java/org/bench4q/master/test/testplan/TestPlanTester.java
+++ b/src/test/java/org/bench4q/master/test/testplan/TestPlanTester.java
@@ -260,8 +260,13 @@ public class TestPlanTester extends TestBase_MakeUpTestPlan {
 
 	private void getLogicalDiskResult(UUID testPlanID, String hostName,
 			String port) throws IOException {
-		getMonitorResult(testPlanID, hostName, port,
-				"/monitorController/logicDiskMonitorSUTInfo");
+		HttpResponse httpResponse = this.httpRequester
+				.sendGet(
+						TestBase.BASE_URL
+								+ "/monitorController/logicDiskMonitorSUTInfo?testPlanRunId="
+								+ testPlanID.toString() + "/" + hostName
+								+ "/6565/0", null, this.createAccessTokenMap());
+		System.out.println(httpResponse.getContent());
 	}
 
 	private void getNetworkInterfaceResult(UUID testPlanID, String hostName,