Merge remote-tracking branch 'aosp/upstream-pull-525' into masterandroid-o-preview-3

* aosp/upstream-pull-525:
  Increase checked size for build result
  Fix description.
  Remove unnecessary .gitignore
  New option -quiet for all commands
  Tests for XML documentation generator.
  Test and documentation for multiple values.
  Adjust test case names to new conventions.
  Command to print version.
  Update documentation for command line interface
  Close ServerSocket in tests.
  Wrap long usage lines in documentation.
  Make sure the build runs with Java 5.
  Flush output automatically
  Use -dest for option name as output can be folder or file.
  Correct test method naming.
  Remove obsolete, commented configuration.
  Github #525: Simple Command Line Interface

Change-Id: Ia4c47f78760fc756ecc029ff4bc21d265e22d82a

1 files changed, 24 insertions, 2 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/tools/ExecDumpClientTest.java b/org.jacoco.core.test/src/org/jacoco/core/tools/ExecDumpClientTest.java
index 3fe1688f..80918149 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/tools/ExecDumpClientTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/tools/ExecDumpClientTest.java
@@ -101,7 +101,7 @@ public class ExecDumpClientTest {
 				// 3. Retry
 				"onConnectionFailure", "onConnecting")
 
-		, callbacks);
+				, callbacks);
 	}
 
 	@Test
@@ -126,6 +126,12 @@ public class ExecDumpClientTest {
 		assertTrue(resetRequested);
 	}
 
+	@Test(expected = IOException.class)
+	public void testNopServer() throws IOException {
+		int port = createNopServer();
+		client.dump((String) null, port);
+	}
+
 	private int getFreePort() throws IOException {
 		final ServerSocket server = new ServerSocket(0, 0,
 				InetAddress.getByName(null));
@@ -159,11 +165,27 @@ public class ExecDumpClientTest {
 				dumpRequested = dump;
 				resetRequested = reset;
 				if (dump) {
-					writer.visitSessionInfo(new SessionInfo("TestId", 100, 200));
+					writer.visitSessionInfo(
+							new SessionInfo("TestId", 100, 200));
 				}
 				writer.sendCmdOk();
 			}
 		});
 		reader.read();
 	}
+
+	private int createNopServer() throws IOException {
+		server = new ServerSocket(0, 0, InetAddress.getByName(null));
+		new Thread(new Runnable() {
+			public void run() {
+				try {
+					server.accept().close();
+				} catch (IOException e) {
+					// ignore
+				}
+			}
+		}).start();
+		return server.getLocalPort();
+	}
+
 }