Porting code to redesigned E/R format
This commit is contained in:
parent
b53f9e9b25
commit
563024eea5
|
@ -15,7 +15,7 @@ import org.gcube.common.authorization.utils.secret.SecretUtility;
|
||||||
import org.gcube.common.keycloak.KeycloakClientFactory;
|
import org.gcube.common.keycloak.KeycloakClientFactory;
|
||||||
import org.gcube.common.keycloak.model.TokenResponse;
|
import org.gcube.common.keycloak.model.TokenResponse;
|
||||||
import org.gcube.common.scope.api.ScopeProvider;
|
import org.gcube.common.scope.api.ScopeProvider;
|
||||||
import org.gcube.informationsystem.model.reference.properties.Header;
|
import org.gcube.informationsystem.model.reference.properties.Metadata;
|
||||||
import org.junit.AfterClass;
|
import org.junit.AfterClass;
|
||||||
import org.junit.BeforeClass;
|
import org.junit.BeforeClass;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
@ -117,7 +117,7 @@ public class ContextTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getUser() {
|
public static String getUser() {
|
||||||
String user = Header.UNKNOWN_USER;
|
String user = Metadata.UNKNOWN_USER;
|
||||||
try {
|
try {
|
||||||
user = SecretManagerProvider.instance.get().getUser().getUsername();
|
user = SecretManagerProvider.instance.get().getUser().getUsername();
|
||||||
} catch(Exception e) {
|
} catch(Exception e) {
|
||||||
|
|
|
@ -10,7 +10,7 @@ import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
|
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
|
||||||
import org.gcube.informationsystem.base.reference.IdentifiableElement;
|
import org.gcube.informationsystem.base.reference.IdentifiableElement;
|
||||||
import org.gcube.informationsystem.model.reference.entities.Entity;
|
import org.gcube.informationsystem.model.reference.entities.Entity;
|
||||||
import org.gcube.informationsystem.model.reference.properties.Header;
|
import org.gcube.informationsystem.model.reference.properties.Metadata;
|
||||||
import org.gcube.informationsystem.queries.templates.impl.entities.QueryTemplateImpl;
|
import org.gcube.informationsystem.queries.templates.impl.entities.QueryTemplateImpl;
|
||||||
import org.gcube.informationsystem.queries.templates.impl.properties.TemplateVariableImpl;
|
import org.gcube.informationsystem.queries.templates.impl.properties.TemplateVariableImpl;
|
||||||
import org.gcube.informationsystem.queries.templates.reference.entities.QueryTemplate;
|
import org.gcube.informationsystem.queries.templates.reference.entities.QueryTemplate;
|
||||||
|
@ -45,29 +45,32 @@ public class ResourceRegistryQueryTemplateClientTest extends ContextTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void checkHeader(IdentifiableElement previous, IdentifiableElement got) {
|
public static void checkUUIDAndMetadata(IdentifiableElement previous, IdentifiableElement got) {
|
||||||
Header gotHeader = got.getHeader();
|
Metadata gotMetadata = got.getMetadata();
|
||||||
Header previousHeader = previous.getHeader();
|
Metadata previousMetadata = previous.getMetadata();
|
||||||
|
|
||||||
Assert.assertTrue(gotHeader != null);
|
Assert.assertTrue(gotMetadata != null);
|
||||||
Assert.assertTrue(gotHeader.getUUID() != null);
|
Assert.assertTrue(got.getUUID() != null);
|
||||||
|
|
||||||
String user = ContextTest.getUser();
|
String user = ContextTest.getUser();
|
||||||
Assert.assertTrue(gotHeader.getLastUpdateBy().compareTo(user) == 0);
|
Assert.assertTrue(gotMetadata.getLastUpdateBy().compareTo(user) == 0);
|
||||||
|
|
||||||
if(previousHeader != null) {
|
if(previous.getUUID()!=null) {
|
||||||
Assert.assertTrue(gotHeader.getUUID().compareTo(previousHeader.getUUID()) == 0);
|
Assert.assertTrue(got.getUUID().compareTo(previous.getUUID()) == 0);
|
||||||
Assert.assertTrue(gotHeader.getCreatedBy().compareTo(user) == 0);
|
}
|
||||||
Assert.assertTrue(gotHeader.getCreatedBy().compareTo(previousHeader.getCreatedBy()) == 0);
|
|
||||||
Assert.assertTrue(gotHeader.getCreationTime().compareTo(previousHeader.getCreationTime()) == 0);
|
if(previousMetadata != null) {
|
||||||
|
Assert.assertTrue(gotMetadata.getCreatedBy().compareTo(user) == 0);
|
||||||
|
Assert.assertTrue(gotMetadata.getCreatedBy().compareTo(previousMetadata.getCreatedBy()) == 0);
|
||||||
|
Assert.assertTrue(gotMetadata.getCreationTime().compareTo(previousMetadata.getCreationTime()) == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
Assert.assertFalse(gotHeader.getCreationTime().after(gotHeader.getLastUpdateTime()));
|
Assert.assertFalse(gotMetadata.getCreationTime().after(gotMetadata.getLastUpdateTime()));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void assertions(QueryTemplate expected, QueryTemplate got) {
|
protected void assertions(QueryTemplate expected, QueryTemplate got) {
|
||||||
checkHeader(expected, got);
|
checkUUIDAndMetadata(expected, got);
|
||||||
Assert.assertTrue(expected.getName().compareTo(got.getName()) == 0);
|
Assert.assertTrue(expected.getName().compareTo(got.getName()) == 0);
|
||||||
Assert.assertTrue(expected.getDescription().compareTo(got.getDescription()) == 0);
|
Assert.assertTrue(expected.getDescription().compareTo(got.getDescription()) == 0);
|
||||||
// Template and TemplateVariable should be compared
|
// Template and TemplateVariable should be compared
|
||||||
|
|
Loading…
Reference in New Issue