Fixing tests
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/infrastructure-tests@124132 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
90958dbfa2
commit
4137b561ca
|
@ -7,13 +7,9 @@ import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import org.gcube.accounting.datamodel.BasicUsageRecord;
|
import org.gcube.accounting.datamodel.BasicUsageRecord;
|
||||||
import org.gcube.accounting.datamodel.UsageRecord;
|
import org.gcube.accounting.datamodel.UsageRecord;
|
||||||
import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
|
import org.gcube.accounting.testutility.TestUsageRecord;
|
||||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||||
import org.gcube.documentstore.exception.InvalidValueException;
|
import org.gcube.documentstore.exception.InvalidValueException;
|
||||||
import org.gcube.documentstore.persistence.FallbackPersistenceBackend;
|
|
||||||
import org.gcube.documentstore.persistence.PersistenceBackend;
|
|
||||||
import org.gcube.documentstore.persistence.PersistenceBackendFactory;
|
|
||||||
import org.gcube.documentstore.persistence.PersistenceBackendMonitor;
|
|
||||||
import org.gcube.utils.StressTestUtility;
|
import org.gcube.utils.StressTestUtility;
|
||||||
import org.gcube.utils.TestOperation;
|
import org.gcube.utils.TestOperation;
|
||||||
import org.gcube.utils.TestUtility;
|
import org.gcube.utils.TestUtility;
|
||||||
|
|
|
@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import org.gcube.accounting.datamodel.BasicUsageRecord;
|
import org.gcube.accounting.datamodel.BasicUsageRecord;
|
||||||
import org.gcube.accounting.datamodel.UsageRecord;
|
import org.gcube.accounting.datamodel.UsageRecord;
|
||||||
import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
|
import org.gcube.accounting.testutility.TestUsageRecord;
|
||||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||||
import org.gcube.utils.StressTestUtility;
|
import org.gcube.utils.StressTestUtility;
|
||||||
import org.gcube.utils.TestOperation;
|
import org.gcube.utils.TestOperation;
|
||||||
|
@ -28,10 +28,6 @@ public class PersistenceBackendTest {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(PersistenceBackendTest.class);
|
private static Logger logger = LoggerFactory.getLogger(PersistenceBackendTest.class);
|
||||||
|
|
||||||
public static final String[] SCOPES = new String[]{"/gcube", "/gcube/devNext"};
|
|
||||||
public static final String GCUBE_SCOPE = SCOPES[0];
|
|
||||||
public static final String GCUBE_DEVNEXT_SCOPE = SCOPES[1];
|
|
||||||
|
|
||||||
public static final long timeout = 5000;
|
public static final long timeout = 5000;
|
||||||
public static final TimeUnit timeUnit = TimeUnit.MILLISECONDS;
|
public static final TimeUnit timeUnit = TimeUnit.MILLISECONDS;
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ package org.gcube.documentstore.persistence;
|
||||||
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
||||||
import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
|
import org.gcube.accounting.testutility.TestUsageRecord;
|
||||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||||
import org.gcube.documentstore.records.Record;
|
import org.gcube.documentstore.records.Record;
|
||||||
import org.gcube.utils.TestUtility;
|
import org.gcube.utils.TestUtility;
|
||||||
|
|
|
@ -6,7 +6,7 @@ package org.gcube.documentstore.persistence;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
||||||
import org.codehaus.jackson.JsonNode;
|
import org.codehaus.jackson.JsonNode;
|
||||||
import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
|
import org.gcube.accounting.testutility.TestUsageRecord;
|
||||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||||
import org.gcube.documentstore.records.Record;
|
import org.gcube.documentstore.records.Record;
|
||||||
import org.gcube.utils.TestUtility;
|
import org.gcube.utils.TestUtility;
|
||||||
|
|
|
@ -8,7 +8,6 @@ import java.net.URL;
|
||||||
import org.bson.Document;
|
import org.bson.Document;
|
||||||
import org.gcube.accounting.datamodel.UsageRecord;
|
import org.gcube.accounting.datamodel.UsageRecord;
|
||||||
import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord.OperationType;
|
import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord.OperationType;
|
||||||
import org.gcube.accounting.datamodel.basetypes.TestUsageRecord;
|
|
||||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||||
import org.gcube.documentstore.records.Record;
|
import org.gcube.documentstore.records.Record;
|
||||||
import org.gcube.utils.TestUtility;
|
import org.gcube.utils.TestUtility;
|
||||||
|
@ -70,7 +69,7 @@ public class PersistenceMongoDBTest {
|
||||||
PersistenceBackendConfiguration persitenceConfiguration = PersistenceBackendConfiguration.getUnconfiguredInstance();
|
PersistenceBackendConfiguration persitenceConfiguration = PersistenceBackendConfiguration.getUnconfiguredInstance();
|
||||||
persitenceConfiguration.addProperty(PersistenceMongoDB.URL_PROPERTY_KEY, url.toString());
|
persitenceConfiguration.addProperty(PersistenceMongoDB.URL_PROPERTY_KEY, url.toString());
|
||||||
persitenceConfiguration.addProperty(PersistenceMongoDB.USERNAME_PROPERTY_KEY, "accounting");
|
persitenceConfiguration.addProperty(PersistenceMongoDB.USERNAME_PROPERTY_KEY, "accounting");
|
||||||
persitenceConfiguration.addProperty(PersistenceMongoDB.PASSWORD_PROPERTY_KEY, "testpwd");
|
persitenceConfiguration.addProperty(PersistenceMongoDB.PASSWORD_PROPERTY_KEY, "");
|
||||||
persitenceConfiguration.addProperty(PersistenceMongoDB.DB_NAME,"accounting");
|
persitenceConfiguration.addProperty(PersistenceMongoDB.DB_NAME,"accounting");
|
||||||
persitenceConfiguration.addProperty(PersistenceMongoDB.COLLECTION_NAME, UsageRecord.class.getSimpleName());
|
persitenceConfiguration.addProperty(PersistenceMongoDB.COLLECTION_NAME, UsageRecord.class.getSimpleName());
|
||||||
PersistenceMongoDB mongo = new PersistenceMongoDB();
|
PersistenceMongoDB mongo = new PersistenceMongoDB();
|
||||||
|
|
Loading…
Reference in New Issue