You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2016/08/30 19:26:03 UTC
olingo-odata4 git commit: [OLINGO-1004] Moved some Metadata Tests
Repository: olingo-odata4
Updated Branches:
refs/heads/master b380f97b7 -> b1db030cb
[OLINGO-1004] Moved some Metadata Tests
Signed-off-by: Michael Bolz <mi...@sap.com>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b1db030c
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b1db030c
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b1db030c
Branch: refs/heads/master
Commit: b1db030cb8ad31e85ae424064477ea0368432df0
Parents: b380f97
Author: Morten Riedel <Mo...@sap.com>
Authored: Tue Aug 30 11:33:48 2016 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Aug 30 21:25:19 2016 +0200
----------------------------------------------------------------------
.../olingo/fit/base/MetadataTestITCase.java | 35 ----------------
.../olingo/fit/tecsvc/client/BasicITCase.java | 43 ++++++++++++++++++--
2 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b1db030c/fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java
index c08bb45..184593d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java
@@ -24,8 +24,6 @@ import static org.junit.Assert.assertTrue;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmAnnotation;
-import org.apache.olingo.commons.api.edm.EdmEntityContainer;
-import org.apache.olingo.commons.api.edm.EdmEntitySet;
import org.apache.olingo.commons.api.edm.EdmEnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.EdmSchema;
@@ -39,43 +37,11 @@ import org.junit.Test;
public class MetadataTestITCase extends AbstractTestITCase {
@Test
- public void include() {
- final Edm edm = client.getRetrieveRequestFactory().getMetadataRequest(testNorthwindRootURL).execute().getBody();
- assertNotNull(edm);
-
- final EdmEntityContainer container = edm.getEntityContainer(
- new FullQualifiedName("ODataWebExperimental.Northwind.Model", "NorthwindEntities"));
- assertNotNull(container);
-
- final EdmEntitySet categories = container.getEntitySet("Categories");
- assertNotNull(categories);
- assertEquals("NorthwindModel", categories.getEntityType().getNamespace());
- }
-
- @Test
public void vocabularies() {
final Edm edm = client.getRetrieveRequestFactory().
getMetadataRequest(testVocabulariesServiceRootURL).execute().getBody();
assertNotNull(edm);
- // 1. core
- final EdmSchema core = edm.getSchema("Org.OData.Core.V1");
- assertNotNull(core);
- final EdmSchema coreAlias = edm.getSchema("Core");
- assertEquals(core, coreAlias);
-
- final EdmTerm descriptionTerm = edm.getTerm(new FullQualifiedName("Core", "Description"));
- assertNotNull(descriptionTerm);
- assertEquals(descriptionTerm.getFullQualifiedName(),
- edm.getTerm(new FullQualifiedName("Org.OData.Core.V1", "Description")).getFullQualifiedName());
-
- final EdmAnnotation description = core.getAnnotation(descriptionTerm, null);
- assertNotNull(description);
- // assertEquals("Core terms needed to write vocabularies",
- // description.getExpression().asConstant().getValue().asPrimitive().getName());
- assertEquals("Core terms needed to write vocabularies",
- description.getExpression().asConstant().getValueAsString());
-
final EdmTerm isLanguageDependent = edm.getTerm(new FullQualifiedName("Core", "IsLanguageDependent"));
assertNotNull(isLanguageDependent);
assertTrue(isLanguageDependent.getAppliesTo().contains(TargetType.Property));
@@ -83,7 +49,6 @@ public class MetadataTestITCase extends AbstractTestITCase {
assertEquals(edm.getTypeDefinition(new FullQualifiedName("Core", "Tag")), isLanguageDependent.getType());
assertEquals(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Boolean),
((EdmTypeDefinition) isLanguageDependent.getType()).getUnderlyingType());
- assertNotNull(isLanguageDependent.getAnnotation(descriptionTerm, null));
final EdmTerm permissions = edm.getTerm(new FullQualifiedName("Core", "Permissions"));
assertNotNull(permissions);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b1db030c/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index e8dd53f..63f7fa0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
@@ -69,6 +69,8 @@ import org.apache.olingo.client.api.domain.ClientObjectFactory;
import org.apache.olingo.client.api.domain.ClientPrimitiveValue;
import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.domain.ClientServiceDocument;
+import org.apache.olingo.client.api.domain.ClientSingleton;
+import org.apache.olingo.client.api.domain.ClientValuable;
import org.apache.olingo.client.api.domain.ClientValue;
import org.apache.olingo.client.api.edm.xml.Reference;
import org.apache.olingo.client.api.edm.xml.XMLMetadata;
@@ -77,13 +79,16 @@ import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmActionImport;
import org.apache.olingo.commons.api.edm.EdmAnnotation;
+import org.apache.olingo.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.commons.api.edm.EdmEntitySet;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
+import org.apache.olingo.commons.api.edm.EdmTerm;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.ex.ODataError;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
+import static org.junit.Assert.assertNotNull;
import org.junit.Ignore;
import org.junit.Test;
@@ -129,15 +134,23 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
public void readMetadata() {
EdmMetadataRequest request = getClient().getRetrieveRequestFactory().getMetadataRequest(SERVICE_URI);
assertNotNull(request);
- setCookieHeader(request);
-
+ setCookieHeader(request);
+
ODataRetrieveResponse<Edm> response = request.execute();
saveCookieHeader(response);
assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
Edm edm = response.getBody();
-
assertNotNull(edm);
+
+ final EdmEntityContainer container = edm.getEntityContainer(
+ new FullQualifiedName("olingo.odata.test1", "Container"));
+ assertNotNull(container);
+
+ final EdmEntitySet esAllPrim = container.getEntitySet("ESAllPrim");
+ assertNotNull(esAllPrim);
+ assertEquals("olingo.odata.test1", esAllPrim.getEntityType().getNamespace());
+
assertEquals(2, edm.getSchemas().size());
assertEquals(SERVICE_NAMESPACE, edm.getSchema(SERVICE_NAMESPACE).getNamespace());
assertEquals("Namespace1_Alias", edm.getSchema(SERVICE_NAMESPACE).getAlias());
@@ -146,6 +159,25 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
}
@Test
+ public void readMetadataWithTerm() {
+ EdmMetadataRequest request = getClient().getRetrieveRequestFactory().getMetadataRequest(SERVICE_URI);
+ assertNotNull(request);
+ setCookieHeader(request);
+
+ ODataRetrieveResponse<Edm> response = request.execute();
+ saveCookieHeader(response);
+ assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+
+ Edm edm = response.getBody();
+ assertNotNull(edm);
+
+ final EdmTerm descriptionTerm = edm.getTerm(new FullQualifiedName("Core", "Description"));
+ assertNotNull(descriptionTerm);
+ assertEquals(descriptionTerm.getFullQualifiedName(),
+ edm.getTerm(new FullQualifiedName("Org.OData.Core.V1", "Description")).getFullQualifiedName());
+ }
+
+ @Test
public void readMetadataWithAnnotations() {
EdmMetadataRequest request = getClient().getRetrieveRequestFactory().getMetadataRequest(SERVICE_URI);
assertNotNull(request);
@@ -167,6 +199,9 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
entitySet.getAnnotation(edm.getTerm(new FullQualifiedName("Org.OData.Core.V1", "Description")), null);
assertNotNull(annotation);
+ assertEquals("Contains entities with all primitive types",
+ annotation.getExpression().asConstant().getValueAsString());
+
EdmActionImport actionImport = edm.getEntityContainer().getActionImport("AIRTString");
annotations = actionImport.getAnnotations();
assertNotNull(annotations);
@@ -299,7 +334,7 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
assertThat(error.getMessage(), containsString("key"));
}
}
-
+
@Test
public void readEntity() throws Exception {
ODataEntityRequest<ClientEntity> request = getClient().getRetrieveRequestFactory()