Fixing tests
This commit is contained in:
parent
ab4cb593a6
commit
f3fb7b26a4
|
@ -28,45 +28,43 @@ public class ContextTest {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
|
private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
|
||||||
|
|
||||||
|
protected static Properties properties;
|
||||||
protected static final String PROPERTIES_FILENAME = "token.properties";
|
protected static final String PROPERTIES_FILENAME = "token.properties";
|
||||||
|
|
||||||
private static final String GCUBE_VARNAME = "GCUBE";
|
public static final String DEFAULT_TEST_SCOPE_NAME;
|
||||||
public static final String GCUBE;
|
|
||||||
|
|
||||||
private static final String PROD_VARNAME = "PROD";
|
|
||||||
public static final String PROD;
|
|
||||||
|
|
||||||
static {
|
static {
|
||||||
Properties properties = new Properties();
|
properties = new Properties();
|
||||||
InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
|
InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// load the properties file
|
// load the properties file
|
||||||
properties.load(input);
|
properties.load(input);
|
||||||
} catch (IOException e) {
|
} catch(IOException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
GCUBE = properties.getProperty(GCUBE_VARNAME);
|
//DEFAULT_TEST_SCOPE_NAME = "/pred4s/preprod/preVRE";
|
||||||
|
DEFAULT_TEST_SCOPE_NAME = "/gcube";
|
||||||
PROD = properties.getProperty(PROD_VARNAME);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getCurrentScope(String token) throws ObjectNotFound, Exception{
|
public static String getCurrentScope(String token) throws ObjectNotFound, Exception {
|
||||||
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
|
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
|
||||||
String context = authorizationEntry.getContext();
|
String context = authorizationEntry.getContext();
|
||||||
logger.info("Context of token {} is {}", token, context);
|
logger.info("Context of token {} is {}", token, context);
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception {
|
||||||
|
String token = ContextTest.properties.getProperty(fullContextName);
|
||||||
|
setContext(token);
|
||||||
|
}
|
||||||
|
|
||||||
public static void setContext(String token) throws ObjectNotFound, Exception{
|
public static void setContext(String token) throws ObjectNotFound, Exception {
|
||||||
SecurityTokenProvider.instance.set(token);
|
SecurityTokenProvider.instance.set(token);
|
||||||
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
|
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
|
||||||
ClientInfo clientInfo = authorizationEntry.getClientInfo();
|
ClientInfo clientInfo = authorizationEntry.getClientInfo();
|
||||||
logger.info("Owner of token is {}", clientInfo.getId());
|
logger.debug("User : {} - Type : {}", clientInfo.getId(), clientInfo.getType().name());
|
||||||
|
|
||||||
String qualifier = authorizationEntry.getQualifier();
|
String qualifier = authorizationEntry.getQualifier();
|
||||||
Caller caller = new Caller(clientInfo, qualifier);
|
Caller caller = new Caller(clientInfo, qualifier);
|
||||||
AuthorizationProvider.instance.set(caller);
|
AuthorizationProvider.instance.set(caller);
|
||||||
|
@ -74,12 +72,12 @@ public class ContextTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public static void beforeClass() throws Exception{
|
public static void beforeClass() throws Exception {
|
||||||
setContext(GCUBE);
|
setContextByName(DEFAULT_TEST_SCOPE_NAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
@AfterClass
|
@AfterClass
|
||||||
public static void afterClass() throws Exception{
|
public static void afterClass() throws Exception {
|
||||||
SecurityTokenProvider.instance.reset();
|
SecurityTokenProvider.instance.reset();
|
||||||
ScopeProvider.instance.reset();
|
ScopeProvider.instance.reset();
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,9 @@ import java.util.ServiceLoader;
|
||||||
import org.gcube.informationsystem.model.impl.entities.ContextImpl;
|
import org.gcube.informationsystem.model.impl.entities.ContextImpl;
|
||||||
import org.gcube.informationsystem.model.reference.entities.Context;
|
import org.gcube.informationsystem.model.reference.entities.Context;
|
||||||
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
|
||||||
|
import org.gcube.informationsystem.resourceregistry.context.ContextCreator;
|
||||||
import org.gcube.informationsystem.resourceregistry.context.ContextManagement;
|
import org.gcube.informationsystem.resourceregistry.context.ContextManagement;
|
||||||
|
import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
|
||||||
import org.gcube.informationsystem.resourceregistry.dbinitialization.SchemaActionImpl;
|
import org.gcube.informationsystem.resourceregistry.dbinitialization.SchemaActionImpl;
|
||||||
import org.gcube.informationsystem.utils.ISMapper;
|
import org.gcube.informationsystem.utils.ISMapper;
|
||||||
import org.gcube.informationsystem.utils.discovery.ISMDiscovery;
|
import org.gcube.informationsystem.utils.discovery.ISMDiscovery;
|
||||||
|
@ -16,12 +18,14 @@ import org.junit.Test;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
public class DataBaseCreator {
|
public class DataBaseCreator extends ContextTest {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(ISMDiscovery.class);
|
private static Logger logger = LoggerFactory.getLogger(ISMDiscovery.class);
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void createDatabase() throws Exception {
|
public void createDatabase() throws Exception {
|
||||||
|
String db = DatabaseEnvironment.DB_URI;
|
||||||
|
logger.debug("Initiliazing {}", db);
|
||||||
SchemaAction schemaAction = new SchemaActionImpl();
|
SchemaAction schemaAction = new SchemaActionImpl();
|
||||||
ServiceLoader<? extends RegistrationProvider> regsitrationProviders = ServiceLoader
|
ServiceLoader<? extends RegistrationProvider> regsitrationProviders = ServiceLoader
|
||||||
.load(RegistrationProvider.class);
|
.load(RegistrationProvider.class);
|
||||||
|
|
|
@ -11,11 +11,10 @@ public class ContextManagementTest extends ContextTest {
|
||||||
|
|
||||||
// private static Logger logger = LoggerFactory.getLogger(ContextManagementTest.class);
|
// private static Logger logger = LoggerFactory.getLogger(ContextManagementTest.class);
|
||||||
|
|
||||||
@Test
|
// @Test
|
||||||
public void createContexts() throws Exception {
|
public void createContexts() throws Exception {
|
||||||
//ScopedTest.setContext(ScopedTest.PROD);
|
ContextCreator contextCreator = new ContextCreator();
|
||||||
//ContextCreator contextCreator = new ContextCreator();
|
contextCreator.all();
|
||||||
//contextCreator.all();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
/token.properties
|
||||||
|
/config.properties
|
||||||
|
/test.key
|
Loading…
Reference in New Issue