3 files changed, 13 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionCacheTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionCacheTest.java
index 813bf144635..bbe66b55425 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionCacheTest.java
@@ -30,9 +30,9 @@ import org.junit.BeforeClass;
  * 
  * @author Roberto E. Escobar
  */
-public class SessionCacheTest extends AbstractOseeCacheTest<Session> {
+public class SessionCacheTest extends AbstractOseeCacheTest<String, Session> {
 
-   private static AbstractOseeCache<Session> cache;
+   private static AbstractOseeCache<String, Session> cache;
    private static List<Session> sessionData;
 
    @BeforeClass
@@ -50,7 +50,7 @@ public class SessionCacheTest extends AbstractOseeCacheTest<Session> {
       super(sessionData, cache);
    }
 
-   private final static class SessionDataAccessor extends MockOseeDataAccessor<Session> {
+   private final static class SessionDataAccessor extends MockOseeDataAccessor<String, Session> {
 
       private final List<Session> data;
 
@@ -60,7 +60,7 @@ public class SessionCacheTest extends AbstractOseeCacheTest<Session> {
       }
 
       @Override
-      public void load(IOseeCache<Session> cache) throws OseeCoreException {
+      public void load(IOseeCache<String, Session> cache) throws OseeCoreException {
          super.load(cache);
          int typeId = 100;
          for (int index = 0; index < 10; index++) {
@@ -76,4 +76,9 @@ public class SessionCacheTest extends AbstractOseeCacheTest<Session> {
          }
       }
    }
+
+   @Override
+   protected String createKey() {
+      return GUID.create();
+   }
 }
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 ca93aaad905..1c3ebd5f94e 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
@@ -13,7 +13,6 @@ package org.eclipse.osee.framework.core.server.test.internal.session;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import org.junit.Assert;
 import org.eclipse.osee.framework.core.enums.StorageState;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.IOseeStorable;
@@ -23,6 +22,7 @@ import org.eclipse.osee.framework.core.server.internal.session.Session;
 import org.eclipse.osee.framework.core.server.internal.session.SessionCache;
 import org.eclipse.osee.framework.core.server.internal.session.SessionFactory;
 import org.eclipse.osee.framework.core.server.test.mocks.MockBuildTypeIdentifier;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -157,10 +157,10 @@ public class SessionFactoryTest {
       return data;
    }
 
-   private static final class MockSessionAccessor implements IOseeDataAccessor<Session> {
+   private static final class MockSessionAccessor implements IOseeDataAccessor<String, Session> {
 
       @Override
-      public void load(IOseeCache<Session> cache) {
+      public void load(IOseeCache<String, Session> cache) {
          // Do Nothing
       }
 
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java
index 593820ee934..89b651ee4d4 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java
@@ -33,7 +33,7 @@ public class SessionManagerTest {
       SessionFactory factory = null;
       ISessionQuery query = null;
       IAuthenticationManager authenticator = null;
-      MockOseeDataAccessor<Session> accessor = new MockOseeDataAccessor<Session>();
+      MockOseeDataAccessor<String, Session> accessor = new MockOseeDataAccessor<String, Session>();
       SessionCache sessionCache = new SessionCache(accessor);
       new SessionManagerImpl("ABCD", factory, query, sessionCache, authenticator);