luca.frosini
/
resource-registry-database-creator
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing junit tests

This commit is contained in:
Luca Frosini 2022-11-11 15:09:15 +01:00
parent 304d197409
commit 2cb32903b0
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
View File

@ -27,15 +27,9 @@ public class ContextTest {
protected static Properties properties;
protected static final String PROPERTIES_FILENAME = "token.properties";
public static final String PARENT_DEFAULT_TEST_SCOPE;
public static final String DEFAULT_TEST_SCOPE;
public static final String ALTERNATIVE_TEST_SCOPE;
public static final String GCUBE;
public static final String DEVNEXT;
public static final String NEXTNEXT;
public static final String DEVSEC;
public static final String DEVVRE;
public static final String ROOT_DEV;
public static final String ROOT_PREPROD;
public static final String ROOT_PROD;
static {
properties = new Properties();
@ -48,19 +42,9 @@ public class ContextTest {
throw new RuntimeException(e);
}
// PARENT_DEFAULT_TEST_SCOPE = "/pred4s"
// DEFAULT_TEST_SCOPE_NAME = PARENT_DEFAULT_TEST_SCOPE + "/preprod";
// ALTERNATIVE_TEST_SCOPE = DEFAULT_TEST_SCOPE_NAME + "/preVRE";
GCUBE = "/gcube";
DEVNEXT = GCUBE + "/devNext";
NEXTNEXT = DEVNEXT + "/NextNext";
DEVSEC = GCUBE + "/devsec";
DEVVRE = DEVSEC + "/devVRE";
PARENT_DEFAULT_TEST_SCOPE = "/gcube";
DEFAULT_TEST_SCOPE = PARENT_DEFAULT_TEST_SCOPE + "/devNext";
ALTERNATIVE_TEST_SCOPE = DEFAULT_TEST_SCOPE + "/NextNext";
ROOT_DEV = "/gcube";
ROOT_PREPROD = "/pred4s";
ROOT_PROD = "/d4science.research-infrastructures.eu";
}
@ -104,7 +88,7 @@ public class ContextTest {
@BeforeClass
public static void beforeClass() throws Exception {
setContextByName(DEFAULT_TEST_SCOPE);
setContextByName(ROOT_DEV);
}
@AfterClass

4
src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
View File

@ -19,7 +19,7 @@ public class DataBaseCreator extends ContextTest {
@Test
public void createDatabase() throws Exception {
ContextTest.setContextByName(PARENT_DEFAULT_TEST_SCOPE);
ContextTest.setContextByName(ROOT_DEV);
logger.debug("Going to create DB");
String db = DatabaseEnvironment.DB_URI;
logger.debug("{} created", db);
@ -27,7 +27,7 @@ public class DataBaseCreator extends ContextTest {
@Test
public void createAllContext() throws Exception {
ContextTest.setContextByName(PARENT_DEFAULT_TEST_SCOPE);
ContextTest.setContextByName(ROOT_DEV);
ContextCreator contextCreator = new ContextCreator();
contextCreator.all();
}