added tests for count methods
This commit is contained in:
parent
93d0d72670
commit
4215eeac5f
|
@ -1,10 +1,8 @@
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.gcube.gcat.client;
|
package org.gcube.gcat.client;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
import java.net.MalformedURLException;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
import org.gcube.common.authorization.client.Constants;
|
import org.gcube.common.authorization.client.Constants;
|
||||||
|
@ -31,7 +29,12 @@ public class ContextTest {
|
||||||
protected static Properties properties;
|
protected static Properties properties;
|
||||||
protected static final String PROPERTIES_FILENAME = "token.properties";
|
protected static final String PROPERTIES_FILENAME = "token.properties";
|
||||||
|
|
||||||
public static final String DEFAULT_TEST_SCOPE_NAME;
|
protected static final String GCAT_PROPERTIES_FILENAME = "gcat.properties";
|
||||||
|
public static final String GCAT_URL_PROPERTY = "GCAT_URL_PROPERTY";
|
||||||
|
public static final String GCAT_URL;
|
||||||
|
|
||||||
|
|
||||||
|
public static final String DEFAULT_TEST_CONTEXT_NAME;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
properties = new Properties();
|
properties = new Properties();
|
||||||
|
@ -44,14 +47,49 @@ public class ContextTest {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFAULT_TEST_SCOPE_NAME = "/pred4s/preprod/preVRE";
|
//DEFAULT_TEST_CONTEXT_NAME = "/pred4s/preprod/preVRE";
|
||||||
|
DEFAULT_TEST_CONTEXT_NAME = "/gcube/devsec/devVRE";
|
||||||
|
|
||||||
|
try {
|
||||||
|
setContextByName(DEFAULT_TEST_CONTEXT_NAME);
|
||||||
|
} catch(Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
Properties gcatProperties = new Properties();
|
||||||
|
input = ContextTest.class.getClassLoader().getResourceAsStream(GCAT_PROPERTIES_FILENAME);
|
||||||
|
try {
|
||||||
|
// load the properties file
|
||||||
|
gcatProperties.load(input);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
GCAT_URL = gcatProperties.getProperty(GCAT_URL_PROPERTY);
|
||||||
|
|
||||||
|
if(GCAT_URL!=null){
|
||||||
|
try {
|
||||||
|
GCatClientDiscovery.forceToURL(GCAT_URL);
|
||||||
|
} catch (MalformedURLException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getCurrentScope(String token) throws ObjectNotFound, Exception {
|
public static String getCurrentContextFullName() {
|
||||||
|
String token = SecurityTokenProvider.instance.get();
|
||||||
|
AuthorizationEntry authorizationEntry = null;
|
||||||
|
try {
|
||||||
|
authorizationEntry = Constants.authorizationService().get(token);
|
||||||
|
} catch(Exception e) {
|
||||||
|
return ScopeProvider.instance.get();
|
||||||
|
}
|
||||||
|
return authorizationEntry.getContext();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getContextFullName(String token) throws ObjectNotFound, Exception {
|
||||||
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
|
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
|
||||||
String context = authorizationEntry.getContext();
|
return authorizationEntry.getContext();
|
||||||
logger.info("Context of token {} is {}", token, context);
|
|
||||||
return context;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception {
|
public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception {
|
||||||
|
@ -67,12 +105,12 @@ public class ContextTest {
|
||||||
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);
|
||||||
ScopeProvider.instance.set(getCurrentScope(token));
|
ScopeProvider.instance.set(getContextFullName(token));
|
||||||
}
|
}
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public static void beforeClass() throws Exception {
|
public static void beforeClass() throws Exception {
|
||||||
setContextByName(DEFAULT_TEST_SCOPE_NAME);
|
setContextByName(DEFAULT_TEST_CONTEXT_NAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
@AfterClass
|
@AfterClass
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.gcube.gcat.client;
|
package org.gcube.gcat.client;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.net.MalformedURLException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -30,6 +31,13 @@ public class GroupTest extends ContextTest {
|
||||||
private static final String DISPLAY_NAME_KEY = "display_name";
|
private static final String DISPLAY_NAME_KEY = "display_name";
|
||||||
private static final String DISPLAY_NAME_VALUE = "0000 Display Name";
|
private static final String DISPLAY_NAME_VALUE = "0000 Display Name";
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCount() throws MalformedURLException {
|
||||||
|
Group group = new Group();
|
||||||
|
int count = group.count();
|
||||||
|
logger.debug("The number of groups is {}", count);
|
||||||
|
}
|
||||||
|
|
||||||
// @Test
|
// @Test
|
||||||
public void completeTest() throws IOException {
|
public void completeTest() throws IOException {
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.gcube.gcat.client;
|
package org.gcube.gcat.client;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.net.MalformedURLException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -72,6 +73,13 @@ public class ItemTest extends ContextTest {
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCount() throws MalformedURLException {
|
||||||
|
Item item = new Item();
|
||||||
|
int count = item.count();
|
||||||
|
logger.debug("The items published in the organization corresponding to the VRE {} are {}", ContextTest.getCurrentContextFullName(), count);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void completeTest() throws IOException {
|
public void completeTest() throws IOException {
|
||||||
ObjectMapper mapper = new ObjectMapper();
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.gcube.gcat.client;
|
package org.gcube.gcat.client;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.net.MalformedURLException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -30,6 +31,13 @@ public class OrganizationTest extends ContextTest {
|
||||||
private static final String DISPLAY_NAME_KEY = "display_name";
|
private static final String DISPLAY_NAME_KEY = "display_name";
|
||||||
private static final String DISPLAY_NAME_VALUE = "0000 Display Name";
|
private static final String DISPLAY_NAME_VALUE = "0000 Display Name";
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCount() throws MalformedURLException {
|
||||||
|
Organization organization = new Organization();
|
||||||
|
int count = organization.count();
|
||||||
|
logger.debug("The number of organizations is {}", count);
|
||||||
|
}
|
||||||
|
|
||||||
// @Test
|
// @Test
|
||||||
public void completeTest() throws IOException {
|
public void completeTest() throws IOException {
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.gcube.gcat.client;
|
package org.gcube.gcat.client;
|
||||||
|
|
||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
|
import java.net.MalformedURLException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
@ -23,6 +24,13 @@ public class ProfileTest extends ContextTest {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(ProfileTest.class);
|
private static Logger logger = LoggerFactory.getLogger(ProfileTest.class);
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCount() throws MalformedURLException {
|
||||||
|
Profile profile = new Profile();
|
||||||
|
int count = profile.count();
|
||||||
|
logger.debug("The number of profiles is {}", count);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void safeTest() throws Exception {
|
public void safeTest() throws Exception {
|
||||||
|
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
/token.properties
|
/token.properties
|
||||||
|
/gcat.properties
|
||||||
|
|
Loading…
Reference in New Issue