Fixed tests
This commit is contained in:
parent
e56189e9ad
commit
81a1bfc233
|
@ -140,7 +140,7 @@ public class ContextTest {
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public static void beforeClass() throws Exception {
|
public static void beforeClass() throws Exception {
|
||||||
setContextByName(ROOT_PREPROD);
|
setContextByName(ROOT_DEV);
|
||||||
}
|
}
|
||||||
|
|
||||||
@AfterClass
|
@AfterClass
|
||||||
|
|
|
@ -1,83 +0,0 @@
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.gcube.informationsystem.resourceregistry;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
import org.gcube.common.authorization.utils.manager.SecretManager;
|
|
||||||
import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
|
|
||||||
import org.gcube.common.authorization.utils.secret.Secret;
|
|
||||||
import org.gcube.common.authorization.utils.secret.SecretUtility;
|
|
||||||
import org.junit.AfterClass;
|
|
||||||
import org.junit.BeforeClass;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Luca Frosini (ISTI - CNR)
|
|
||||||
*/
|
|
||||||
public class ContextTestOldUAth {
|
|
||||||
|
|
||||||
protected static Properties properties;
|
|
||||||
protected static final String PROPERTIES_FILENAME = "token.properties";
|
|
||||||
|
|
||||||
public static final String ROOT_DEV;
|
|
||||||
public static final String ROOT_PREPROD;
|
|
||||||
public static final String ROOT_PROD;
|
|
||||||
|
|
||||||
static {
|
|
||||||
ROOT_DEV = "/gcube";
|
|
||||||
ROOT_PREPROD = "/pred4s";
|
|
||||||
ROOT_PROD = "/d4science.research-infrastructures.eu";
|
|
||||||
|
|
||||||
properties = new Properties();
|
|
||||||
InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
|
|
||||||
|
|
||||||
try {
|
|
||||||
// load the properties file
|
|
||||||
properties.load(input);
|
|
||||||
} catch(IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void set(Secret secret) throws Exception {
|
|
||||||
SecretManagerProvider.instance.reset();
|
|
||||||
SecretManager secretManager = new SecretManager();
|
|
||||||
SecretManagerProvider.instance.set(secretManager);
|
|
||||||
secretManager.addSecret(secret);
|
|
||||||
secretManager.set();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setContext(String token) throws Exception {
|
|
||||||
Secret secret = getSecret(token);
|
|
||||||
set(secret);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setContextByName(String fullContextName) throws Exception {
|
|
||||||
Secret secret = getSecretByContextName(fullContextName);
|
|
||||||
set(secret);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Secret getSecret(String token) throws Exception {
|
|
||||||
Secret secret = SecretUtility.getSecretByTokenString(token);
|
|
||||||
return secret;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Secret getSecretByContextName(String fullContextName) throws Exception {
|
|
||||||
String token = ContextTest.properties.getProperty(fullContextName);
|
|
||||||
return getSecret(token);
|
|
||||||
}
|
|
||||||
|
|
||||||
@BeforeClass
|
|
||||||
public static void beforeClass() throws Exception {
|
|
||||||
setContextByName(ROOT_DEV);
|
|
||||||
}
|
|
||||||
|
|
||||||
@AfterClass
|
|
||||||
public static void afterClass() throws Exception {
|
|
||||||
SecretManagerProvider.instance.reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -24,16 +24,16 @@ public class DataBaseCreator extends ContextTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void createDatabase() throws Exception {
|
public void createDatabase() throws Exception {
|
||||||
ContextTest.setContextByName(ROOT_PREPROD);
|
ContextTest.setContextByName(ROOT_DEV);
|
||||||
logger.debug("Going to create DB");
|
logger.debug("Going to create DB");
|
||||||
String db = DatabaseEnvironment.DB_URI;
|
String db = DatabaseEnvironment.DB_URI;
|
||||||
logger.debug("{} created", db);
|
logger.debug("{} created", db);
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Ignore
|
@Ignore
|
||||||
@Test
|
@Test
|
||||||
public void createAllContexts() throws Exception {
|
public void createAllContexts() throws Exception {
|
||||||
ContextTest.setContextByName(ROOT_PREPROD);
|
ContextTest.setContextByName(ROOT_DEV);
|
||||||
ContextCreator contextCreator = new ContextCreator();
|
ContextCreator contextCreator = new ContextCreator();
|
||||||
contextCreator.all();
|
contextCreator.all();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue