Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2014-12-03 18:29:48 -0500
committerAngel Avila2014-12-03 18:29:48 -0500
commitd2eca638ec9131c1dd5f1f3c18e25e5e6d6e7541 (patch)
tree906816e775caab5a11085af90d2ce2bbb1bd62f4 /plugins/org.eclipse.osee.framework.core.server.test
parent6ff80f0a2ac1712fc4756074fb8018b16879fe0d (diff)
downloadorg.eclipse.osee-d2eca638ec9131c1dd5f1f3c18e25e5e6d6e7541.tar.gz
org.eclipse.osee-d2eca638ec9131c1dd5f1f3c18e25e5e6d6e7541.tar.xz
org.eclipse.osee-d2eca638ec9131c1dd5f1f3c18e25e5e6d6e7541.zip
feature[ats_ATS139503]: Use JdbcService in core.server
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.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java52
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTestSuite.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/mocks/MockBuildTypeDataProvider.java6
4 files changed, 5 insertions, 61 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 cb6d849a09d..0e9db8f9c09 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
@@ -39,7 +39,7 @@ public class SessionFactoryTest {
private final String clientAddress;
private final int clientPort;
private final MockBuildTypeIdentifier typeIdentifier = new MockBuildTypeIdentifier();
- private final SessionFactory factory = new SessionFactory(new MockLog(), null, null, typeIdentifier);
+ private final SessionFactory factory = new SessionFactory(new MockLog(), null, typeIdentifier);
public SessionFactoryTest(String guid, String userId, Date creationDate, String clientVersion, String clientMachineName, String clientAddress, int clientPort) {
super();
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
deleted file mode 100644
index 38db896539b..00000000000
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionManagerTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.server.test.internal.session;
-
-import org.eclipse.osee.framework.core.server.IAuthenticationManager;
-import org.eclipse.osee.framework.core.server.internal.session.ISessionQuery;
-import org.eclipse.osee.framework.core.server.internal.session.SessionFactory;
-import org.eclipse.osee.framework.core.server.internal.session.SessionManagerImpl;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test Case for {@link SessionManagerImpl}
- *
- * @author Roberto E. Escobar
- */
-public class SessionManagerTest {
-
- @SuppressWarnings({"rawtypes", "unchecked"})
- @Ignore
- @Test
- public void test() {
- SessionFactory factory = null;
- ISessionQuery query = null;
- IAuthenticationManager authenticator = null;
- // LoadDataAccessor lda = mock(LoadDataAccessor.class);
- // StoreDataAccessor sda = mock(StoreDataAccessor.class);
- // SessionCache sessionCache = new SessionCache(lda);
- // new SessionManagerImpl("ABCD", factory, query, sessionCache, authenticator, sda);
-
- // OseeSessionGrant grant = sessionManager.createSession(OseeCredential credential); throws OseeCoreException;
-
- // sessionManager.releaseSession(String sessionId) throws OseeCoreException;
- // sessionManager.updateSessionActivity(String sessionId, String interactionName) throws OseeCoreException;
-
- // ISession session = sessionManager.getSessionById(String sessionId) throws OseeCoreException;
-
- // Collection<ISession> sessionManager.getSessionByClientAddress(String clientAddress) throws OseeCoreException;
- // Collection<ISession> sessionManager.getSessionsByUserId(String userId, boolean includeNonServerManagedSessions) throws OseeCoreException;
- // Collection<ISession> sessionManager.getAllSessions(boolean includeNonServerManagedSessions) throws OseeCoreException;
-
- // sessionManager.releaseSessionImmediate(String... sessionId) throws OseeCoreException;
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTestSuite.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTestSuite.java
index 316a39f7e25..497aad8bd57 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionTestSuite.java
@@ -14,11 +14,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({ //
-SessionTest.class, //
- SessionFactoryTest.class, //
- SessionManagerTest.class, //
-})
+@Suite.SuiteClasses({SessionTest.class, SessionFactoryTest.class})
/**
* @author Roberto E. Escobar
*/
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/mocks/MockBuildTypeDataProvider.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/mocks/MockBuildTypeDataProvider.java
index 25868036c84..4f819546d7a 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/mocks/MockBuildTypeDataProvider.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/mocks/MockBuildTypeDataProvider.java
@@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.server.test.mocks;
-import org.eclipse.osee.framework.core.server.internal.BuildTypeDataProvider;
+import org.eclipse.osee.framework.core.server.internal.BuildTypeIdentifier.BuildTypeDataProvider;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
* @author Roberto E. Escobar
*/
-public class MockBuildTypeDataProvider extends BuildTypeDataProvider {
+public class MockBuildTypeDataProvider implements BuildTypeDataProvider {
private final String data;
private final boolean isErrorOnGet;
@@ -27,7 +27,7 @@ public class MockBuildTypeDataProvider extends BuildTypeDataProvider {
}
@Override
- public String getData() throws OseeCoreException {
+ public String getData() {
if (isErrorOnGet) {
throw new OseeCoreException("Error case set");
}

Back to the top