From 1e8fd072ee765e70770a89970d164809e9d31a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 6 Feb 2012 21:00:19 +0100
Subject: Refactor: Rename classes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename Client and Master classes, because the classes contain more than
just the service interfaces.

– ClientServiceImpl => Client.
– MasterServiceImpl => Master.
---
 .../src/test/java/com/orbekk/same/ClientServiceImplTest.java |  2 +-
 .../src/test/java/com/orbekk/same/MasterServiceImplTest.java | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'same/src/test/java/com')

diff --git a/same/src/test/java/com/orbekk/same/ClientServiceImplTest.java b/same/src/test/java/com/orbekk/same/ClientServiceImplTest.java
index 2c5604a..4dfc54a 100644
--- a/same/src/test/java/com/orbekk/same/ClientServiceImplTest.java
+++ b/same/src/test/java/com/orbekk/same/ClientServiceImplTest.java
@@ -8,7 +8,7 @@ import static org.mockito.Mockito.*;
 public class ClientServiceImplTest {
     private State state = new State("ClientNetwork");
     private TestConnectionManager connections = new TestConnectionManager();
-    private ClientServiceImpl client = new ClientServiceImpl(state, connections,
+    private Client client = new Client(state, connections,
             "http://client/ClientService.json");
     private ClientService clientS = client.getService();
     
diff --git a/same/src/test/java/com/orbekk/same/MasterServiceImplTest.java b/same/src/test/java/com/orbekk/same/MasterServiceImplTest.java
index cc89054..0e7c81d 100644
--- a/same/src/test/java/com/orbekk/same/MasterServiceImplTest.java
+++ b/same/src/test/java/com/orbekk/same/MasterServiceImplTest.java
@@ -12,7 +12,7 @@ public class MasterServiceImplTest {
     private State state = new State("TestNetwork");
     private TestConnectionManager connections = new TestConnectionManager();
     private TestBroadcaster broadcaster = new TestBroadcaster();
-    private MasterServiceImpl master;
+    private Master master;
 
     public static class UnreachableClient implements ClientService {
         @Override
@@ -36,7 +36,7 @@ public class MasterServiceImplTest {
     @Before
     public void setUp() {
         state.update(".masterUrl", "http://master/MasterService.json", 1);
-        master = new MasterServiceImpl(state, connections, broadcaster);
+        master = new Master(state, connections, broadcaster);
         connections.masterMap.put("http://master/MasterService.json", master);
     }
     
@@ -66,7 +66,7 @@ public class MasterServiceImplTest {
 
     @Test
     public void clientJoin() {
-        ClientServiceImpl client = new ClientServiceImpl(
+        Client client = new Client(
                 new State("ClientNetwork"), connections,
                 "http://client/ClientService.json");
         ClientService clientS = client.getService();
@@ -79,12 +79,12 @@ public class MasterServiceImplTest {
     
     @Test
     public void validStateRequest() {
-        ClientServiceImpl client1 = new ClientServiceImpl(
+        Client client1 = new Client(
                 new State("ClientNetwork"), connections,
                 "http://client/ClientService.json");
         ClientService client1S = client1.getService();
         connections.clientMap.put("http://client/ClientService.json", client1S);
-        ClientServiceImpl client2 = new ClientServiceImpl(
+        Client client2 = new Client(
                 new State("ClientNetwork"), connections,
                 "http://client2/ClientService.json");
         ClientService client2S = client2.getService();
@@ -114,7 +114,7 @@ public class MasterServiceImplTest {
     
     @Test
     public void masterRemovesParticipant() {
-        ClientServiceImpl client = new ClientServiceImpl(
+        Client client = new Client(
                 new State("ClientNetwork"), connections,
                 "http://client/ClientService.json");
         ClientService clientS = client.getService();
-- 
cgit v1.2.3