gCubeSystem
/
resource-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Load the Resource Registry URL to use in the test cases from the properties file. 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/resource-management/resource-manager@177204 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Manuele Simi 2019-02-21 03:44:55 +00:00
parent b7ef1dd99f
commit 6a0ce9c5e7
2 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java
View File

@ -1,13 +1,9 @@
/**
*
*/
package org.gcube.resourcemanagement.manager.webapp.context; package org.gcube.resourcemanagement.manager.webapp.context;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Objects;
import java.util.Properties; import java.util.Properties;
import java.util.UUID; import java.util.UUID;
@ -33,13 +29,15 @@ import org.junit.runners.MethodSorters;
* Test cases for {@link Queries} * Test cases for {@link Queries}
* *
* @author Manuele Simi (ISTI CNR) * @author Manuele Simi (ISTI CNR)
*
*/ */
@RunWith(BlockJUnit4ClassRunner.class) @RunWith(BlockJUnit4ClassRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class QueriesTest { public class QueriesTest {
private final static String RR = "http://manuele-registry.dev.d4science.org/resource-registry"; /**
* Resource Registry to contact
*/
private static String RR = "";
public static String DEFAULT_TEST_SCOPE = ""; public static String DEFAULT_TEST_SCOPE = "";
@ -60,7 +58,11 @@ public class QueriesTest {
DEFAULT_TEST_SCOPE = properties.getProperty("DEFAULT_SCOPE_TOKEN"); DEFAULT_TEST_SCOPE = properties.getProperty("DEFAULT_SCOPE_TOKEN");
if (DEFAULT_TEST_SCOPE.isEmpty()) if (DEFAULT_TEST_SCOPE.isEmpty())
skipTest = true; skipTest = true;
RR = properties.getProperty("RR");
if (RR.isEmpty())
skipTest = true;
} }
@BeforeClass @BeforeClass
public static void beforeClass() throws Exception { public static void beforeClass() throws Exception {
setContext(DEFAULT_TEST_SCOPE); setContext(DEFAULT_TEST_SCOPE);
@ -86,6 +88,7 @@ public class QueriesTest {
SecurityTokenProvider.instance.reset(); SecurityTokenProvider.instance.reset();
ScopeProvider.instance.reset(); ScopeProvider.instance.reset();
} }
/** /**
* Test method for {@link org.gcube.resourcemanagement.manager.webapp.context.Queries#contextExists(UUID)}. * Test method for {@link org.gcube.resourcemanagement.manager.webapp.context.Queries#contextExists(UUID)}.
*/ */
@ -112,8 +115,6 @@ public class QueriesTest {
Context context = queries.fetchContext(context1UUID); Context context = queries.fetchContext(context1UUID);
assertNotNull("Context does not exist.", context); assertNotNull("Context does not exist.", context);
assertEquals("Unexpected uuid for context", context1UUID, context.getHeader().getUUID()); assertEquals("Unexpected uuid for context", context1UUID, context.getHeader().getUUID());
} }
} }

9
webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java
View File

@ -64,7 +64,10 @@ public class RMContextTest extends JerseyTest {
public static final UUID context3UUID = UUID.fromString("7f86dc81-2f59-486b-8aa9-3ab5486313c4"); public static final UUID context3UUID = UUID.fromString("7f86dc81-2f59-486b-8aa9-3ab5486313c4");
private final static String RR = "http://manuele-registry.dev.d4science.org/resource-registry"; /**
* Resource Registry to contact
*/
private static String RR = "";
public static String DEFAULT_TEST_SCOPE = ""; public static String DEFAULT_TEST_SCOPE = "";
@ -85,6 +88,10 @@ public class RMContextTest extends JerseyTest {
DEFAULT_TEST_SCOPE = properties.getProperty("DEFAULT_SCOPE_TOKEN"); DEFAULT_TEST_SCOPE = properties.getProperty("DEFAULT_SCOPE_TOKEN");
if (DEFAULT_TEST_SCOPE.isEmpty()) if (DEFAULT_TEST_SCOPE.isEmpty())
skipTest = true; skipTest = true;
RR = properties.getProperty("RR");
if (RR.isEmpty())
skipTest = true;
} }
@BeforeClass @BeforeClass