--- android/TrainInfoService/src/dk/thoerup/traininfoservice/TestServlet.java	2010/05/18 20:58:04	735
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/TestServlet.java	2010/07/05 09:48:06	958
@@ -5,28 +5,29 @@
 import java.util.Random;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
+@WebServlet(urlPatterns={"/TestServlet"})
 public class TestServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
-	final int COUNT = 10;
+	
+	Random r = new Random();
 
-	//South-West corner= 54.0, 7.0
-	//North-East corner= 58.0, 16.0
-	//Latitude span=4.0
-	//Longitude span=9.0
-	void testFindNearest() throws SQLException {
-		Random r = new Random();
+	//South-West corner= 54.5, 8.0
+	//North-East corner= 57.8, 12.7
+	//Latitude span=3.3
+	//Longitude span=4.7
+	void testFindNearest(int count) throws SQLException {		
 
 		StationDAO db = new StationDAO();
 
 
-		for (int i=0; i<COUNT; i++) {
-			float lat = (r.nextFloat()*4.0F) + 54.0F;
-			float lng = (r.nextFloat()*9.0F) + 7.0F;
+		for (int i=0; i<count; i++) {
+			float lat = (r.nextFloat()*3.3F) + 54.5F;
+			float lng = (r.nextFloat()*4.7F) + 8.0F;
 			db.getByLocation(lat, lng);
 		}
 
@@ -34,12 +35,11 @@
 
 	}
 
-	void testFindName()  throws SQLException {
-		Random r = new Random();
+	void testFindName(int count)  throws SQLException {
 		
 		StationDAO db = new StationDAO();
 		
-		for (int i=0; i<COUNT; i++) {
+		for (int i=0; i<count; i++) {
 			char c1 = ((char)r.nextInt(26));
 			c1 += 'a';
 			char c2 = ((char)r.nextInt(26)) ;
@@ -50,22 +50,57 @@
 			
 			db.getByName(search);
 		}
+	}
+	
+	void testFindFavorites(int count)  throws SQLException {
+		
+		StationDAO db = new StationDAO();
+		
+		for (int i=0; i<count; i++) {
+			final int MAX = 8;
+			
+			StringBuilder sb = new StringBuilder();
+			sb.append('(');
+			for (int j=0; j<MAX;j++) {
+				if (j>0)
+					sb.append(',');
+				sb.append(r.nextInt(400));
+			}
+			sb.append(')');
 
 
-
+			db.getByList(sb.toString());
+		}
 	}
 
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		
+		
+		String test = request.getParameter("test");
+		String strCount = request.getParameter("count");
+		int count = Integer.parseInt(strCount);
+		
+	
 		try {			
 			long start = System.currentTimeMillis();
-			testFindName();
+			
+			if ( test.equals("name") ) {
+				testFindName(count);
+			} else if ( test.equals("nearest") ) {
+				testFindNearest(count);
+			} else if ( test.equals("favorites") ) {
+				testFindFavorites(count);
+			} else {
+				throw new ServletException("No parameter test");
+			}
+			
 			long stop = System.currentTimeMillis();
 
 			long elapsed = stop-start;
 
-			float avg = ((float)elapsed) / COUNT;
+			float avg = ((float)elapsed) / count;
 
-			String out = "Count=" + COUNT + "\n" +  				 
+			String out = "Count=" + count + "\n" +  				 
 			"Elapsed=" + elapsed + "\n" +
 			"Avg.=" +  avg;