Change the MonitorServiceTest.java with using @Autowired method to use

the object.
2013-07-23 11:20:04 +08:00 · 2013-07-23 11:20:04 +08:00 · 783cb244dc
parent 30dd3c8b6c
commit 783cb244dc
2 changed files with 99 additions and 62 deletions
--- a/src/main/java/org/bench4q/monitor/model/LogicalDiskModel.java
+++ b/src/main/java/org/bench4q/monitor/model/LogicalDiskModel.java
@ -3,142 +3,168 @@ package org.bench4q.monitor.model;
 import java.util.Map;

 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;

 /**
 * @author wxr
- *
+ * 
 */
@XmlRootElement(name = "LogicalDisk")
 public class LogicalDiskModel {

-
-	
 	private String[] instances;
 	private Map<String, Double> freeSpacePercent;
-	private Map<String, Double > freeMegabytes;
-	
-	//磁盘活动百分比
-	private Map<String,Double>  diskTimePercent;    
-	private Map<String,Double>  diskReadTimePercent;
-	private Map<String,Double>  diskWriteTimePercent;
-	
-	//磁盘平均活动时间
-	private Map<String,Double>  averageDiskTransferTimeInSecond;
-	private Map<String,Double>  averageDiskReadTimeInSecond;
-	private Map<String,Double>  averageDiskWriteTimeInSecond;
-	//磁盘平均处理的字节
-	private Map<String,Double> averageDiskBytesPerTransfer;//可计算吞吐率
-	private Map<String,Double> averageDiskBytesPerRead;
-	private Map<String,Double> averageDiskBytesPerWrite;
-	
-	//空闲百分比
-	private Map<String,Double> idleTimePercent;
-	//平均队列长度
-	private Map<String,Double>  averageDiskQueueLength;
-	//当前队列长度
-	private Map<String,Double> currentDiskQueueLength;
-	
-	
-	@XmlElement(name="Instance")
+	private Map<String, Double> freeMegabytes;
+
+	// 磁盘活动百分比
+	private Map<String, Double> diskTimePercent;
+	private Map<String, Double> diskReadTimePercent;
+	private Map<String, Double> diskWriteTimePercent;
+
+	// 磁盘平均活动时间
+	private Map<String, Double> averageDiskTransferTimeInSecond;
+	private Map<String, Double> averageDiskReadTimeInSecond;
+	private Map<String, Double> averageDiskWriteTimeInSecond;
+	// 磁盘平均处理的字节
+	private Map<String, Double> averageDiskBytesPerTransfer;// 可计算吞吐率
+	private Map<String, Double> averageDiskBytesPerRead;
+	private Map<String, Double> averageDiskBytesPerWrite;
+
+	// 空闲百分比
+	private Map<String, Double> idleTimePercent;
+	// 平均队列长度
+	private Map<String, Double> averageDiskQueueLength;
+	// 当前队列长度
+	private Map<String, Double> currentDiskQueueLength;
+
+	@XmlElement(name = "Instance")
 	public String[] getInstances() {
 		return instances;
 	}
+
 	public void setInstances(String[] instances) {
 		this.instances = instances;
 	}

-	@XmlElement(name="FreeSpacePercent")
+	@XmlElement(name = "FreeSpacePercent")
 	public Map<String, Double> getFreeSpacePercent() {
 		return freeSpacePercent;
 	}
+
 	public void setFreeSpacePercent(Map<String, Double> freeSpacePercent) {
 		this.freeSpacePercent = freeSpacePercent;
 	}
+
 	public Map<String, Double> getFreeMegabytes() {
 		return freeMegabytes;
 	}
+
 	public void setFreeMegabytes(Map<String, Double> freeMegabytes) {
 		this.freeMegabytes = freeMegabytes;
 	}
+
 	public Map<String, Double> getDiskTimePercent() {
 		return diskTimePercent;
 	}
+
 	public void setDiskTimePercent(Map<String, Double> diskTimePercent) {
 		this.diskTimePercent = diskTimePercent;
 	}
+
 	public Map<String, Double> getDiskReadTimePercent() {
 		return diskReadTimePercent;
 	}
+
 	public void setDiskReadTimePercent(Map<String, Double> diskReadTimePercent) {
 		this.diskReadTimePercent = diskReadTimePercent;
 	}
+
 	public Map<String, Double> getDiskWriteTimePercent() {
 		return diskWriteTimePercent;
 	}
+
 	public void setDiskWriteTimePercent(Map<String, Double> diskWriteTimePercent) {
 		this.diskWriteTimePercent = diskWriteTimePercent;
 	}
+
 	public Map<String, Double> getAverageDiskTransferTimeInSecond() {
 		return averageDiskTransferTimeInSecond;
 	}
+
 	public void setAverageDiskTransferTimeInSecond(
 			Map<String, Double> averageDiskTransferTimeInSecond) {
 		this.averageDiskTransferTimeInSecond = averageDiskTransferTimeInSecond;
 	}
+
 	public Map<String, Double> getAverageDiskReadTimeInSecond() {
 		return averageDiskReadTimeInSecond;
 	}
+
 	public void setAverageDiskReadTimeInSecond(
 			Map<String, Double> averageDiskReadTimeInSecond) {
 		this.averageDiskReadTimeInSecond = averageDiskReadTimeInSecond;
 	}
+
 	public Map<String, Double> getAverageDiskWriteTimeInSecond() {
 		return averageDiskWriteTimeInSecond;
 	}
+
 	public void setAverageDiskWriteTimeInSecond(
 			Map<String, Double> averageDiskWriteTimeInSecond) {
 		this.averageDiskWriteTimeInSecond = averageDiskWriteTimeInSecond;
 	}
+
 	public Map<String, Double> getAverageDiskBytesPerTransfer() {
 		return averageDiskBytesPerTransfer;
 	}
+
 	public void setAverageDiskBytesPerTransfer(
 			Map<String, Double> averageDiskBytesPerTransfer) {
 		this.averageDiskBytesPerTransfer = averageDiskBytesPerTransfer;
 	}
+
 	public Map<String, Double> getAverageDiskBytesPerRead() {
 		return averageDiskBytesPerRead;
 	}
+
 	public void setAverageDiskBytesPerRead(
 			Map<String, Double> averageDiskBytesPerRead) {
 		this.averageDiskBytesPerRead = averageDiskBytesPerRead;
 	}
+
 	public Map<String, Double> getAverageDiskBytesPerWrite() {
 		return averageDiskBytesPerWrite;
 	}
+
 	public void setAverageDiskBytesPerWrite(
 			Map<String, Double> averageDiskBytesPerWrite) {
 		this.averageDiskBytesPerWrite = averageDiskBytesPerWrite;
 	}
+
 	public Map<String, Double> getIdleTimePercent() {
 		return idleTimePercent;
 	}
+
 	public void setIdleTimePercent(Map<String, Double> idleTimePercent) {
 		this.idleTimePercent = idleTimePercent;
 	}
+
 	public Map<String, Double> getAverageDiskQueueLength() {
 		return averageDiskQueueLength;
 	}
-	public void setAverageDiskQueueLength(Map<String, Double> averageDiskQueueLength) {
+
+	public void setAverageDiskQueueLength(
+			Map<String, Double> averageDiskQueueLength) {
 		this.averageDiskQueueLength = averageDiskQueueLength;
 	}
+
 	public Map<String, Double> getCurrentDiskQueueLength() {
 		return currentDiskQueueLength;
 	}
-	public void setCurrentDiskQueueLength(Map<String, Double> currentDiskQueueLength) {
+
+	public void setCurrentDiskQueueLength(
+			Map<String, Double> currentDiskQueueLength) {
 		this.currentDiskQueueLength = currentDiskQueueLength;
 	}
-	
+
 }
--- a/src/test/java/org/bench4q/monitor/test/MonitorServiceTest.java
+++ b/src/test/java/org/bench4q/monitor/test/MonitorServiceTest.java
@ -3,23 +3,24 @@ package org.bench4q.monitor.test;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

-import javax.naming.spi.DirStateFactory.Result;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;

-import org.bench4q.monitor.MonitorServer;
 import org.bench4q.monitor.model.LogicalDiskModel;
 import org.bench4q.monitor.test.communication.HttpRequester;
 import org.bench4q.monitor.test.communication.HttpRequester.HttpResponse;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.DispatcherServlet;

+
+
+@Component
 public class MonitorServiceTest {
 	private HttpRequester httpRequester;
+	private static ApplicationContext atx;

 	public HttpRequester getHttpRequester() {
 		return httpRequester;
@ -31,15 +32,17 @@ public class MonitorServiceTest {
 	}

 	public static void main(String[] args) {
-		
-		String urlString = "http://localhost:5555/Monitor/LogicalDisk";
-		MonitorServiceTest monitorServiceTest = new MonitorServiceTest();
-		try {
-		
-			monitorServiceTest.setHttpRequester(new HttpRequester());
-			HttpResponse httpResponse = monitorServiceTest.getHttpRequester().
-					sendGet(urlString, null, null);

+		String urlString = "http://localhost:5555/Monitor/LogicalDisk";
+		atx = new ClassPathXmlApplicationContext("org/Bench4Q/Monitor/Config/application-context.xml");
+		
+		MonitorServiceTest monitorServiceTest =(MonitorServiceTest)atx.getBean("monitorServiceTest");
+	
+		try {
+			
+			HttpResponse httpResponse = monitorServiceTest.getHttpRequester()
+					.sendGet(urlString, null, null);
+	
 			LogicalDiskModel logicalDiskModel = monitorServiceTest
 					.extractLogicalDiskModel(httpResponse.getContent());
 			monitorServiceTest.result(logicalDiskModel);
@ -55,28 +58,36 @@ public class MonitorServiceTest {
 	public void result(LogicalDiskModel logicalDiskModel) {

 		for (String elem : logicalDiskModel.getInstances()) {
-			System.out.println(elem );
-			System.out.println("freeSpacePercent"+": "
+			System.out.println(elem);
+			System.out.println("freeSpacePercent" + ": "
 					+ logicalDiskModel.getFreeSpacePercent().get(elem));
-			System.out.println("FreeMegabytes"+": "
+			System.out.println("FreeMegabytes" + ": "
 					+ logicalDiskModel.getFreeMegabytes().get(elem));
-			System.out.println("diskTimePercent"+": "
+			System.out.println("diskTimePercent" + ": "
 					+ logicalDiskModel.getDiskTimePercent().get(elem));
-			System.out.println("diskReadTimePercent"+": "
+			System.out.println("diskReadTimePercent" + ": "
 					+ logicalDiskModel.getDiskReadTimePercent().get(elem));
-			System.out.println("diskWriteTimePercent"+": "
+			System.out.println("diskWriteTimePercent" + ": "
 					+ logicalDiskModel.getDiskWriteTimePercent().get(elem));
-			System.out.println("averageDiskTransferTimeInSecond"+": "
-					+ logicalDiskModel.getAverageDiskTransferTimeInSecond().get(elem));
-			System.out.println("averageDiskReadTimeInSecond"+": "
-					+ logicalDiskModel.getAverageDiskReadTimeInSecond().get(elem));
-			System.out.println("averageDiskWriteTimeInSecond"+": "
-					+ logicalDiskModel.getAverageDiskWriteTimeInSecond().get(elem));
-			System.out.println("averageDiskBytesPerTransfer"+": "
-					+ logicalDiskModel.getAverageDiskBytesPerTransfer().get(elem));
-			System.out.println("averageDiskBytesPerRead"+": "
+			System.out.println("averageDiskTransferTimeInSecond"
+					+ ": "
+					+ logicalDiskModel.getAverageDiskTransferTimeInSecond()
+							.get(elem));
+			System.out.println("averageDiskReadTimeInSecond"
+					+ ": "
+					+ logicalDiskModel.getAverageDiskReadTimeInSecond().get(
+							elem));
+			System.out.println("averageDiskWriteTimeInSecond"
+					+ ": "
+					+ logicalDiskModel.getAverageDiskWriteTimeInSecond().get(
+							elem));
+			System.out.println("averageDiskBytesPerTransfer"
+					+ ": "
+					+ logicalDiskModel.getAverageDiskBytesPerTransfer().get(
+							elem));
+			System.out.println("averageDiskBytesPerRead" + ": "
 					+ logicalDiskModel.getAverageDiskBytesPerRead().get(elem));
-			System.out.println("averageDiskBytesPerWrite"+": "
+			System.out.println("averageDiskBytesPerWrite" + ": "
 					+ logicalDiskModel.getAverageDiskBytesPerWrite().get(elem));
 		}