diff options
author | Roberto E. Escobar | 2014-11-26 23:43:10 +0000 |
---|---|---|
committer | Angel Avila | 2014-11-26 23:43:10 +0000 |
commit | 58aee3b10ceeadbe21c1ba539d0b7e5bbbde776a (patch) | |
tree | f5e139923f1a21bfea4994553374d823512fb3f4 /plugins/org.eclipse.osee.orcs.account.admin.test | |
parent | 6407bc44a88f6b410f560916358bdf2a90606b8b (diff) | |
download | org.eclipse.osee-58aee3b10ceeadbe21c1ba539d0b7e5bbbde776a.tar.gz org.eclipse.osee-58aee3b10ceeadbe21c1ba539d0b7e5bbbde776a.tar.xz org.eclipse.osee-58aee3b10ceeadbe21c1ba539d0b7e5bbbde776a.zip |
feature[ats_ATS139503]: Use JdbcService in ORCS
Change-Id: I4d98347f558b4911522024ef7949353c75c2d1b5
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.account.admin.test')
5 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF index 3599b21ecdc..685bc22edff 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF @@ -15,7 +15,6 @@ Require-Bundle: org.junit, org.eclipse.osee.event.osgi, org.eclipse.osee.logger, org.eclipse.osee.framework.core, - org.eclipse.osee.framework.database, org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.resource.management Import-Package: org.eclipse.osee.orcs.db.mock, diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/JdbcJaxRsOAuthStorageTest.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/JdbcJaxRsOAuthStorageTest.java index db6e802f99f..0bcf2940788 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/JdbcJaxRsOAuthStorageTest.java +++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/JdbcJaxRsOAuthStorageTest.java @@ -84,7 +84,7 @@ public class JdbcJaxRsOAuthStorageTest { public static final List<String> REGISTERED_SCOPES = Arrays.asList("scope-1", "scope-2", "scope-3"); @Rule - public TestRule osgi = OrcsIntegrationRule.integrationRule(this, "osee.demo.hsql"); + public TestRule osgi = OrcsIntegrationRule.integrationRule(this); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsAccountStorageTest.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsAccountStorageTest.java index 3fe21642779..e1f3f1aa3d4 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsAccountStorageTest.java +++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsAccountStorageTest.java @@ -45,7 +45,7 @@ import org.mockito.Mock; public class OrcsAccountStorageTest { @Rule - public TestRule osgi = OrcsIntegrationRule.integrationRule(this, "osee.demo.hsql"); + public TestRule osgi = OrcsIntegrationRule.integrationRule(this); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java index 707c2ad00ec..2a1bc5658fd 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java +++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.account.admin.integration; import org.eclipse.osee.account.admin.AccountAdmin; import org.eclipse.osee.event.EventService; import org.eclipse.osee.executor.admin.ExecutorAdmin; -import org.eclipse.osee.framework.database.IOseeDatabaseService; +import org.eclipse.osee.jdbc.JdbcService; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsApi; import org.eclipse.osee.orcs.db.mock.OseeDatabase; @@ -32,8 +32,9 @@ public final class OrcsIntegrationRule extends OsgiRule { // Utility } - public static TestRule integrationRule(Object testObject, String dbId) { - return RuleChain.outerRule(new OseeDatabase(dbId)).around(new OsgiRule(new CheckServices(), testObject)); + public static TestRule integrationRule(Object testObject) { + return RuleChain.outerRule(new OseeDatabase("orcs.jdbc.service", "account.jdbc.service", "oauth.jdbc.service")).around( + new OsgiRule(new CheckServices(), testObject)); } public static class CheckServices { @@ -42,7 +43,7 @@ public final class OrcsIntegrationRule extends OsgiRule { @OsgiService public EventAdmin eventAdmin; @OsgiService public EventService eventService; @OsgiService public ExecutorAdmin executorAdmin; - @OsgiService public IOseeDatabaseService dbService; + @OsgiService public JdbcService dbService; @OsgiService public OrcsApi orcsApi; @OsgiService public AccountAdmin accountAdmin; // @formatter:on diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsSubscriptionStorageTest.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsSubscriptionStorageTest.java index 3b3306aff0c..7a22fd85716 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsSubscriptionStorageTest.java +++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsSubscriptionStorageTest.java @@ -45,7 +45,7 @@ public class OrcsSubscriptionStorageTest { private static final String SUBSCRIPTION_GROUP = "Subscription-Group1"; @Rule - public TestRule osgi = OrcsIntegrationRule.integrationRule(this, "osee.demo.hsql"); + public TestRule osgi = OrcsIntegrationRule.integrationRule(this); @Rule public ExpectedException thrown = ExpectedException.none(); |