SSDM-555: fix cleandb tests

SVN: 32026

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ColumnNames.java

@@ -72,8 +72,6 @@ public final class ColumnNames
     public static final String DATA_STORE_SERVICES_DATASET_TYPES_PARENT_COLUMN =
             "DATA_STORE_SERVICE_ID";
 
-    public final static String DATABASE_INSTANCE_COLUMN = "dbin_id";
-
     public static final String QUERY_DATABASE_KEY_COLUMN = "db_key";
 
     public static final String QUERY_ENTITY_TYPE_CODE_COLUMN = "entity_type_code";

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java

@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.systemtest.base;
 
+import java.util.UUID;
+
 import org.hamcrest.Matcher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.support.GenericApplicationContext;
@@ -151,6 +153,7 @@ public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextT
     {
         DataStorePE dataStore = new DataStorePE();
         dataStore.setCode("STANDARD");
+        dataStore.setDatabaseInstanceUUID(UUID.randomUUID().toString());
         dataStore.setDownloadUrl("http://localhost");
         dataStore.setRemoteUrl("http://remotehost");
         dataStore.setSessionToken("");