format code and add more powerful multiget test.

Author: newroot

build.properties

@@ -33,7 +33,7 @@ build.dir=classes
 test.build.dir=testclasses
 build.instr.dir=classesinstr
 project=java_memcached-release
-ver=2.5.1
+ver=2.5.2
 junit.jar=lib/junit.jar
 log4j.jar=lib/log4j.jar
 emma.dir=lib

src/main/com/schooner/MemCached/BinaryClient.java

@@ -1224,14 +1224,14 @@ private final class Connection {
 
 			public Connection(SchoonerSockIO sock, ArrayList<String> keys) throws IOException {
 				this.sock = sock;
-                                List<byte[]> bufList = new ArrayList<byte[]>(keys.size());
-		                int size  = 0;
-		                for (String key : keys) {
-		        	      byte[] buf = key.getBytes();
-		        	      bufList.add(buf);
-		        	      size += buf.length;
-		                }
-		        	size = size + (bufList.size()+1)*24;
+				List<byte[]> bufList = new ArrayList<byte[]>(keys.size());
+				int size = 0;
+				for (String key : keys) {
+					byte[] buf = key.getBytes();
+					bufList.add(buf);
+					size += buf.length;
+				}
+				size = size + (bufList.size() + 1) * 24;
 				outgoing = ByteBuffer.allocateDirect(size);
 				outgoing.clear();
 				for (String key : keys) {
@@ -1314,8 +1314,8 @@ public ByteBuffer getBuffer() {
 			}
 
 			public String toString() {
-				return new StringBuffer().append("Connection to ").append(sock.getHost()).append(" with ").append(
-						incoming.size()).append(" bufs; done is ").append(isDone).toString();
+				return new StringBuffer().append("Connection to ").append(sock.getHost()).append(" with ")
+						.append(incoming.size()).append(" bufs; done is ").append(isDone).toString();
 			}
 		}
 

src/test/com/schooner/MemCached/MemCachedClientAsciiTest.java

@@ -337,15 +337,16 @@ public void testGetMulti() {
 	}
 
 	public void testGetMutiArrayStringArray() {
-		mc.set("foo1", "bar1");
-		mc.set("foo2", "bar2");
-		mc.set("foo3", "bar3");
-		String[] args = { "foo1", "foo2", "foo3" };
-		String[] expected = { "bar1", "bar2", "bar3" };
+		final int multiSize = 1000;
+		final String[] args = new String[multiSize];
+		for (int i = 0; i < multiSize; ++i) {
+			args[i] = "foo" + i;
+			mc.set(args[i], "bar" + i);
+		}
 		Object[] actual = mc.getMultiArray(args);
-		assertEquals(expected.length, actual.length);
+		assertEquals(multiSize, actual.length);
 		for (int i = 0; i < actual.length; i++) {
-			assertEquals(expected[i], actual[i]);
+			assertEquals("bar" + i, actual[i]);
 		}
 	}
 

src/test/com/schooner/MemCached/MemCachedClientBinaryTest.java

@@ -418,16 +418,16 @@ public void testGetMultiString() {
 	}
 
 	public void testGetMutiArrayStringArray() {
-		mc.set("foo1", "bar1");
-		mc.set("foo2", "bar2");
-		mc.set("foo3", "bar3");
-		String[] args = { "foo1", "foo2", "foo3" };
-		String[] expected = { "bar1", "bar2", "bar3" };
+		final int multiSize = 1000;
+		final String[] args = new String[multiSize];
+		for (int i = 0; i < multiSize; ++i) {
+			args[i] = "foo" + i;
+			mc.set(args[i], "bar" + i);
+		}
 		Object[] actual = mc.getMultiArray(args);
-		assertNull(mc.getMultiArray(null));
-		assertEquals(expected.length, actual.length);
+		assertEquals(multiSize, actual.length);
 		for (int i = 0; i < actual.length; i++) {
-			assertEquals(expected[i], actual[i]);
+			assertEquals("bar" + i, actual[i]);
 		}
 	}