gCubeSystem
/
resource-registry-publisher
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing test 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry-publisher@177099 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2019-02-13 11:23:10 +00:00
parent af35d58af8
commit ef425ec292
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ScopedTest.java → src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ContextTest.java
View File

@ -22,9 +22,9 @@ import org.slf4j.LoggerFactory;
* @author Luca Frosini (ISTI - CNR)
*
*/
public class ScopedTest {
public class ContextTest {
private static final Logger logger = LoggerFactory.getLogger(ScopedTest.class);
private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
protected static final String PROPERTIES_FILENAME = "token.properties";
@ -54,7 +54,7 @@ public class ScopedTest {
static {
Properties properties = new Properties();
InputStream input = ScopedTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME);
try {
// load the properties file
@ -76,7 +76,7 @@ public class ScopedTest {
properties = new Properties();
input = ScopedTest.class.getClassLoader().getResourceAsStream(REGISTRY_PROPERTIES_FILENAME);
input = ContextTest.class.getClassLoader().getResourceAsStream(REGISTRY_PROPERTIES_FILENAME);
try {
// load the properties file

2
src/test/java/org/gcube/informationsystem/resourceregistry/publisher/ERManagementTest.java
View File

@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
/**
* @author Luca Frosini (ISTI - CNR)
*/
public class ERManagementTest extends ScopedTest {
public class ERManagementTest extends ContextTest {
private static Logger logger = LoggerFactory.getLogger(ERManagementTest.class);

2
src/test/java/org/gcube/informationsystem/resourceregistry/publisher/EntityManagementTest.java
View File

@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* @author Luca Frosini (ISTI - CNR)
*/
public class EntityManagementTest extends ScopedTest {
public class EntityManagementTest extends ContextTest {
private static final Logger logger = LoggerFactory.getLogger(EntityManagementTest.class);

8
src/test/java/org/gcube/informationsystem/resourceregistry/publisher/MultiContextTest.java
View File

@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
* @author Luca Frosini (ISTI - CNR)
*
*/
public class MultiContextTest extends ScopedTest {
public class MultiContextTest extends ContextTest {
private static Logger logger = LoggerFactory
.getLogger(MultiContextTest.class);
@ -148,14 +148,14 @@ public class MultiContextTest extends ScopedTest {
logger.debug("Changing token to test add to scope");
ScopedTest.setContext(ScopedTest.ALTERNATIVE_TEST_SCOPE);
ContextTest.setContext(ContextTest.ALTERNATIVE_TEST_SCOPE);
UUID hostingNodeUUID = createdHN.getHeader().getUUID();
UUID eServiceUUID = createdEService.getHeader().getUUID();
logger.debug("Changing token to test add to scope");
ScopedTest.setContext(ScopedTest.ALTERNATIVE_TEST_SCOPE);
ContextTest.setContext(ContextTest.ALTERNATIVE_TEST_SCOPE);
try {
resourceRegistryClient.exists(EService.class, eServiceUUID);
@ -193,7 +193,7 @@ public class MultiContextTest extends ScopedTest {
logger.debug("Restoring original scope");
ScopedTest.setContext(ScopedTest.DEFAULT_TEST_SCOPE);
ContextTest.setContext(ContextTest.DEFAULT_TEST_SCOPE);
deleted = resourceRegistryPublisher.deleteResource(createdEService);
Assert.assertTrue(deleted);

2
src/test/java/org/gcube/informationsystem/resourceregistry/publisher/RRClientTest.java
View File

@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
* @author Luca Frosini (ISTI - CNR)
*
*/
public class RRClientTest extends ScopedTest {
public class RRClientTest extends ContextTest {
private static final Logger logger = LoggerFactory.getLogger(EntityManagementTest.class);

2
src/test/java/org/gcube/informationsystem/resourceregistry/publisher/SmartgearResourcesTest.java
View File

@ -63,7 +63,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
* @author Luca Frosini (ISTI - CNR)
*
*/
public class SmartgearResourcesTest extends ScopedTest {
public class SmartgearResourcesTest extends ContextTest {
private static Logger logger = LoggerFactory.getLogger(SmartgearResourcesTest.class);