Yair Zaslavsky has uploaded a new change for review.
Change subject: core: Fix dao tests not to print lookup error
......................................................................
core: Fix dao tests not to print lookup error
Although this does not break tests, seeing an exception
when running the first test in a bunch of tests is not something nice.
This patch solve this by introducing an EJBUtilsStrategy that uses the
createDataSource static method to "lookup" the dataSource, and set it
before DbFacadadeLocator.getDbFacade is called.
Change-Id: I9f37acaea5c21463c4e126799524a3c41b6071a6
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
1 file changed, 27 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/12174/1
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
index e4f6e14..09f0341 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
@@ -20,6 +20,11 @@
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.DbFacadeLocator;
import org.ovirt.engine.core.dal.dbbroker.generic.DBConfigUtils;
+import org.ovirt.engine.core.utils.ejb.BeanProxyType;
+import org.ovirt.engine.core.utils.ejb.BeanType;
+import org.ovirt.engine.core.utils.ejb.ContainerManagedResourceType;
+import org.ovirt.engine.core.utils.ejb.EJBUtilsStrategy;
+import org.ovirt.engine.core.utils.ejb.EjbUtils;
import org.springframework.jdbc.datasource.SingleConnectionDataSource;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestExecutionListeners;
@@ -50,14 +55,14 @@
@BeforeClass
public static void initTestCase() throws Exception {
+ EjbUtils.setStrategy(new DaoTestEjbUtilsStrategy());
if(dataSource == null) {
dataSource = createDataSource();
dataset = initDataSet();
- dbFacade = new DbFacade();
+ dbFacade = DbFacadeLocator.getDbFacade();
dbFacade.setDbEngineDialect(DbFacadeLocator.loadDbEngineDialect());
-
dbFacade.setTemplate(dbFacade.getDbEngineDialect().createJdbcTemplate(dataSource));
-
+
//dbFacade.setTemplate(dbFacade.getDbEngineDialect().createJdbcTemplate(dataSource));
// load data from fixtures to DB
DatabaseOperation.CLEAN_INSERT.execute(getConnection(), dataset);
}
@@ -88,6 +93,25 @@
return connection;
}
+ private static class DaoTestEjbUtilsStrategy extends EJBUtilsStrategy {
+
+ @Override
+ protected void addJNDIBeans() {
+ }
+
+ @Override
+ protected String getBeanSuffix(BeanType beanType, BeanProxyType
proxyType) {
+ return null;
+ }
+
+ public <T> T findResource(ContainerManagedResourceType resourceValue) {
+ if (ContainerManagedResourceType.DATA_SOURCE == resourceValue) {
+ return (T)dataSource;
+ }
+ return null;
+ }
+ }
+
private static DataSource createDataSource() {
DataSource result = null;
Properties properties = new Properties();
--
To view, visit http://gerrit.ovirt.org/12174
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f37acaea5c21463c4e126799524a3c41b6071a6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
