Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Finkbeiner2011-10-13 13:36:47 +0000
committerRoberto E. Escobar2011-10-13 13:36:47 +0000
commit8d31c5e01049c2c37cb88448a3652596e710b795 (patch)
tree56ebb549cfe5e4f25a43f8665a92483ea6f3759d /plugins/org.eclipse.osee.orcs.db.mock/src/org
parentb929fa41fc7e129666f5e6cd1a1b98a8ebde674f (diff)
downloadorg.eclipse.osee-8d31c5e01049c2c37cb88448a3652596e710b795.tar.gz
org.eclipse.osee-8d31c5e01049c2c37cb88448a3652596e710b795.tar.xz
org.eclipse.osee-8d31c5e01049c2c37cb88448a3652596e710b795.zip
feature[ats_H59NP]: Updates for artifact loading
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db.mock/src/org')
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiUtil.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java13
2 files changed, 14 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiUtil.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiUtil.java
index 1f45791e53f..71ea066721b 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiUtil.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiUtil.java
@@ -20,7 +20,7 @@ import org.osgi.util.tracker.ServiceTracker;
public class OsgiUtil {
public static <T> T getService(Class<T> clazz) throws OseeCoreException {
- Bundle bundle = FrameworkUtil.getBundle(OseeDatabase.class);
+ Bundle bundle = FrameworkUtil.getBundle(OsgiUtil.class);
Assert.assertNotNull(bundle);
int bundleState = bundle.getState();
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
index e4b3266de7c..6fb4dfde268 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
@@ -16,10 +16,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import org.eclipse.osee.framework.core.data.IDatabaseInfo;
+import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider;
+import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.network.PortUtil;
import org.eclipse.osee.orcs.db.mock.OseeDatabase;
+import org.eclipse.osee.orcs.db.mock.OsgiUtil;
import org.junit.Assert;
import org.junit.runners.model.FrameworkMethod;
import org.osgi.framework.Bundle;
@@ -79,6 +82,16 @@ public class TestDatabase {
System.setProperty("osee.application.server.data", tempFolder.getAbsolutePath());
BundleContext context = getContext(bundle);
registration = context.registerService(IDatabaseInfoProvider.class, provider, null);
+
+ IOseeDatabaseService dbService = OsgiUtil.getService(IOseeDatabaseService.class);
+ Assert.assertNotNull(dbService);
+
+ OseeConnection connection = dbService.getConnection();
+ try {
+ Assert.assertNotNull(connection);
+ } finally {
+ connection.close();
+ }
}
private String getDbHomePath(File tempFolder, String dbFolder) {

Back to the top