Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2013-11-07 16:40:30 -0500
committerGerrit Code Review @ Eclipse.org2013-12-04 08:57:09 -0500
commitb982d9743c6175cde634c1ea90bd843ad2b2765d (patch)
tree5b206823e03682aab0dab6be3da44406a30da60b /plugins/org.eclipse.osee.framework.core.server.test
parent85bef36c56b5a49488fa624c89c1b0c78757f039 (diff)
downloadorg.eclipse.osee-b982d9743c6175cde634c1ea90bd843ad2b2765d.tar.gz
org.eclipse.osee-b982d9743c6175cde634c1ea90bd843ad2b2765d.tar.xz
org.eclipse.osee-b982d9743c6175cde634c1ea90bd843ad2b2765d.zip
feature[ats_XJMFJ]: Remove session managed by server concept
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.server.test')
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java22
2 files changed, 6 insertions, 21 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java
index 9a8f593403..9e44b0eb67 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java
@@ -61,13 +61,12 @@ public class SessionFactoryTest {
@Test
public void testCreate() {
Session session =
- factory.createNewSession(guid, userId, creationDate, managedByServerId, clientVersion, clientMachineName,
- clientAddress, clientPort, lastInteractionDate, lastInteractionDetails);
+ factory.createNewSession(guid, userId, creationDate, clientVersion, clientMachineName, clientAddress,
+ clientPort, lastInteractionDate, lastInteractionDetails);
Assert.assertEquals(guid, session.getGuid());
Assert.assertEquals(userId, session.getUserId());
Assert.assertEquals(creationDate, session.getCreationDate());
- Assert.assertEquals(managedByServerId, session.getManagedByServerId());
Assert.assertEquals(clientVersion, session.getClientVersion());
Assert.assertEquals(clientMachineName, session.getClientMachineName());
Assert.assertEquals(clientAddress, session.getClientAddress());
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java
index 476b3b1d24..0c5f5f6bab 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTest.java
@@ -39,9 +39,8 @@ public class SessionTest {
private final String expectedUserId;
private final Date expectedLastInteractionDate;
private final String expectedLastInteraction;
- private final String expectedManagedByServerId;
- public SessionTest(Session session, String guid, String expectedClientAddress, String expectedClientMachine, String expectedClientVersion, int expectedClientPort, Date expectedCreationDate, String expectedUserId, Date expectedLastInteractionDate, String expectedLastInteraction, String exepectedManagedByServerId) {
+ public SessionTest(Session session, String guid, String expectedClientAddress, String expectedClientMachine, String expectedClientVersion, int expectedClientPort, Date expectedCreationDate, String expectedUserId, Date expectedLastInteractionDate, String expectedLastInteraction) {
this.session = session;
this.expectedGuid = guid;
this.expectedClientAddress = expectedClientAddress;
@@ -52,7 +51,6 @@ public class SessionTest {
this.expectedUserId = expectedUserId;
this.expectedLastInteractionDate = expectedLastInteractionDate;
this.expectedLastInteraction = expectedLastInteraction;
- this.expectedManagedByServerId = exepectedManagedByServerId;
}
@Test
@@ -125,16 +123,6 @@ public class SessionTest {
Assert.assertEquals(newValue, session.getLastInteractionDetails());
}
- @Test
- public void testSetManagedByServerId() throws Exception {
- String newValue = GUID.create();
-
- Assert.assertEquals(expectedManagedByServerId, session.getManagedByServerId());
-
- session.setManagedByServerId(newValue);
- Assert.assertEquals(newValue, session.getManagedByServerId());
- }
-
@Parameters
public static Collection<Object[]> getData() {
Collection<Object[]> data = new ArrayList<Object[]>();
@@ -148,11 +136,10 @@ public class SessionTest {
String userId = "userId-" + index;
Date lastInteractionDate = new Date();
String lastInteraction = "lastInteraction-" + index;
- String managedByServerId = "serverId-" + index;
Session session =
- new Session(guid, userId, creationDate, managedByServerId, clientVersion, clientMachine, clientAddress,
- clientPort, lastInteractionDate, lastInteraction);
+ new Session(guid, userId, creationDate, clientVersion, clientMachine, clientAddress, clientPort,
+ lastInteractionDate, lastInteraction);
data.add(new Object[] {
session,
@@ -164,8 +151,7 @@ public class SessionTest {
creationDate,
userId,
lastInteractionDate,
- lastInteraction,
- managedByServerId});
+ lastInteraction});
}
return data;
}

Back to the top