Cleanup output classes.

10 files changed, 42 insertions, 37 deletions

diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java
index 5482cca5..010cdd2c 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/AgentTest.java
@@ -27,11 +27,11 @@ import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.jacoco.agent.rt.internal.controller.IAgentController;
-import org.jacoco.agent.rt.internal.controller.LocalController;
-import org.jacoco.agent.rt.internal.controller.NoneController;
-import org.jacoco.agent.rt.internal.controller.TcpClientController;
-import org.jacoco.agent.rt.internal.controller.TcpServerController;
+import org.jacoco.agent.rt.internal.output.IAgentOutput;
+import org.jacoco.agent.rt.internal.output.FileOutput;
+import org.jacoco.agent.rt.internal.output.NoneOutput;
+import org.jacoco.agent.rt.internal.output.TcpClientOutput;
+import org.jacoco.agent.rt.internal.output.TcpServerOutput;
 import org.jacoco.core.JaCoCo;
 import org.jacoco.core.data.ExecutionDataReader;
 import org.jacoco.core.data.ExecutionDataStore;
@@ -70,19 +70,19 @@ public class AgentTest implements IExceptionLogger {
 		Agent agent = new Agent(options, this);
 
 		options.setOutput(OutputMode.file);
-		assertEquals(LocalController.class, agent.createAgentController()
+		assertEquals(FileOutput.class, agent.createAgentOutput()
 				.getClass());
 
 		options.setOutput(OutputMode.tcpserver);
-		assertEquals(TcpServerController.class, agent.createAgentController()
+		assertEquals(TcpServerOutput.class, agent.createAgentOutput()
 				.getClass());
 
 		options.setOutput(OutputMode.tcpclient);
-		assertEquals(TcpClientController.class, agent.createAgentController()
+		assertEquals(TcpClientOutput.class, agent.createAgentOutput()
 				.getClass());
 
 		options.setOutput(OutputMode.none);
-		assertEquals(NoneController.class, agent.createAgentController()
+		assertEquals(NoneOutput.class, agent.createAgentOutput()
 				.getClass());
 	}
 
@@ -106,8 +106,8 @@ public class AgentTest implements IExceptionLogger {
 		final Exception expected = new Exception();
 		Agent agent = new Agent(options, this) {
 			@Override
-			IAgentController createAgentController() {
-				return new IAgentController() {
+			IAgentOutput createAgentOutput() {
+				return new IAgentOutput() {
 					public void startup(AgentOptions options, RuntimeData data) {
 					}
 
@@ -231,8 +231,8 @@ public class AgentTest implements IExceptionLogger {
 		final boolean[] called = new boolean[1];
 		Agent agent = new Agent(options, this) {
 			@Override
-			IAgentController createAgentController() {
-				return new IAgentController() {
+			IAgentOutput createAgentOutput() {
+				return new IAgentOutput() {
 					public void startup(AgentOptions options, RuntimeData data) {
 					}
 
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/ExecutorTestBase.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/ExecutorTestBase.java
index a2ec01d4..96b8972f 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/ExecutorTestBase.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/ExecutorTestBase.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import static org.junit.Assert.fail;
 
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/LocalControllerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/FileOutputTest.java
index 3038eb81..120dbe77 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/LocalControllerTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/FileOutputTest.java
@@ -9,7 +9,7 @@
  *    Brock Janiczak - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -17,6 +17,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.IOException;
 
+import org.jacoco.agent.rt.internal.output.FileOutput;
 import org.jacoco.core.runtime.AgentOptions;
 import org.jacoco.core.runtime.RuntimeData;
 import org.junit.Rule;
@@ -24,9 +25,9 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 /**
- * Unit tests for {@link LocalController}.
+ * Unit tests for {@link FileOutput}.
  */
-public class LocalControllerTest {
+public class FileOutputTest {
 
 	@Rule
 	public TemporaryFolder folder = new TemporaryFolder();
@@ -37,7 +38,7 @@ public class LocalControllerTest {
 		AgentOptions options = new AgentOptions();
 		options.setDestfile(destFile.getAbsolutePath());
 
-		LocalController controller = new LocalController();
+		FileOutput controller = new FileOutput();
 		controller.startup(options, new RuntimeData());
 
 		assertTrue("Execution data file should be created", destFile.exists());
@@ -51,7 +52,7 @@ public class LocalControllerTest {
 		AgentOptions options = new AgentOptions();
 		options.setDestfile(destFile.getAbsolutePath());
 
-		LocalController controller = new LocalController();
+		FileOutput controller = new FileOutput();
 		controller.startup(options, new RuntimeData());
 		controller.writeExecutionData(false);
 		controller.shutdown();
@@ -65,7 +66,7 @@ public class LocalControllerTest {
 	public void testInvalidDestFile() throws Exception {
 		AgentOptions options = new AgentOptions();
 		options.setDestfile(folder.newFolder("folder").getAbsolutePath());
-		LocalController controller = new LocalController();
+		FileOutput controller = new FileOutput();
 
 		// Startup should fail as the file can not be created:
 		controller.startup(options, new RuntimeData());
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockServerSocket.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/MockServerSocket.java
index a9a55ec1..02e6a41f 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockServerSocket.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/MockServerSocket.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockServerSocketTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/MockServerSocketTest.java
index b98258dd..ba8d9283 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockServerSocketTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/MockServerSocketTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockSocketConnection.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/MockSocketConnection.java
index 2118fe8d..df3b1532 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockSocketConnection.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/MockSocketConnection.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,8 +25,8 @@ import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 /**
- * Simulates the two connected {@link Socket} objects. No physical connection is
- * established for this. The the behavior including the (inconsistent) exception
+ * Simulates two connected {@link Socket} objects. No physical connection is
+ * established for this. The behavior includes the (inconsistent) exception
  * messages have been derived from Sun JDK 1.5.0_18-b02.
  */
 public class MockSocketConnection {
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockSocketConnectionTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/MockSocketConnectionTest.java
index fd373bf2..05186d73 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/MockSocketConnectionTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/MockSocketConnectionTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpClientControllerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/TcpClientOutputTest.java
index 4548d404..3283551d 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpClientControllerTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/TcpClientOutputTest.java
@@ -11,7 +11,7 @@
  *    Marc R. Hoffmann - migration to mock socket
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -21,6 +21,8 @@ import java.net.Socket;
 import java.util.List;
 
 import org.jacoco.agent.rt.internal.ExceptionRecorder;
+import org.jacoco.agent.rt.internal.output.IAgentOutput;
+import org.jacoco.agent.rt.internal.output.TcpClientOutput;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.SessionInfo;
 import org.jacoco.core.data.SessionInfoStore;
@@ -32,13 +34,13 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Unit tests for {@link TcpClientController}.
+ * Unit tests for {@link TcpClientOutput}.
  */
-public class TcpClientControllerTest {
+public class TcpClientOutputTest {
 
 	private ExceptionRecorder logger;
 
-	private IAgentController controller;
+	private IAgentOutput controller;
 
 	private Socket remoteSocket;
 
@@ -54,7 +56,7 @@ public class TcpClientControllerTest {
 		final MockSocketConnection con = new MockSocketConnection();
 		remoteSocket = con.getSocketB();
 		remoteWriter = new RemoteControlWriter(remoteSocket.getOutputStream());
-		controller = new TcpClientController(logger) {
+		controller = new TcpClientOutput(logger) {
 			@Override
 			protected Socket createSocket(AgentOptions options)
 					throws IOException {
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpConnectionTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/TcpConnectionTest.java
index ead889a5..0c1e44e9 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpConnectionTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/TcpConnectionTest.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
+import org.jacoco.agent.rt.internal.output.TcpConnection;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.ExecutionDataWriter;
 import org.jacoco.core.data.SessionInfo;
diff --git a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpServerControllerTest.java b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/TcpServerOutputTest.java
index b70d70be..64c677c0 100644
--- a/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/controller/TcpServerControllerTest.java
+++ b/org.jacoco.agent.rt.test/src/org/jacoco/agent/rt/internal/output/TcpServerOutputTest.java
@@ -10,7 +10,7 @@
  *    Marc R. Hoffmann - migration to mock socket
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -25,6 +25,7 @@ import java.net.UnknownHostException;
 import java.util.List;
 
 import org.jacoco.agent.rt.internal.ExceptionRecorder;
+import org.jacoco.agent.rt.internal.output.TcpServerOutput;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.ExecutionDataWriter;
 import org.jacoco.core.data.SessionInfo;
@@ -37,9 +38,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Unit tests for {@link TcpServerController}.
+ * Unit tests for {@link TcpServerOutput}.
  */
-public class TcpServerControllerTest {
+public class TcpServerOutputTest {
 
 	private ExceptionRecorder logger;
 
@@ -47,7 +48,7 @@ public class TcpServerControllerTest {
 
 	private MockServerSocket serverSocket;
 
-	private TcpServerController controller;
+	private TcpServerOutput controller;
 
 	private RuntimeData data;
 
@@ -56,7 +57,7 @@ public class TcpServerControllerTest {
 		options = new AgentOptions();
 		logger = new ExceptionRecorder();
 		serverSocket = new MockServerSocket();
-		controller = new TcpServerController(logger) {
+		controller = new TcpServerOutput(logger) {
 			@Override
 			protected ServerSocket createServerSocket(AgentOptions options)
 					throws IOException {