Skip to content
Snippets Groups Projects
Commit 683ad218 authored by brinn's avatar brinn
Browse files

Fix unit tests: do not change data_stores table outside of current transaction...

Fix unit tests: do not change data_stores table outside of current transaction so that it gets rolled back.

SVN: 27048
parent 74200a71
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,7 @@ import static junit.framework.Assert.assertNotNull; ...@@ -22,6 +22,7 @@ import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail; import static junit.framework.Assert.fail;
import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -39,7 +40,6 @@ import org.testng.annotations.BeforeClass; ...@@ -39,7 +40,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exception.UserFailureException; import ch.systemsx.cisd.common.exception.UserFailureException;
import ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext;
import ch.systemsx.cisd.openbis.generic.server.api.v1.ResourceNames; import ch.systemsx.cisd.openbis.generic.server.api.v1.ResourceNames;
import ch.systemsx.cisd.openbis.generic.server.business.bo.common.DatabaseContextUtils; import ch.systemsx.cisd.openbis.generic.server.business.bo.common.DatabaseContextUtils;
import ch.systemsx.cisd.openbis.generic.server.business.bo.common.EntityListingTestUtils; import ch.systemsx.cisd.openbis.generic.server.business.bo.common.EntityListingTestUtils;
...@@ -118,21 +118,21 @@ public class DataSetListerTest extends AbstractDAOTest ...@@ -118,21 +118,21 @@ public class DataSetListerTest extends AbstractDAOTest
@Test @Test
public void testGetDataStoreURLs() public void testGetDataStoreURLs()
{ {
DatabaseConfigurationContext context = DatabaseContextUtils.getDatabaseContext(daoFactory); Connection conn = DatabaseContextUtils.getConnection(daoFactory);
QueryTool QueryTool
.update(context.getDataSource(), .update(conn,
"update data_stores set download_url='http://download_1',remote_url='http://remote_1'" "update data_stores set download_url='http://download_1',remote_url='http://remote_1'"
+ " where code='STANDARD'"); + " where code='STANDARD'");
final long newDataStoreId = final long newDataStoreId =
(Long) QueryTool (Long) QueryTool
.select(context.getDataSource(), .select(conn,
"insert into data_stores (id,dbin_id,code,download_url,remote_url,session_token)" "insert into data_stores (id,dbin_id,code,download_url,remote_url,session_token)"
+ " values (nextval('data_store_id_seq'),1,'DSS2','http://download_2','http://remote_2','') returning id") + " values (nextval('data_store_id_seq'),1,'DSS2','http://download_2','http://remote_2','') returning id")
.get(0).get("id"); .get(0).get("id");
QueryTool.update(context.getDataSource(), QueryTool.update(conn,
"update data set dast_id = ?{1} where code = ?{2}", newDataStoreId, "update data set dast_id = ?{1} where code = ?{2}", newDataStoreId,
"20081105092259000-20"); "20081105092259000-20");
QueryTool.update(context.getDataSource(), QueryTool.update(conn,
"update data set dast_id = ?{1} where code = ?{2}", newDataStoreId, "update data set dast_id = ?{1} where code = ?{2}", newDataStoreId,
"20081105092259000-21"); "20081105092259000-21");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment