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 2014/07/29 19:02:58 UTC
[17/17] git commit: [OLINGO-377] Merge branch 'master' into
OLINGO-377-FIT
[OLINGO-377] Merge branch 'master' into OLINGO-377-FIT
Conflicts:
fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/45a46f86
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/45a46f86
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/45a46f86
Branch: refs/heads/master
Commit: 45a46f86e9de9c18000e4c5800ffc4e1adb5d141
Parents: c35725c 7442b27
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Jul 29 14:43:06 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Jul 29 14:43:57 2014 +0200
----------------------------------------------------------------------
.../olingo/fit/tecsvc/client/BasicITCase.java | 61 ++++++++++++++++----
.../olingo/fit/v3/EntityCreateTestITCase.java | 2 +-
.../olingo/fit/v3/EntitySetTestITCase.java | 2 +-
.../apache/olingo/fit/v3/InvokeTestITCase.java | 2 +-
.../olingo/fit/v3/QueryOptionsTestITCase.java | 2 +-
.../fit/v4/BoundOperationInvokeTestITCase.java | 4 +-
.../olingo/fit/v4/EntitySetTestITCase.java | 2 +-
.../fit/v4/OperationImportInvokeTestITCase.java | 4 +-
.../olingo/fit/v4/QueryOptionsTestITCase.java | 2 +-
.../api/domain/CommonODataEntitySet.java | 2 +-
.../core/domain/AbstractODataEntitySet.java | 6 +-
.../core/domain/v3/ODataEntitySetImpl.java | 5 --
.../core/domain/v4/ODataEntitySetImpl.java | 5 --
.../tecsvc/processor/TechnicalProcessor.java | 3 +-
.../json/ODataJsonSerializerTest.java | 11 ++--
15 files changed, 70 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/45a46f86/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
----------------------------------------------------------------------
diff --cc fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index 8514ca4,ba6c110..6df42eb
--- 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
@@@ -1,4 -1,4 +1,4 @@@
--/*
++/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@@ -18,21 -18,33 +18,35 @@@
*/
package org.apache.olingo.fit.tecsvc.client;
+ import static org.hamcrest.CoreMatchers.containsString;
+ import static org.hamcrest.CoreMatchers.hasItem;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
- import static org.junit.Assert.assertTrue;
+ import static org.junit.Assert.assertNull;
+ import static org.junit.Assert.assertThat;
+
+ import java.net.URI;
+ import java.util.Collections;
+ import java.util.List;
+import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.EdmMetadataRequest;
+ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.domain.ODataServiceDocument;
+ import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
+ import org.apache.olingo.commons.api.domain.v4.ODataEntity;
+ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
+ import org.apache.olingo.commons.api.domain.v4.ODataProperty;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
+ import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.fit.AbstractBaseTestITCase;
+ import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
import org.junit.Before;
import org.junit.Test;
@@@ -49,11 -61,9 +63,10 @@@ public class BasicITCase extends Abstra
odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
}
+
@Test
public void readServiceDocument() {
- ODataServiceDocumentRequest request =
- odata.getRetrieveRequestFactory().getServiceDocumentRequest(SERVICE_URI);
+ ODataServiceDocumentRequest request = odata.getRetrieveRequestFactory().getServiceDocumentRequest(SERVICE_URI);
assertNotNull(request);
ODataRetrieveResponse<ODataServiceDocument> response = request.execute();
@@@ -85,7 -94,32 +97,36 @@@
assertEquals(2, edm.getSchemas().size());
}
+ @Test
+ public void readEntitySet() {
+ final ODataEntitySetRequest<ODataEntitySet> request = odata.getRetrieveRequestFactory()
+ .getEntitySetRequest(URI.create(SERVICE_URI + "/ESMixPrimCollComp"));
+ assertNotNull(request);
+
+ final ODataRetrieveResponse<ODataEntitySet> response = request.execute();
+ assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+ assertThat(response.getContentType(), containsString(ContentType.APPLICATION_JSON.toContentTypeString()));
+
+ final ODataEntitySet entitySet = response.getBody();
+ assertNotNull(entitySet);
+
+ assertNull(entitySet.getCount());
+ assertNull(entitySet.getNext());
+ assertEquals(Collections.<ODataAnnotation> emptyList(), entitySet.getAnnotations());
+ assertNull(entitySet.getDeltaLink());
+
+ final List<ODataEntity> entities = entitySet.getEntities();
+ assertNotNull(entities);
+ assertEquals(3, entities.size());
+ final ODataEntity entity = entities.get(2);
+ assertNotNull(entity);
+ final ODataProperty property = entity.getProperty("PropertyInt16");
+ assertNotNull(property);
+ assertNotNull(property.getPrimitiveValue());
+ assertEquals(0, property.getPrimitiveValue().toValue());
+ }
++
+ @Override protected CommonODataClient getClient() {
+ return null;
+ }
}